Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

os.open: make make_path return Cow

Browse Source
This commit is contained in:
Dean Li
2021-03-16 20:14:11 +08:00
parent cdcc191c0b
commit d6d689dc1f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vm/src/stdlib/os.rs
View File

@@ -159,10 +159,14 @@ impl TryFromObject for PyPathLike {
}
}
fn make_path(vm: &VirtualMachine, path: &PyPathLike, dir_fd: &DirFd) -> PyResult<ffi::OsString> {
let path = path.path.to_path_buf();
fn make_path<'a>(
vm: &VirtualMachine,
path: &'a PyPathLike,
dir_fd: &DirFd,
) -> PyResult<std::borrow::Cow<'a, ffi::OsStr>> {
let path = &path.path;
if dir_fd.0.is_none() | path.is_absolute() {
return Ok(path.into_os_string());
return Ok(std::borrow::Cow::Borrowed(path.as_os_str().into()));
}
cfg_if::cfg_if! {
@@ -175,8 +179,8 @@ fn make_path(vm: &VirtualMachine, path: &PyPathLike, dir_fd: &DirFd) -> PyResult
return Err(vm.new_os_error(format!("Cannot determine path of dir_fd: {:?}", dir_fd.0)));
}
};
let p: PathBuf = vec![dir_path, path].iter().collect();
Ok(p.into_os_string())
let p: PathBuf = vec![dir_path, path.to_path_buf()].iter().collect();
Ok(p.into_os_string().into())
}
}
}