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

Removed unnecessary clones in method call

Browse Source
This commit is contained in:
pca006132
2021-02-17 12:30:35 +08:00
parent afefd163a6
commit de5e94ec56
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vm/src/builtins/pytype.rs
View File

@@ -629,7 +629,7 @@ fn subtype_get_dict(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult {
// TODO: obj.class().as_pyref() need to be supported
let cls = obj.clone_class();
let ret = match find_base_dict_descr(&cls, vm) {
Some(descr) => vm.call_get_descriptor(descr, obj).unwrap_or_else(|| {
Some(descr) => vm.call_get_descriptor(descr, obj).unwrap_or_else(|_| {
Err(vm.new_type_error(format!(
"this __dict__ descriptor does not support '{}' objects",
cls.name

18
vm/src/vm.rs
View File

@@ -939,19 +939,25 @@ impl VirtualMachine {
descr: PyObjectRef,
obj: Option<PyObjectRef>,
cls: Option<PyObjectRef>,
) -> Option<PyResult> {
) -> Result<PyResult, PyObjectRef> {
let descr_get = descr.class().mro_find_map(|cls| cls.slots.descr_get.load());
descr_get.map(|descr_get| descr_get(descr, obj, cls, self))
match descr_get {
Some(descr_get) => Ok(descr_get(descr, obj, cls, self)),
None => Err(descr),
}
}
pub fn call_get_descriptor(&self, descr: PyObjectRef, obj: PyObjectRef) -> Option<PyResult> {
pub fn call_get_descriptor(
&self,
descr: PyObjectRef,
obj: PyObjectRef,
) -> Result<PyResult, PyObjectRef> {
let cls = obj.clone_class().into_object();
self.call_get_descriptor_specific(descr, Some(obj), Some(cls))
}
pub fn call_if_get_descriptor(&self, attr: PyObjectRef, obj: PyObjectRef) -> PyResult {
self.call_get_descriptor(attr.clone(), obj)
.unwrap_or(Ok(attr))
self.call_get_descriptor(attr, obj).unwrap_or_else(Ok)
}
pub fn call_method<T>(&self, obj: &PyObjectRef, method_name: &str, args: T) -> PyResult
@@ -1252,7 +1258,7 @@ impl VirtualMachine {
if let Some(ref attr) = cls_attr {
if attr.class().has_attr("__set__") {
if let Some(r) = self.call_get_descriptor(attr.clone(), obj.clone()) {
if let Ok(r) = self.call_get_descriptor(attr.clone(), obj.clone()) {
return r.map(Some);
}
}