diff options
| author | bors <bors@rust-lang.org> | 2020-02-15 10:20:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-15 10:20:05 +0000 |
| commit | dbef35309d10bed2f09cd55b3e9ea980a58c62aa (patch) | |
| tree | 72b0aff59d492542867e747604c2abee64856211 /src/libstd/sys | |
| parent | 19288ddfd6b3448c2c221d75610bff722a6582e8 (diff) | |
| parent | e9db0613acb2dfdb6a892873d59d0626b20c6cc8 (diff) | |
| download | rust-dbef35309d10bed2f09cd55b3e9ea980a58c62aa.tar.gz rust-dbef35309d10bed2f09cd55b3e9ea980a58c62aa.zip | |
Auto merge of #69182 - Dylan-DPC:rollup-ifsa9fx, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #64069 (Added From<Vec<NonZeroU8>> for CString) - #66721 (implement LowerExp and UpperExp for integers) - #69106 (Fix std::fs::copy on WASI target) - #69154 (Avoid calling `fn_sig` on closures) - #69166 (Check `has_typeck_tables` before calling `typeck_tables_of`) - #69180 (Suggest a comma if a struct initializer field fails to parse) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/wasi/fs.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/libstd/sys/wasi/fs.rs b/src/libstd/sys/wasi/fs.rs index 04bfdf67e12..a11f61fdd69 100644 --- a/src/libstd/sys/wasi/fs.rs +++ b/src/libstd/sys/wasi/fs.rs @@ -12,7 +12,6 @@ use crate::sys::time::SystemTime; use crate::sys::unsupported; use crate::sys_common::FromInner; -pub use crate::sys_common::fs::copy; pub use crate::sys_common::fs::remove_dir_all; pub struct File { @@ -647,3 +646,12 @@ fn open_parent(p: &Path) -> io::Result<(ManuallyDrop<WasiFd>, PathBuf)> { pub fn osstr2str(f: &OsStr) -> io::Result<&str> { f.to_str().ok_or_else(|| io::Error::new(io::ErrorKind::Other, "input must be utf-8")) } + +pub fn copy(from: &Path, to: &Path) -> io::Result<u64> { + use crate::fs::File; + + let mut reader = File::open(from)?; + let mut writer = File::create(to)?; + + io::copy(&mut reader, &mut writer) +} |
