call PyLease::into_owned as method

youknowone · youknowone · commit 35ea4b541ed9 · 2022-04-18T06:56:45.000+09:00
diff --git a/vm/src/builtins/pytype.rs b/vm/src/builtins/pytype.rs
@@ -10,7 +10,6 @@ use crate::common::{
 use crate::{
     function::{FuncArgs, KwArgs, OptionalArg},
     pyclass::{PyClassImpl, StaticType},
-    pyobject::PyLease,
     types::{Callable, GetAttr, PyTypeFlags, PyTypeSlots, SetAttr},
     AsPyObject, PyContext, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine,
 };
@@ -647,7 +646,7 @@ impl GetAttr for PyType {
                 .is_some()
             {
                 if let Some(descr_get) = attr_class.mro_find_map(|cls| cls.slots.descr_get.load()) {
-                    let mcl = PyLease::into_owned(mcl).into();
+                    let mcl = mcl.into_owned().into();
                     return descr_get(attr.clone(), Some(zelf.into()), Some(mcl), vm);
                 }
             }
@@ -874,7 +873,7 @@ fn calculate_meta_class(
         if winner.fast_issubclass(&base_type) {
             continue;
         } else if base_type.fast_issubclass(&winner) {
-            winner = PyLease::into_owned(base_type);
+            winner = base_type.into_owned();
             continue;
         }
 
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -746,7 +746,7 @@ impl PyMethod {
                             .is_some()
                         {
                             drop(descr_cls);
-                            let cls = PyLease::into_owned(cls).into();
+                            let cls = cls.into_owned().into();
                             return descr_get(descr, Some(obj), Some(cls), vm).map(Self::Attribute);
                         }
                     }
@@ -774,7 +774,7 @@ impl PyMethod {
                     })
                 }
                 Some(descr_get) => {
-                    let cls = PyLease::into_owned(cls).into();
+                    let cls = cls.into_owned().into();
                     descr_get(attr, Some(obj), Some(cls), vm).map(Self::Attribute)
                 }
                 None => Ok(Self::Attribute(attr)),
@@ -815,7 +815,7 @@ impl PyMethod {
             drop(obj_cls);
             Self::Function { target: obj, func }
         } else {
-            let obj_cls = PyLease::into_owned(obj_cls).into();
+            let obj_cls = obj_cls.into_owned().into();
             let attr = vm
                 .call_get_descriptor_specific(func, Some(obj), Some(obj_cls))
                 .unwrap_or_else(Ok)?;
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -23,7 +23,6 @@ use crate::{
     function::{ArgMapping, FuncArgs},
     import,
     protocol::PyIterIter,
-    pyobject::PyLease,
     scope::Scope,
     signal, stdlib, AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyRefExact, PyResult,
     PyValue,
@@ -785,7 +784,7 @@ impl VirtualMachine {
                         .is_some()
                     {
                         drop(descr_cls);
-                        let cls = PyLease::into_owned(obj_cls).into();
+                        let cls = obj_cls.into_owned().into();
                         return descr_get(descr, Some(obj), Some(cls), self).map(Some);
                     }
                 }
@@ -808,7 +807,7 @@ impl VirtualMachine {
         } else if let Some((attr, descr_get)) = cls_attr {
             match descr_get {
                 Some(descr_get) => {
-                    let cls = PyLease::into_owned(obj_cls).into();
+                    let cls = obj_cls.into_owned().into();
                     descr_get(attr, Some(obj), Some(cls), self).map(Some)
                 }
                 None => Ok(Some(attr)),

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ use crate::common::{`
`10`	`10`	`use crate::{`
`11`	`11`	`function::{FuncArgs, KwArgs, OptionalArg},`
`12`	`12`	`pyclass::{PyClassImpl, StaticType},`
`13`		`- pyobject::PyLease,`
`14`	`13`	`types::{Callable, GetAttr, PyTypeFlags, PyTypeSlots, SetAttr},`
`15`	`14`	`AsPyObject, PyContext, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine,`
`16`	`15`	`};`
`@@ -647,7 +646,7 @@ impl GetAttr for PyType {`
`647`	`646`	`.is_some()`
`648`	`647`	`{`
`649`	`648`	`if let Some(descr_get) = attr_class.mro_find_map(\|cls\| cls.slots.descr_get.load()) {`
`650`		`- let mcl = PyLease::into_owned(mcl).into();`
	`649`	`+ let mcl = mcl.into_owned().into();`
`651`	`650`	`return descr_get(attr.clone(), Some(zelf.into()), Some(mcl), vm);`
`652`	`651`	`}`
`653`	`652`	`}`
`@@ -874,7 +873,7 @@ fn calculate_meta_class(`
`874`	`873`	`if winner.fast_issubclass(&base_type) {`
`875`	`874`	`continue;`
`876`	`875`	`} else if base_type.fast_issubclass(&winner) {`
`877`		`- winner = PyLease::into_owned(base_type);`
	`876`	`+ winner = base_type.into_owned();`
`878`	`877`	`continue;`
`879`	`878`	`}`
`880`	`879`
Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ impl PyMethod {`
`746`	`746`	`.is_some()`
`747`	`747`	`{`
`748`	`748`	`drop(descr_cls);`
`749`		`- let cls = PyLease::into_owned(cls).into();`
	`749`	`+ let cls = cls.into_owned().into();`
`750`	`750`	`return descr_get(descr, Some(obj), Some(cls), vm).map(Self::Attribute);`
`751`	`751`	`}`
`752`	`752`	`}`
`@@ -774,7 +774,7 @@ impl PyMethod {`
`774`	`774`	`})`
`775`	`775`	`}`
`776`	`776`	`Some(descr_get) => {`
`777`		`- let cls = PyLease::into_owned(cls).into();`
	`777`	`+ let cls = cls.into_owned().into();`
`778`	`778`	`descr_get(attr, Some(obj), Some(cls), vm).map(Self::Attribute)`
`779`	`779`	`}`
`780`	`780`	`None => Ok(Self::Attribute(attr)),`
`@@ -815,7 +815,7 @@ impl PyMethod {`
`815`	`815`	`drop(obj_cls);`
`816`	`816`	`Self::Function { target: obj, func }`
`817`	`817`	`} else {`
`818`		`- let obj_cls = PyLease::into_owned(obj_cls).into();`
	`818`	`+ let obj_cls = obj_cls.into_owned().into();`
`819`	`819`	`let attr = vm`
`820`	`820`	`.call_get_descriptor_specific(func, Some(obj), Some(obj_cls))`
`821`	`821`	`.unwrap_or_else(Ok)?;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ use crate::{`
`23`	`23`	`function::{ArgMapping, FuncArgs},`
`24`	`24`	`import,`
`25`	`25`	`protocol::PyIterIter,`
`26`		`- pyobject::PyLease,`
`27`	`26`	`scope::Scope,`
`28`	`27`	`signal, stdlib, AsPyObject, PyContext, PyObject, PyObjectRef, PyRef, PyRefExact, PyResult,`
`29`	`28`	`PyValue,`
`@@ -785,7 +784,7 @@ impl VirtualMachine {`
`785`	`784`	`.is_some()`
`786`	`785`	`{`
`787`	`786`	`drop(descr_cls);`
`788`		`- let cls = PyLease::into_owned(obj_cls).into();`
	`787`	`+ let cls = obj_cls.into_owned().into();`
`789`	`788`	`return descr_get(descr, Some(obj), Some(cls), self).map(Some);`
`790`	`789`	`}`
`791`	`790`	`}`
`@@ -808,7 +807,7 @@ impl VirtualMachine {`
`808`	`807`	`} else if let Some((attr, descr_get)) = cls_attr {`
`809`	`808`	`match descr_get {`
`810`	`809`	`Some(descr_get) => {`
`811`		`- let cls = PyLease::into_owned(obj_cls).into();`
	`810`	`+ let cls = obj_cls.into_owned().into();`
`812`	`811`	`descr_get(attr, Some(obj), Some(cls), self).map(Some)`
`813`	`812`	`}`
`814`	`813`	`None => Ok(Some(attr)),`