diff options
| author | Nicolas Koch <nioko1337@gmail.com> | 2018-05-28 17:19:42 +0200 |
|---|---|---|
| committer | Nicolas Koch <nioko1337@gmail.com> | 2018-05-28 17:19:42 +0200 |
| commit | 3b271eb039d22a4b31caed29a2aac0a9ac604902 (patch) | |
| tree | b5d17dff44e66c5f4316eba33cd4f9ca19d8a7e4 /src/libstd/sys | |
| parent | 3f392abdfb2ec0f436352d349eedd5f6707bf817 (diff) | |
| download | rust-3b271eb039d22a4b31caed29a2aac0a9ac604902.tar.gz rust-3b271eb039d22a4b31caed29a2aac0a9ac604902.zip | |
Use FIXME instead of TODO; Move bytes_to_copy calculation inside if
branch
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/fs.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 6624c48cbe0..56075c5e8d0 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -821,13 +821,14 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> { 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 { + // FIXME: 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 = unsafe { // We actually don't have to adjust the offsets, // because copy_file_range adjusts the file offset automatically |
