OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix errors in Box<Path> conversions

Browse Source
This commit is contained in:
Nikolai Vazquez 2017-09-28 10:59:12 -04:00
parent c7b4a96909
commit cb2a656cdf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libstd/path.rs
View File

@ -1341,7 +1341,8 @@ impl PathBuf {
#[stable(feature = "box_from_path", since = "1.17.0")] #[stable(feature = "box_from_path", since = "1.17.0")]
impl<'a> From<&'a Path> for Box<Path> { impl<'a> From<&'a Path> for Box<Path> {
fn from(path: &'a Path) -> Box<Path> { fn from(path: &'a Path) -> Box<Path> {
let rw = Box::into_raw(Box::from(&path.inner)) as *mut Path; let boxed: Box<OsStr> = path.inner.into();
let rw = Box::into_raw(boxed) as *mut Path;
unsafe { Box::from_raw(rw) } unsafe { Box::from_raw(rw) }
} }
} }
@ -2313,7 +2314,8 @@ impl Path {
#[stable(feature = "into_boxed_path", since = "1.20.0")] #[stable(feature = "into_boxed_path", since = "1.20.0")]
pub fn into_path_buf(self: Box<Path>) -> PathBuf { pub fn into_path_buf(self: Box<Path>) -> PathBuf {
let rw = Box::into_raw(self) as *mut OsStr; let rw = Box::into_raw(self) as *mut OsStr;
unsafe { Box::from_raw(rw) } let inner = unsafe { Box::from_raw(rw) };
PathBuf { inner: OsString::from(inner) }
} }
} }