Commitc26bd79

authored

Rollup merge ofrust-lang#126854 - devnexen:std_unix_os_fallback_upd, r=Mark-Simulacrum

std::unix::os::home_dir: fallback's optimisation.we're using a guaranteed initialised field on success.

2 parents828e528 +f0b95fc commitc26bd79Copy full SHA for c26bd79

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -738,17 +738,17 @@ pub fn home_dir() -> Option<PathBuf> {`
`738`	`738`	`n => nasusize,`
`739`	`739`	`};`
`740`	`740`	`letmut buf =Vec::with_capacity(amt);`
`741`		`-letmutpasswd:libc::passwd = mem::zeroed();`
	`741`	`+letmutp = mem::MaybeUninit::<libc::passwd>::uninit();`
`742`	`742`	`letmut result = ptr::null_mut();`
`743`	`743`	`match libc::getpwuid_r(`
`744`	`744`	`libc::getuid(),`
`745`		`-&mut passwd,`
	`745`	`+p.as_mut_ptr(),`
`746`	`746`	`buf.as_mut_ptr(),`
`747`	`747`	`buf.capacity(),`
`748`	`748`	`&mut result,`
`749`	`749`	`){`
`750`	`750`	`0if !result.is_null() =>{`
`751`		`-let ptr =passwd.pw_diras*const_;`
	`751`	`+let ptr =(result).pw_dirasconst_;`
`752`	`752`	`let bytes =CStr::from_ptr(ptr).to_bytes().to_vec();`
`753`	`753`	`Some(OsStringExt::from_vec(bytes))`
`754`	`754`	`}`

Comments

(0)