Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

os: Fix unused warning and propagate errno to user

Browse Source
This commit is contained in:
Dean Li
2021-04-18 09:30:42 +08:00
parent f8ee3d7434
commit 6fefadeb39
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vm/src/stdlib/os.rs
View File

@@ -1,5 +1,3 @@
use std::convert::TryFrom;
use std::convert::TryInto;
use std::ffi;
use std::fs::File;
use std::fs::OpenOptions;
@@ -1197,6 +1195,7 @@ mod _os {
}
}
#[cfg(target_os = "linux")]
#[derive(FromArgs)]
struct CopyFileRangeArgs {
#[pyarg(positional)]
@@ -1214,12 +1213,13 @@ mod _os {
#[cfg(target_os = "linux")]
#[pyfunction]
fn copy_file_range(args: CopyFileRangeArgs, vm: &VirtualMachine) -> PyResult<usize> {
use std::convert::{TryFrom, TryInto};
let p_offset_src = args.offset_src.as_ref().map_or_else(std::ptr::null, |x| x);
let p_offset_dst = args.offset_dst.as_ref().map_or_else(std::ptr::null, |x| x);
let count: usize = args
.count
.try_into()
.map_err(|_| vm.new_value_error("count should > 0".to_string()))?;
.map_err(|_| vm.new_value_error("count should >= 0".to_string()))?;
// The flags argument is provided to allow
// for future extensions and currently must be to 0.
@@ -1238,7 +1238,7 @@ mod _os {
)
};
usize::try_from(ret).map_err(|_| vm.new_os_error("Fail to copy_file_range".to_string()))
usize::try_from(ret).map_err(|_| errno_err(vm))
}
#[pyfunction]