youknowone · Oct 13, 2026 · Oct 10, 2026
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/capi/Cargo.toml b/crates/capi/Cargo.toml
@@ -22,6 +22,7 @@ rustpython-stdlib = {workspace = true, features = ["threading"] }
 rustpython-pylib = { workspace = true }
 
 [dev-dependencies]
+static_assertions = { workspace = true }
 pyo3 = { workspace = true, features = ["auto-initialize", "abi3t"] }
 
 [lints]

diff --git a/crates/capi/src/pyerrors.rs b/crates/capi/src/pyerrors.rs
@@ -5,7 +5,6 @@ use core::convert::Infallible;
 use core::ffi::{c_char, c_int};
 use core::slice;
 use rustpython_vm::builtins::{PyBaseException, PyTraceback, PyTuple, PyType};
-use rustpython_vm::convert::IntoObject;
 use rustpython_vm::exceptions::ExceptionZoo;
 use rustpython_vm::{AsObject, PyResult};
 

diff --git a/crates/capi/src/util.rs b/crates/capi/src/util.rs
@@ -40,20 +40,12 @@ where
 
 impl<T> FfiResult<*mut Py<T>> for PyRef<T>
 where
-    Self: Into<PyObjectRef>,
+    T: rustpython_vm::object::PyRefTarget<Target = Py<T>>,
 {
     const ERR_VALUE: *mut Py<T> = core::ptr::null_mut();
 
     fn into_output(self, _vm: &VirtualMachine) -> *mut Py<T> {
-        self.into().into_raw().as_ptr().cast()
-    }
-}
-
-impl FfiResult<*mut PyObject> for PyObjectRef {
-    const ERR_VALUE: *mut PyObject = core::ptr::null_mut();
-
-    fn into_output(self, _vm: &VirtualMachine) -> *mut PyObject {
-        self.into_raw().as_ptr()
+        PyObjectRef::from(self).into_raw().as_ptr().cast()
     }
 }
 
@@ -324,7 +316,7 @@ impl<T: PyPayload> FfiPtrExt for *mut Py<T> {
             "Attempted to dereference NULL {}",
             type_name::<Self>()
         );
-        unsafe { PyRef::from_raw(self.cast_const()) }
+        unsafe { PyRef::<T>::from_raw(self.cast_const()) }
     }
 
     #[inline]
@@ -384,6 +376,14 @@ mod tests {
     use core::ffi::{c_longlong, c_ulonglong};
     use core::fmt::Debug;
 
+    #[test]
+    fn pyref_object_ffi_targets() {
+        use rustpython_vm::builtins::PyInt;
+        static_assertions::assert_impl_all!(PyObjectRef: FfiResult<*mut PyObject>);
+        static_assertions::assert_impl_all!(PyRef<PyInt>: FfiResult<*mut PyObject>, FfiResult<*mut Py<PyInt>>);
+        static_assertions::assert_not_impl_any!(PyObjectRef: FfiResult<*mut Py<PyObject>>);
+    }
+
     #[test]
     fn ffi_result_err_value() {
         fn assert_error_value<T, Output>(value: Output)

diff --git a/crates/stdlib/src/_sqlite3.rs b/crates/stdlib/src/_sqlite3.rs
@@ -61,7 +61,6 @@ mod _sqlite3 {
             PyInt, PyIntRef, PyModule, PySlice, PyStr, PyStrRef, PyTuple, PyTupleRef, PyType,
             PyTypeRef, PyUtf8Str, PyUtf8StrRef,
         },
-        convert::IntoObject,
         function::{
             ArgCallable, ArgIterable, FsPath, FuncArgs, KwArgs, OptionalArg, PyComparisonValue,
             PySetterValue, TimeoutSeconds,

diff --git a/crates/vm/src/builtins/descriptor.rs b/crates/vm/src/builtins/descriptor.rs
@@ -541,12 +541,6 @@ impl MemberCell for core::sync::atomic::AtomicU32 {}
 // One object pointer. Readonly members may be a plain pointer. Writable
 // members are an atomic cell: `PyAtomicRef<PyObject>` when the pointer is
 // never null, or `PyAtomicRef<Option<PyObject>>` when it may be.
-impl MemberLayout for PyObjectRef {
-    const KIND: MemberKind = MemberKind::Object;
-}
-impl MemberLayout for Option<PyObjectRef> {
-    const KIND: MemberKind = MemberKind::Object;
-}
 impl MemberLayout for crate::object::PyObjectCell {
     const KIND: MemberKind = MemberKind::Object;
     const ATOMIC: bool = true;

diff --git a/crates/vm/src/builtins/frame_locals_proxy.rs b/crates/vm/src/builtins/frame_locals_proxy.rs
@@ -145,10 +145,10 @@ impl FrameLocalsProxy {
             return Ok(vm.ctx.not_implemented());
         }
         let result = self.snapshot(vm)?;
-        if other.downcast_ref::<PyDict>().is_some() {
+        if let Some(dict) = other.downcast_ref::<PyDict>() {
             // PyDict_Update reads a dict subclass's stored entries directly;
             // it does not dispatch to overridden mapping methods.
-            result.merge_dict(&other.downcast().unwrap(), true, vm)?;
+            result.merge_dict(dict, true, vm)?;
         } else {
             result.merge_object(other, vm)?;
         }