PyLease::{into_pyref -> into_owned}

youknowone · youknowone · commit 9ecc95d914ae · 2022-04-18T06:56:45.000+09:00
diff --git a/vm/src/builtins/pytype.rs b/vm/src/builtins/pytype.rs
@@ -647,7 +647,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_pyref(mcl).into();
+                    let mcl = PyLease::into_owned(mcl).into();
                     return descr_get(attr.clone(), Some(zelf.into()), Some(mcl), vm);
                 }
             }
@@ -874,7 +874,7 @@ fn calculate_meta_class(
         if winner.fast_issubclass(&base_type) {
             continue;
         } else if base_type.fast_issubclass(&winner) {
-            winner = PyLease::into_pyref(base_type);
+            winner = PyLease::into_owned(base_type);
             continue;
         }
 
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -467,11 +467,9 @@ pub struct PyLease<'a, T: PyObjectPayload> {
 }
 
 impl<'a, T: PyObjectPayload + PyValue> PyLease<'a, T> {
-    // Associated function on purpose, because of deref
-    #[allow(clippy::wrong_self_convention)]
     #[inline(always)]
-    pub fn into_pyref(zelf: Self) -> PyRef<T> {
-        zelf.inner.clone()
+    pub fn into_owned(self) -> PyRef<T> {
+        self.inner.clone()
     }
 }
 
@@ -748,7 +746,7 @@ impl PyMethod {
                             .is_some()
                         {
                             drop(descr_cls);
-                            let cls = PyLease::into_pyref(cls).into();
+                            let cls = PyLease::into_owned(cls).into();
                             return descr_get(descr, Some(obj), Some(cls), vm).map(Self::Attribute);
                         }
                     }
@@ -776,7 +774,7 @@ impl PyMethod {
                     })
                 }
                 Some(descr_get) => {
-                    let cls = PyLease::into_pyref(cls).into();
+                    let cls = PyLease::into_owned(cls).into();
                     descr_get(attr, Some(obj), Some(cls), vm).map(Self::Attribute)
                 }
                 None => Ok(Self::Attribute(attr)),
@@ -817,7 +815,7 @@ impl PyMethod {
             drop(obj_cls);
             Self::Function { target: obj, func }
         } else {
-            let obj_cls = PyLease::into_pyref(obj_cls).into();
+            let obj_cls = PyLease::into_owned(obj_cls).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
@@ -785,7 +785,7 @@ impl VirtualMachine {
                         .is_some()
                     {
                         drop(descr_cls);
-                        let cls = PyLease::into_pyref(obj_cls).into();
+                        let cls = PyLease::into_owned(obj_cls).into();
                         return descr_get(descr, Some(obj), Some(cls), self).map(Some);
                     }
                 }
@@ -808,7 +808,7 @@ impl VirtualMachine {
         } else if let Some((attr, descr_get)) = cls_attr {
             match descr_get {
                 Some(descr_get) => {
-                    let cls = PyLease::into_pyref(obj_cls).into();
+                    let cls = PyLease::into_owned(obj_cls).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
`@@ -647,7 +647,7 @@ impl GetAttr for PyType {`
`647`	`647`	`.is_some()`
`648`	`648`	`{`
`649`	`649`	`if let Some(descr_get) = attr_class.mro_find_map(\|cls\| cls.slots.descr_get.load()) {`
`650`		`- let mcl = PyLease::into_pyref(mcl).into();`
	`650`	`+ let mcl = PyLease::into_owned(mcl).into();`
`651`	`651`	`return descr_get(attr.clone(), Some(zelf.into()), Some(mcl), vm);`
`652`	`652`	`}`
`653`	`653`	`}`
`@@ -874,7 +874,7 @@ fn calculate_meta_class(`
`874`	`874`	`if winner.fast_issubclass(&base_type) {`
`875`	`875`	`continue;`
`876`	`876`	`} else if base_type.fast_issubclass(&winner) {`
`877`		`- winner = PyLease::into_pyref(base_type);`
	`877`	`+ winner = PyLease::into_owned(base_type);`
`878`	`878`	`continue;`
`879`	`879`	`}`
`880`	`880`
Original file line number	Diff line number	Diff line change
`@@ -467,11 +467,9 @@ pub struct PyLease<'a, T: PyObjectPayload> {`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`impl<'a, T: PyObjectPayload + PyValue> PyLease<'a, T> {`
`470`		`- // Associated function on purpose, because of deref`
`471`		`- #[allow(clippy::wrong_self_convention)]`
`472`	`470`	`#[inline(always)]`
`473`		`- pub fn into_pyref(zelf: Self) -> PyRef<T> {`
`474`		`- zelf.inner.clone()`
	`471`	`+ pub fn into_owned(self) -> PyRef<T> {`
	`472`	`+ self.inner.clone()`
`475`	`473`	`}`
`476`	`474`	`}`
`477`	`475`
`@@ -748,7 +746,7 @@ impl PyMethod {`
`748`	`746`	`.is_some()`
`749`	`747`	`{`
`750`	`748`	`drop(descr_cls);`
`751`		`- let cls = PyLease::into_pyref(cls).into();`
	`749`	`+ let cls = PyLease::into_owned(cls).into();`
`752`	`750`	`return descr_get(descr, Some(obj), Some(cls), vm).map(Self::Attribute);`
`753`	`751`	`}`
`754`	`752`	`}`
`@@ -776,7 +774,7 @@ impl PyMethod {`
`776`	`774`	`})`
`777`	`775`	`}`
`778`	`776`	`Some(descr_get) => {`
`779`		`- let cls = PyLease::into_pyref(cls).into();`
	`777`	`+ let cls = PyLease::into_owned(cls).into();`
`780`	`778`	`descr_get(attr, Some(obj), Some(cls), vm).map(Self::Attribute)`
`781`	`779`	`}`
`782`	`780`	`None => Ok(Self::Attribute(attr)),`
`@@ -817,7 +815,7 @@ impl PyMethod {`
`817`	`815`	`drop(obj_cls);`
`818`	`816`	`Self::Function { target: obj, func }`
`819`	`817`	`} else {`
`820`		`- let obj_cls = PyLease::into_pyref(obj_cls).into();`
	`818`	`+ let obj_cls = PyLease::into_owned(obj_cls).into();`
`821`	`819`	`let attr = vm`
`822`	`820`	`.call_get_descriptor_specific(func, Some(obj), Some(obj_cls))`
`823`	`821`	`.unwrap_or_else(Ok)?;`
Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@ impl VirtualMachine {`
`785`	`785`	`.is_some()`
`786`	`786`	`{`
`787`	`787`	`drop(descr_cls);`
`788`		`- let cls = PyLease::into_pyref(obj_cls).into();`
	`788`	`+ let cls = PyLease::into_owned(obj_cls).into();`
`789`	`789`	`return descr_get(descr, Some(obj), Some(cls), self).map(Some);`
`790`	`790`	`}`
`791`	`791`	`}`
`@@ -808,7 +808,7 @@ impl VirtualMachine {`
`808`	`808`	`} else if let Some((attr, descr_get)) = cls_attr {`
`809`	`809`	`match descr_get {`
`810`	`810`	`Some(descr_get) => {`
`811`		`- let cls = PyLease::into_pyref(obj_cls).into();`
	`811`	`+ let cls = PyLease::into_owned(obj_cls).into();`
`812`	`812`	`descr_get(attr, Some(obj), Some(cls), self).map(Some)`
`813`	`813`	`}`
`814`	`814`	`None => Ok(Some(attr)),`