{Type,Exception}Zoo holds static ref

Author: youknowone

src/shell.rs

@@ -127,7 +127,7 @@ pub fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
         };
 
         if let Err(exc) = result {
-            if exc.fast_isinstance(&vm.ctx.exceptions.system_exit) {
+            if exc.fast_isinstance(vm.ctx.exceptions.system_exit) {
                 repl.save_history(&repl_history_path).unwrap();
                 return Err(exc);
             }

stdlib/src/json.rs

@@ -36,14 +36,14 @@ mod _json {
             let object_hook = vm.option_if_none(ctx.get_attr("object_hook", vm)?);
             let object_pairs_hook = vm.option_if_none(ctx.get_attr("object_pairs_hook", vm)?);
             let parse_float = ctx.get_attr("parse_float", vm)?;
-            let parse_float =
-                if vm.is_none(&parse_float) || parse_float.is(&vm.ctx.types.float_type) {
-                    None
-                } else {
-                    Some(parse_float)
-                };
+            let parse_float = if vm.is_none(&parse_float) || parse_float.is(vm.ctx.types.float_type)
+            {
+                None
+            } else {
+                Some(parse_float)
+            };
             let parse_int = ctx.get_attr("parse_int", vm)?;
-            let parse_int = if vm.is_none(&parse_int) || parse_int.is(&vm.ctx.types.int_type) {
+            let parse_int = if vm.is_none(&parse_int) || parse_int.is(vm.ctx.types.int_type) {
                 None
             } else {
                 Some(parse_int)

stdlib/src/socket.rs

@@ -153,7 +153,7 @@ mod _socket {
         type CastFrom = libc::c_longlong;
 
         // should really just be to_index() but test_socket tests the error messages explicitly
-        if obj.fast_isinstance(&vm.ctx.types.float_type) {
+        if obj.fast_isinstance(vm.ctx.types.float_type) {
             return Err(vm.new_type_error("integer argument expected, got float".to_owned()));
         }
         let int = vm

vm/src/builtins/asyncgenerator.rs

@@ -22,7 +22,7 @@ type PyAsyncGenRef = PyRef<PyAsyncGen>;
 
 impl PyPayload for PyAsyncGen {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.async_generator
+        vm.ctx.types.async_generator
     }
 }
 
@@ -136,7 +136,7 @@ impl Unconstructible for PyAsyncGen {}
 pub(crate) struct PyAsyncGenWrappedValue(pub PyObjectRef);
 impl PyPayload for PyAsyncGenWrappedValue {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.async_generator_wrapped_value
+        vm.ctx.types.async_generator_wrapped_value
     }
 }
 
@@ -147,7 +147,7 @@ impl PyAsyncGenWrappedValue {
     fn unbox(ag: &PyAsyncGen, val: PyResult<PyIterReturn>, vm: &VirtualMachine) -> PyResult {
         let (closed, async_done) = match &val {
             Ok(PyIterReturn::StopIteration(_)) => (true, true),
-            Err(e) if e.fast_isinstance(&vm.ctx.exceptions.generator_exit) => (true, true),
+            Err(e) if e.fast_isinstance(vm.ctx.exceptions.generator_exit) => (true, true),
             Err(_) => (false, true),
             _ => (false, false),
         };
@@ -185,7 +185,7 @@ pub(crate) struct PyAsyncGenASend {
 
 impl PyPayload for PyAsyncGenASend {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.async_generator_asend
+        vm.ctx.types.async_generator_asend
     }
 }
 
@@ -280,7 +280,7 @@ pub(crate) struct PyAsyncGenAThrow {
 
 impl PyPayload for PyAsyncGenAThrow {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.async_generator_athrow
+        vm.ctx.types.async_generator_athrow
     }
 }
 
@@ -398,8 +398,8 @@ impl PyAsyncGenAThrow {
         self.ag.running_async.store(false);
         self.state.store(AwaitableState::Closed);
         if self.aclose
-            && (exc.fast_isinstance(&vm.ctx.exceptions.stop_async_iteration)
-                || exc.fast_isinstance(&vm.ctx.exceptions.generator_exit))
+            && (exc.fast_isinstance(vm.ctx.exceptions.stop_async_iteration)
+                || exc.fast_isinstance(vm.ctx.exceptions.generator_exit))
         {
             vm.new_stop_iteration(None)
         } else {
@@ -416,7 +416,7 @@ impl IterNext for PyAsyncGenAThrow {
 }
 
 pub fn init(ctx: &Context) {
-    PyAsyncGen::extend_class(ctx, &ctx.types.async_generator);
-    PyAsyncGenASend::extend_class(ctx, &ctx.types.async_generator_asend);
-    PyAsyncGenAThrow::extend_class(ctx, &ctx.types.async_generator_athrow);
+    PyAsyncGen::extend_class(ctx, ctx.types.async_generator);
+    PyAsyncGenASend::extend_class(ctx, ctx.types.async_generator_asend);
+    PyAsyncGenAThrow::extend_class(ctx, ctx.types.async_generator_athrow);
 }

vm/src/builtins/bool.rs

@@ -16,7 +16,7 @@ impl ToPyObject for bool {
 
 impl TryFromBorrowedObject for bool {
     fn try_from_borrowed_object(vm: &VirtualMachine, obj: &PyObject) -> PyResult<bool> {
-        if obj.fast_isinstance(&vm.ctx.types.int_type) {
+        if obj.fast_isinstance(vm.ctx.types.int_type) {
             Ok(get_value(obj))
         } else {
             Err(vm.new_type_error(format!("Expected type bool, not {}", obj.class().name())))
@@ -38,7 +38,7 @@ impl PyObjectRef {
                 // If descriptor returns Error, propagate it further
                 let method = method_or_err?;
                 let bool_obj = vm.invoke(&method, ())?;
-                if !bool_obj.fast_isinstance(&vm.ctx.types.bool_type) {
+                if !bool_obj.fast_isinstance(vm.ctx.types.bool_type) {
                     return Err(vm.new_type_error(format!(
                         "__bool__ should return bool, returned type {}",
                         bool_obj.class().name()
@@ -81,7 +81,7 @@ pub struct PyBool;
 
 impl PyPayload for PyBool {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.bool_type
+        vm.ctx.types.bool_type
     }
 }
 
@@ -95,7 +95,7 @@ impl Constructor for PyBool {
     type Args = OptionalArg<PyObjectRef>;
 
     fn py_new(zelf: PyTypeRef, x: Self::Args, vm: &VirtualMachine) -> PyResult {
-        if !zelf.fast_isinstance(&vm.ctx.types.type_type) {
+        if !zelf.fast_isinstance(vm.ctx.types.type_type) {
             let actual_class = zelf.class();
             let actual_type = &actual_class.name();
             return Err(vm.new_type_error(format!(
@@ -132,8 +132,8 @@ impl PyBool {
     #[pymethod(name = "__ror__")]
     #[pymethod(magic)]
     fn or(lhs: PyObjectRef, rhs: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef {
-        if lhs.fast_isinstance(&vm.ctx.types.bool_type)
-            && rhs.fast_isinstance(&vm.ctx.types.bool_type)
+        if lhs.fast_isinstance(vm.ctx.types.bool_type)
+            && rhs.fast_isinstance(vm.ctx.types.bool_type)
         {
             let lhs = get_value(&lhs);
             let rhs = get_value(&rhs);
@@ -146,8 +146,8 @@ impl PyBool {
     #[pymethod(name = "__rand__")]
     #[pymethod(magic)]
     fn and(lhs: PyObjectRef, rhs: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef {
-        if lhs.fast_isinstance(&vm.ctx.types.bool_type)
-            && rhs.fast_isinstance(&vm.ctx.types.bool_type)
+        if lhs.fast_isinstance(vm.ctx.types.bool_type)
+            && rhs.fast_isinstance(vm.ctx.types.bool_type)
         {
             let lhs = get_value(&lhs);
             let rhs = get_value(&rhs);
@@ -160,8 +160,8 @@ impl PyBool {
     #[pymethod(name = "__rxor__")]
     #[pymethod(magic)]
     fn xor(lhs: PyObjectRef, rhs: PyObjectRef, vm: &VirtualMachine) -> PyObjectRef {
-        if lhs.fast_isinstance(&vm.ctx.types.bool_type)
-            && rhs.fast_isinstance(&vm.ctx.types.bool_type)
+        if lhs.fast_isinstance(vm.ctx.types.bool_type)
+            && rhs.fast_isinstance(vm.ctx.types.bool_type)
         {
             let lhs = get_value(&lhs);
             let rhs = get_value(&rhs);
@@ -173,11 +173,11 @@ impl PyBool {
 }
 
 pub(crate) fn init(context: &Context) {
-    PyBool::extend_class(context, &context.types.bool_type);
+    PyBool::extend_class(context, context.types.bool_type);
 }
 
 // pub fn not(vm: &VirtualMachine, obj: &PyObject) -> PyResult<bool> {
-//     if obj.fast_isinstance(&vm.ctx.types.bool_type) {
+//     if obj.fast_isinstance(vm.ctx.types.bool_type) {
 //         let value = get_value(obj);
 //         Ok(!value)
 //     } else {

vm/src/builtins/builtinfunc.rs

@@ -64,7 +64,7 @@ pub struct PyBuiltinFunction {
 
 impl PyPayload for PyBuiltinFunction {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.builtin_function_or_method_type
+        vm.ctx.types.builtin_function_or_method_type
     }
 }
 
@@ -169,7 +169,7 @@ pub struct PyBuiltinMethod {
 
 impl PyPayload for PyBuiltinMethod {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.method_descriptor_type
+        vm.ctx.types.method_descriptor_type
     }
 }
 
@@ -254,6 +254,6 @@ impl PyBuiltinMethod {
 impl Unconstructible for PyBuiltinMethod {}
 
 pub fn init(context: &Context) {
-    PyBuiltinFunction::extend_class(context, &context.types.builtin_function_or_method_type);
-    PyBuiltinMethod::extend_class(context, &context.types.method_descriptor_type);
+    PyBuiltinFunction::extend_class(context, context.types.builtin_function_or_method_type);
+    PyBuiltinMethod::extend_class(context, context.types.method_descriptor_type);
 }

vm/src/builtins/bytearray.rs

@@ -83,14 +83,14 @@ impl From<Vec<u8>> for PyByteArray {
 
 impl PyPayload for PyByteArray {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.bytearray_type
+        vm.ctx.types.bytearray_type
     }
 }
 
 /// Fill bytearray class methods dictionary.
 pub(crate) fn init(context: &Context) {
-    PyByteArray::extend_class(context, &context.types.bytearray_type);
-    PyByteArrayIterator::extend_class(context, &context.types.bytearray_iterator_type);
+    PyByteArray::extend_class(context, context.types.bytearray_type);
+    PyByteArrayIterator::extend_class(context, context.types.bytearray_iterator_type);
 }
 
 #[pyimpl(
@@ -863,7 +863,7 @@ pub struct PyByteArrayIterator {
 
 impl PyPayload for PyByteArrayIterator {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.bytearray_iterator_type
+        vm.ctx.types.bytearray_iterator_type
     }
 }
 

vm/src/builtins/bytes.rs

@@ -75,13 +75,13 @@ impl AsRef<[u8]> for PyBytesRef {
 
 impl PyPayload for PyBytes {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.bytes_type
+        vm.ctx.types.bytes_type
     }
 }
 
 pub(crate) fn init(context: &Context) {
-    PyBytes::extend_class(context, &context.types.bytes_type);
-    PyBytesIterator::extend_class(context, &context.types.bytes_iterator_type);
+    PyBytes::extend_class(context, context.types.bytes_type);
+    PyBytesIterator::extend_class(context, context.types.bytes_iterator_type);
 }
 
 impl Constructor for PyBytes {
@@ -134,7 +134,7 @@ impl PyBytes {
 
     #[pymethod(magic)]
     fn bytes(zelf: PyRef<Self>, vm: &VirtualMachine) -> PyRef<Self> {
-        if zelf.is(&vm.ctx.types.bytes_type) {
+        if zelf.is(vm.ctx.types.bytes_type) {
             zelf
         } else {
             PyBytes::from(zelf.inner.clone()).into_ref(vm)
@@ -480,7 +480,7 @@ impl PyBytes {
     #[pymethod(name = "__rmul__")]
     #[pymethod(magic)]
     fn mul(zelf: PyRef<Self>, value: isize, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
-        if value == 1 && zelf.class().is(&vm.ctx.types.bytes_type) {
+        if value == 1 && zelf.class().is(vm.ctx.types.bytes_type) {
             // Special case: when some `bytes` is multiplied by `1`,
             // nothing really happens, we need to return an object itself
             // with the same `id()` to be compatible with CPython.
@@ -633,7 +633,7 @@ impl Comparable for PyBytes {
     ) -> PyResult<PyComparisonValue> {
         Ok(if let Some(res) = op.identical_optimization(zelf, other) {
             res.into()
-        } else if other.fast_isinstance(&vm.ctx.types.memoryview_type)
+        } else if other.fast_isinstance(vm.ctx.types.memoryview_type)
             && op != PyComparisonOp::Eq
             && op != PyComparisonOp::Ne
         {
@@ -666,7 +666,7 @@ pub struct PyBytesIterator {
 
 impl PyPayload for PyBytesIterator {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.bytes_iterator_type
+        vm.ctx.types.bytes_iterator_type
     }
 }
 

vm/src/builtins/classmethod.rs

@@ -40,7 +40,7 @@ impl From<PyObjectRef> for PyClassMethod {
 
 impl PyPayload for PyClassMethod {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.classmethod_type
+        vm.ctx.types.classmethod_type
     }
 }
 
@@ -96,5 +96,5 @@ impl PyClassMethod {
 }
 
 pub(crate) fn init(context: &Context) {
-    PyClassMethod::extend_class(context, &context.types.classmethod_type);
+    PyClassMethod::extend_class(context, context.types.classmethod_type);
 }

vm/src/builtins/code.rs

@@ -153,7 +153,7 @@ impl fmt::Debug for PyCode {
 
 impl PyPayload for PyCode {
     fn class(vm: &VirtualMachine) -> &PyTypeRef {
-        &vm.ctx.types.code_type
+        vm.ctx.types.code_type
     }
 }
 
@@ -246,5 +246,5 @@ impl ToPyObject for bytecode::CodeObject {
 }
 
 pub fn init(ctx: &Context) {
-    PyRef::<PyCode>::extend_class(ctx, &ctx.types.code_type);
+    PyRef::<PyCode>::extend_class(ctx, ctx.types.code_type);
 }