Implement suggestions from the PR

  - Move loading of atomic bool outside the loop
  - Add comment about TryFrom for future improvement

diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs
index 8412540934eb2d4c108f7f72bcf02d9e06f49fd5..6624c48cbe0d8f840156bc49a0a43cb4d36d3a66 100644 (file)
--- a/src/libstd/sys/unix/fs.rs
+++ b/src/libstd/sys/unix/fs.rs
@@ -818,14 +818,16 @@ unsafe fn copy_file_range(
         (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