From b7908febca68700b4c14be5b55e4121e9f9ddb06 Mon Sep 17 00:00:00 2001 From: Gleb Kozyrev Date: Mon, 17 Nov 2014 02:07:23 +0200 Subject: Remove duplicate code by using util::copy() --- src/libstd/io/fs.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index 3f39dda650a..f4e795721cf 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -381,16 +381,8 @@ pub fn copy(from: &Path, to: &Path) -> IoResult<()> { let mut reader = try!(File::open(from)); let mut writer = try!(File::create(to)); - let mut buf = [0, ..io::DEFAULT_BUF_SIZE]; - loop { - let amt = match reader.read(&mut buf) { - Ok(n) => n, - Err(ref e) if e.kind == io::EndOfFile => { break } - Err(e) => return update_err(Err(e), from, to) - }; - try!(writer.write(buf[..amt])); - } + try!(super::util::copy(&mut reader, &mut writer)); chmod(to, try!(update_err(from.stat(), from, to)).perm) } -- cgit 1.4.1-3-g733a5 From 8b16ccdd7b47a4c93d6357c800a221daaf8c7db4 Mon Sep 17 00:00:00 2001 From: Gleb Kozyrev Date: Mon, 17 Nov 2014 19:17:39 +0200 Subject: Return proper errors with update_err --- src/libstd/io/fs.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libstd') diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index f4e795721cf..cd4141e045c 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -382,7 +382,7 @@ pub fn copy(from: &Path, to: &Path) -> IoResult<()> { let mut reader = try!(File::open(from)); let mut writer = try!(File::create(to)); - try!(super::util::copy(&mut reader, &mut writer)); + try!(update_err(super::util::copy(&mut reader, &mut writer), from, to)); chmod(to, try!(update_err(from.stat(), from, to)).perm) } -- cgit 1.4.1-3-g733a5