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

Use map_err

Browse Source
This commit is contained in:
Aviv Palivoda
2019-04-06 21:11:58 +03:00
parent a21aa6eac9
commit 401ca08b65
1 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,40 +142,20 @@ fn os_write(fd: PyIntRef, data: PyBytesRef, vm: &VirtualMachine) -> PyResult {
Ok(vm.ctx.new_int(written))
}
fn os_remove(path: PyStringRef, vm: &VirtualMachine) -> PyResult {
match fs::remove_file(&path.value) {
Ok(_) => (),
Err(s) => return Err(vm.new_os_error(s.to_string())),
}
Ok(vm.get_none())
fn os_remove(path: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
fs::remove_file(&path.value).map_err(|s| vm.new_os_error(s.to_string()))
}
fn os_mkdir(path: PyStringRef, vm: &VirtualMachine) -> PyResult {
match fs::create_dir(&path.value) {
Ok(_) => (),
Err(s) => return Err(vm.new_os_error(s.to_string())),
}
Ok(vm.get_none())
fn os_mkdir(path: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
fs::create_dir(&path.value).map_err(|s| vm.new_os_error(s.to_string()))
}
fn os_mkdirs(path: PyStringRef, vm: &VirtualMachine) -> PyResult {
match fs::create_dir_all(&path.value) {
Ok(_) => (),
Err(s) => return Err(vm.new_os_error(s.to_string())),
}
Ok(vm.get_none())
fn os_mkdirs(path: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
fs::create_dir_all(&path.value).map_err(|s| vm.new_os_error(s.to_string()))
}
fn os_rmdir(path: PyStringRef, vm: &VirtualMachine) -> PyResult {
match fs::remove_dir(&path.value) {
Ok(_) => (),
Err(s) => return Err(vm.new_os_error(s.to_string())),
}
Ok(vm.get_none())
fn os_rmdir(path: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
fs::remove_dir(&path.value).map_err(|s| vm.new_os_error(s.to_string()))
}
fn os_listdir(path: PyStringRef, vm: &VirtualMachine) -> PyResult {