From 3f392abdfb2ec0f436352d349eedd5f6707bf817 Mon Sep 17 00:00:00 2001 From: Nicolas Koch Date: Thu, 24 May 2018 14:51:59 +0200 Subject: [PATCH] Implement suggestions from the PR - Move loading of atomic bool outside the loop - Add comment about TryFrom for future improvement --- src/libstd/sys/unix/fs.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 8412540934eb..6624c48cbe0d 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -818,14 +818,16 @@ pub fn copy(from: &Path, to: &Path) -> io::Result { (metadata.permissions(), metadata.size()) }; + let has_copy_file_range = HAS_COPY_FILE_RANGE.load(Ordering::Relaxed); let mut written = 0u64; while written < len { + // TODO should ideally use TryFrom let bytes_to_copy = if len - written > usize::max_value() as u64 { usize::max_value() } else { (len - written) as usize }; - let copy_result = if HAS_COPY_FILE_RANGE.load(Ordering::Relaxed) { + let copy_result = if has_copy_file_range { let copy_result = unsafe { // We actually don't have to adjust the offsets, // because copy_file_range adjusts the file offset automatically