bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #80755 - sunfishcode:path-cleanup/copy, r=nagisa

Browse source 
Optimize away some path lookups in the generic `fs::copy` implementation

This also eliminates a use of a `Path` convenience function, in support
of #80741, refactoring `std::path` to focus on pure data structures and
algorithms.
This commit is contained in:
bors 2021-01-09 07:48:53 +00:00
commit 1f9dc9a182
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
library/std/src/sys_common/fs.rs
View file

@ -5,19 +5,21 @@ use crate::io::{self, Error, ErrorKind};
use crate::path::Path; use crate::path::Path;
pub fn copy(from: &Path, to: &Path) -> io::Result<u64> { pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
if !from.is_file() { let mut reader = fs::File::open(from)?;
let metadata = reader.metadata()?;
if !metadata.is_file() {
return Err(Error::new( return Err(Error::new(
ErrorKind::InvalidInput, ErrorKind::InvalidInput,
"the source path is not an existing regular file", "the source path is not an existing regular file",
)); ));
} }
let mut reader = fs::File::open(from)?;
let mut writer = fs::File::create(to)?; let mut writer = fs::File::create(to)?;
let perm = reader.metadata()?.permissions(); let perm = metadata.permissions();
let ret = io::copy(&mut reader, &mut writer)?; let ret = io::copy(&mut reader, &mut writer)?;
fs::set_permissions(to, perm)?; writer.set_permissions(perm)?;
Ok(ret) Ok(ret)
} }