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

Improve code quality

Browse Source
This commit is contained in:
ChJR
2022-07-16 17:09:27 +09:00
parent 9d9f9d364b
commit 4bf5644712
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vm/src/builtins/classmethod.rs
View File

@@ -67,18 +67,20 @@ impl Constructor for PyClassMethod {
type Args = PyObjectRef;
fn py_new(cls: PyTypeRef, callable: Self::Args, vm: &VirtualMachine) -> PyResult {
let result: PyResult<PyObjectRef> = PyClassMethod {
callable: PyMutex::new(callable.clone()),
let doc = callable.get_attr("__doc__", vm);
let result = PyClassMethod {
callable: PyMutex::new(callable),
}
.into_ref_with_type(vm, cls)
.map(Into::into);
.into_ref_with_type(vm, cls)?;
let obj = PyObjectRef::from(result);
let doc: PyResult<PyObjectRef> = callable.get_attr("__doc__", vm);
let doc = vm.unwrap_pyresult(doc);
let obj = vm.unwrap_pyresult(result.clone());
match doc {
Err(_) => None,
Ok(doc) => Some(obj.set_attr("__doc__", doc, vm)),
};
obj.set_attr("__doc__", doc, vm)?;
result
Ok(obj)
}
}

19
vm/src/builtins/staticmethod.rs
View File

@@ -41,18 +41,17 @@ impl Constructor for PyStaticMethod {
type Args = PyObjectRef;
fn py_new(cls: PyTypeRef, callable: Self::Args, vm: &VirtualMachine) -> PyResult {
let result: PyResult<PyObjectRef> = PyStaticMethod {
callable: callable.clone(),
}
.into_ref_with_type(vm, cls)
.map(Into::into);
let doc = callable.get_attr("__doc__", vm);
let doc: PyResult<PyObjectRef> = callable.get_attr("__doc__", vm);
let doc = vm.unwrap_pyresult(doc);
let obj = vm.unwrap_pyresult(result.clone());
let result = PyStaticMethod { callable }.into_ref_with_type(vm, cls)?;
let obj = PyObjectRef::from(result);
obj.set_attr("__doc__", doc, vm)?;
result
match doc {
Err(_) => None,
Ok(doc) => Some(obj.set_attr("__doc__", doc, vm)),
};
Ok(obj)
}
}