RustPython · youknowone · Oct 21, 2021 · Oct 14, 2021 · Oct 14, 2021 · Oct 14, 2021
diff --git a/ast/asdl_rs.py b/ast/asdl_rs.py
@@ -401,7 +401,7 @@ class ExtendModuleVisitor(EmitVisitor):
 
     def visitModule(self, mod):
         depth = 0
-        self.emit("pub fn extend_module_nodes(vm: &VirtualMachine, module: &PyObjectRef) {", depth)
+        self.emit("pub fn extend_module_nodes(vm: &VirtualMachine, module: &crate::PyObj) {", depth)
         self.emit("extend_module!(vm, module, {", depth + 1)
         for dfn in mod.dfns:
             self.visit(dfn, depth + 2)

diff --git a/derive/src/pyclass.rs b/derive/src/pyclass.rs
@@ -667,7 +667,7 @@ impl ToTokens for GetSetNursery {
                     #( #cfgs )*
                     class.set_str_attr(
                         #name,
-                        ::rustpython_vm::PyObject::new(
+                        ::rustpython_vm::PyGenericObject::new(
                             ::rustpython_vm::builtins::PyGetSet::new(#name.into(), class.clone())
                                 .with_get(&Self::#getter)
                                 #setter #deleter,

diff --git a/derive/src/pymodule.rs b/derive/src/pymodule.rs
@@ -76,7 +76,7 @@ pub fn impl_pymodule(attr: AttributeArgs, module_item: Item) -> Result<TokenStre
         parse_quote! {
             pub(crate) fn extend_module(
                 vm: &::rustpython_vm::VirtualMachine,
-                module: &::rustpython_vm::PyObjectRef,
+                module: &::rustpython_vm::PyObject,
             ) {
                 #module_extend_items
             }

diff --git a/src/shell/helper.rs b/src/shell/helper.rs
@@ -88,7 +88,7 @@ impl<'vm> ShellHelper<'vm> {
         } else {
             // we need to get a variable based off of globals/builtins
 
-            let globals = str_iter_method(self.globals.as_object().clone(), "keys").ok()?;
+            let globals = str_iter_method(self.globals.as_object().to_owned(), "keys").ok()?;
             let builtins = str_iter_method(self.vm.builtins.clone(), "__dir__").ok()?;
             (first, globals, Some(builtins))
         };

diff --git a/stdlib/src/array.rs b/stdlib/src/array.rs
@@ -28,8 +28,8 @@ mod array {
             AsBuffer, AsMapping, Comparable, Constructor, IterNext, IterNextIterable, Iterable,
             PyComparisonOp,
         },
-        IdProtocol, PyComparisonValue, PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
-        TypeProtocol, VirtualMachine,
+        IdProtocol, PyComparisonValue, PyObject, PyObjectRef, PyObjectView, PyRef, PyResult,
+        PyValue, TryFromObject, TypeProtocol, VirtualMachine,
     };
     use crossbeam_utils::atomic::AtomicCell;
     use itertools::Itertools;
@@ -1111,7 +1111,7 @@ mod array {
             let iter = Iterator::zip(array_a.iter(vm), array_b.iter(vm));
 
             for (a, b) in iter {
-                if !vm.bool_eq(&a?, &b?)? {
+                if !vm.bool_eq(&*a?, &*b?)? {
                     return Ok(false);
                 }
             }
@@ -1167,8 +1167,8 @@ mod array {
 
     impl Comparable for PyArray {
         fn cmp(
-            zelf: &PyRef<Self>,
-            other: &PyObjectRef,
+            zelf: &PyObjectView<Self>,
+            other: &PyObject,
             op: PyComparisonOp,
             vm: &VirtualMachine,
         ) -> PyResult<PyComparisonValue> {
@@ -1195,8 +1195,12 @@ mod array {
 
                     for (a, b) in iter {
                         let ret = match op {
-                            PyComparisonOp::Lt | PyComparisonOp::Le => vm.bool_seq_lt(&a?, &b?)?,
-                            PyComparisonOp::Gt | PyComparisonOp::Ge => vm.bool_seq_gt(&a?, &b?)?,
+                            PyComparisonOp::Lt | PyComparisonOp::Le => {
+                                vm.bool_seq_lt(&*a?, &*b?)?
+                            }
+                            PyComparisonOp::Gt | PyComparisonOp::Ge => {
+                                vm.bool_seq_gt(&*a?, &*b?)?
+                            }
                             _ => unreachable!(),
                         };
                         if let Some(v) = ret {
@@ -1214,11 +1218,11 @@ mod array {
     }
 
     impl AsBuffer for PyArray {
-        fn as_buffer(zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
+        fn as_buffer(zelf: &PyObjectView<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
             let array = zelf.read();
             let buf = PyBuffer::new(
-                zelf.as_object().clone(),
-                PyArrayBufferInternal(zelf.clone()),
+                zelf.as_object().to_owned(),
+                PyArrayBufferInternal(zelf.to_owned()),
                 BufferOptions {
                     readonly: false,
                     len: array.len(),
@@ -1253,7 +1257,7 @@ mod array {
     }
 
     impl AsMapping for PyArray {
-        fn as_mapping(_zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyMappingMethods {
+        fn as_mapping(_zelf: &PyObjectView<Self>, _vm: &VirtualMachine) -> PyMappingMethods {
             PyMappingMethods {
                 length: Some(Self::length),
                 subscript: Some(Self::subscript),
@@ -1322,7 +1326,7 @@ mod array {
 
     impl IterNextIterable for PyArrayIter {}
     impl IterNext for PyArrayIter {
-        fn next(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
+        fn next(zelf: &PyObjectView<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
             let pos = zelf.position.fetch_add(1);
             let r = if let Some(item) = zelf.array.read().getitem_by_idx(pos, vm)? {
                 PyIterReturn::Return(item)

diff --git a/stdlib/src/bisect.rs b/stdlib/src/bisect.rs
@@ -105,7 +105,7 @@ mod _bisect {
         while lo < hi {
             // Handles issue 13496.
             let mid = (lo + hi) / 2;
-            if x.rich_compare_bool(&a.get_item(mid, vm)?, Lt, vm)? {
+            if x.rich_compare_bool(&*a.get_item(mid, vm)?, Lt, vm)? {
                 hi = mid;
             } else {
                 lo = mid + 1;

diff --git a/stdlib/src/csv.rs b/stdlib/src/csv.rs
@@ -16,7 +16,7 @@ mod _csv {
         match_class,
         protocol::{PyIter, PyIterReturn},
         types::{IterNext, IterNextIterable},
-        PyObjectRef, PyRef, PyResult, PyValue, TryFromObject, TypeProtocol, VirtualMachine,
+        PyObjectRef, PyObjectView, PyResult, PyValue, TryFromObject, TypeProtocol, VirtualMachine,
     };
     use itertools::{self, Itertools};
     use std::fmt;
@@ -172,7 +172,7 @@ mod _csv {
     impl Reader {}
     impl IterNextIterable for Reader {}
     impl IterNext for Reader {
-        fn next(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
+        fn next(zelf: &PyObjectView<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
             let string = match zelf.iter.next(vm)? {
                 PyIterReturn::Return(obj) => obj,
                 PyIterReturn::StopIteration(v) => return Ok(PyIterReturn::StopIteration(v)),

diff --git a/stdlib/src/json.rs b/stdlib/src/json.rs
@@ -9,7 +9,7 @@ mod _json {
         function::{IntoPyObject, IntoPyResult, OptionalArg},
         protocol::PyIterReturn,
         types::{Callable, Constructor},
-        IdProtocol, PyObjectRef, PyRef, PyResult, PyValue, VirtualMachine,
+        IdProtocol, PyObjectRef, PyObjectView, PyResult, PyValue, VirtualMachine,
     };
     use num_bigint::BigInt;
     use std::str::FromStr;
@@ -195,7 +195,11 @@ mod _json {
 
     impl Callable for JsonScanner {
         type Args = (PyStrRef, isize);
-        fn call(zelf: &PyRef<Self>, (pystr, idx): Self::Args, vm: &VirtualMachine) -> PyResult {
+        fn call(
+            zelf: &PyObjectView<Self>,
+            (pystr, idx): Self::Args,
+            vm: &VirtualMachine,
+        ) -> PyResult {
             if idx < 0 {
                 return Err(vm.new_value_error("idx cannot be negative".to_owned()));
             }
@@ -204,8 +208,14 @@ mod _json {
             if idx > 0 && chars.nth(idx - 1).is_none() {
                 PyIterReturn::StopIteration(Some(vm.ctx.new_int(idx).into())).into_pyresult(vm)
             } else {
-                zelf.parse(chars.as_str(), pystr.clone(), idx, zelf.clone().into(), vm)
-                    .and_then(|x| x.into_pyresult(vm))
+                zelf.parse(
+                    chars.as_str(),
+                    pystr.clone(),
+                    idx,
+                    zelf.to_owned().into(),
+                    vm,
+                )
+                .and_then(|x| x.into_pyresult(vm))
             }
         }
     }

diff --git a/stdlib/src/math.rs b/stdlib/src/math.rs
@@ -6,7 +6,7 @@ mod math {
         builtins::{try_bigint_to_f64, try_f64_to_bigint, PyFloat, PyInt, PyIntRef},
         function::{ArgIntoFloat, ArgIterable, OptionalArg, PosArgs},
         utils::Either,
-        PyObjectRef, PyRef, PyResult, PySequence, TypeProtocol, VirtualMachine,
+        PyObject, PyObjectRef, PyRef, PyResult, PySequence, TypeProtocol, VirtualMachine,
     };
     use num_bigint::BigInt;
     use num_traits::{One, Signed, Zero};
@@ -408,8 +408,8 @@ mod math {
         }
     }
 
-    fn try_magic_method(func_name: &str, vm: &VirtualMachine, value: &PyObjectRef) -> PyResult {
-        let method = vm.get_method_or_type_error(value.clone(), func_name, || {
+    fn try_magic_method(func_name: &str, vm: &VirtualMachine, value: &PyObject) -> PyResult {
+        let method = vm.get_method_or_type_error(value.to_owned(), func_name, || {
             format!(
                 "type '{}' doesn't define '{}' method",
                 value.class().name(),

diff --git a/stdlib/src/resource.rs b/stdlib/src/resource.rs
@@ -5,7 +5,7 @@ mod resource {
     use crate::vm::{
         function::{IntoPyException, IntoPyObject},
         stdlib::os,
-        PyObjectRef, PyResult, PyStructSequence, TryFromBorrowedObject, VirtualMachine,
+        PyObject, PyObjectRef, PyResult, PyStructSequence, TryFromBorrowedObject, VirtualMachine,
     };
     use std::{io, mem};
 
@@ -113,7 +113,7 @@ mod resource {
 
     struct Limits(libc::rlimit);
     impl TryFromBorrowedObject for Limits {
-        fn try_from_borrowed_object(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<Self> {
+        fn try_from_borrowed_object(vm: &VirtualMachine, obj: &PyObject) -> PyResult<Self> {
             let seq = vm.extract_elements::<libc::rlim_t>(obj)?;
             match *seq {
                 [cur, max] => Ok(Self(libc::rlimit {

diff --git a/stdlib/src/ssl.rs b/stdlib/src/ssl.rs
@@ -802,7 +802,7 @@ mod _ssl {
                 stream: PyRwLock::new(stream),
                 socket_type,
                 server_hostname: args.server_hostname,
-                owner: PyRwLock::new(args.owner.as_ref().map(PyWeak::downgrade)),
+                owner: PyRwLock::new(args.owner.as_ref().map(|o| PyWeak::downgrade(o))),
             })
         }
     }

diff --git a/vm/src/builtins/asyncgenerator.rs b/vm/src/builtins/asyncgenerator.rs
@@ -259,7 +259,7 @@ impl PyAsyncGenASend {
 
 impl IterNextIterable for PyAsyncGenASend {}
 impl IterNext for PyAsyncGenASend {
-    fn next(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
+    fn next(zelf: &crate::PyObjectView<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
         PyIterReturn::from_pyresult(zelf.send(vm.ctx.none(), vm), vm)
     }
 }
@@ -405,7 +405,7 @@ impl PyAsyncGenAThrow {
 
 impl IterNextIterable for PyAsyncGenAThrow {}
 impl IterNext for PyAsyncGenAThrow {
-    fn next(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
+    fn next(zelf: &crate::PyObjectView<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
         PyIterReturn::from_pyresult(zelf.send(vm.ctx.none(), vm), vm)
     }
 }

diff --git a/vm/src/builtins/builtinfunc.rs b/vm/src/builtins/builtinfunc.rs
@@ -96,7 +96,7 @@ impl PyBuiltinFunction {
 impl Callable for PyBuiltinFunction {
     type Args = FuncArgs;
     #[inline]
-    fn call(zelf: &PyRef<Self>, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
+    fn call(zelf: &crate::PyObjectView<Self>, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
         (zelf.value.func)(vm, args)
     }
 }
@@ -193,7 +193,7 @@ impl GetDescriptor for PyBuiltinMethod {
 impl Callable for PyBuiltinMethod {
     type Args = FuncArgs;
     #[inline]
-    fn call(zelf: &PyRef<Self>, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
+    fn call(zelf: &crate::PyObjectView<Self>, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
         (zelf.value.func)(vm, args)
     }
 }

diff --git a/vm/src/builtins/bytearray.rs b/vm/src/builtins/bytearray.rs
@@ -28,8 +28,8 @@ use crate::{
         IterNextIterable, Iterable, PyComparisonOp, Unconstructible, Unhashable,
     },
     utils::Either,
-    IdProtocol, PyClassDef, PyClassImpl, PyComparisonValue, PyContext, PyObjectRef, PyRef,
-    PyResult, PyValue, TypeProtocol, VirtualMachine,
+    IdProtocol, PyClassDef, PyClassImpl, PyComparisonValue, PyContext, PyObject, PyObjectRef,
+    PyRef, PyResult, PyValue, TypeProtocol, VirtualMachine,
 };
 use bstr::ByteSlice;
 use crossbeam_utils::atomic::AtomicCell;
@@ -290,7 +290,7 @@ impl PyByteArray {
         }
     }
 
-    fn irepeat(zelf: &PyRef<Self>, n: usize, vm: &VirtualMachine) -> PyResult<()> {
+    fn irepeat(zelf: &crate::PyObjectView<Self>, n: usize, vm: &VirtualMachine) -> PyResult<()> {
         if n == 1 {
             return Ok(());
         }
@@ -696,8 +696,8 @@ impl PyByteArray {
 
 impl Comparable for PyByteArray {
     fn cmp(
-        zelf: &PyRef<Self>,
-        other: &PyObjectRef,
+        zelf: &crate::PyObjectView<Self>,
+        other: &PyObject,
         op: PyComparisonOp,
         vm: &VirtualMachine,
     ) -> PyResult<PyComparisonValue> {
@@ -709,10 +709,10 @@ impl Comparable for PyByteArray {
 }
 
 impl AsBuffer for PyByteArray {
-    fn as_buffer(zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
+    fn as_buffer(zelf: &crate::PyObjectView<Self>, _vm: &VirtualMachine) -> PyResult<PyBuffer> {
         let buffer = PyBuffer::new(
-            zelf.as_object().clone(),
-            zelf.clone(),
+            zelf.as_object().to_owned(),
+            zelf.to_owned(),
             BufferOptions {
                 readonly: false,
                 len: zelf.len(),
@@ -756,7 +756,7 @@ impl<'a> BufferResizeGuard<'a> for PyByteArray {
 }
 
 impl AsMapping for PyByteArray {
-    fn as_mapping(_zelf: &PyRef<Self>, _vm: &VirtualMachine) -> PyMappingMethods {
+    fn as_mapping(_zelf: &crate::PyObjectView<Self>, _vm: &VirtualMachine) -> PyMappingMethods {
         PyMappingMethods {
             length: Some(Self::length),
             subscript: Some(Self::subscript),
@@ -801,7 +801,7 @@ impl Iterable for PyByteArray {
     }
 }
 
-// fn set_value(obj: &PyObjectRef, value: Vec<u8>) {
+// fn set_value(obj: &PyObject, value: Vec<u8>) {
 //     obj.borrow_mut().kind = PyObjectPayload::Bytes { value };
 // }
 
@@ -841,7 +841,7 @@ impl Unconstructible for PyByteArrayIterator {}
 
 impl IterNextIterable for PyByteArrayIterator {}
 impl IterNext for PyByteArrayIterator {
-    fn next(zelf: &PyRef<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
+    fn next(zelf: &crate::PyObjectView<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
         zelf.internal.lock().next(|bytearray, pos| {
             let buf = bytearray.borrow_buf();
             Ok(match buf.get(pos) {