RustPython
diff --git a/‎stdlib/src/sqlite.rs
Copy file name to clipboardExpand all lines: stdlib/src/sqlite.rs
+4-4Lines changed: 4 additions & 4 deletions b/‎stdlib/src/sqlite.rs
Copy file name to clipboardExpand all lines: stdlib/src/sqlite.rs
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎vm/src/object/core.rs
Copy file name to clipboardExpand all lines: vm/src/object/core.rs
+5-7Lines changed: 5 additions & 7 deletions b/‎vm/src/object/core.rs
Copy file name to clipboardExpand all lines: vm/src/object/core.rs
+5-7Lines changed: 5 additions & 7 deletions
diff --git a/‎vm/src/object/ext.rs
Copy file name to clipboardExpand all lines: vm/src/object/ext.rs
+17-11Lines changed: 17 additions & 11 deletions b/‎vm/src/object/ext.rs
Copy file name to clipboardExpand all lines: vm/src/object/ext.rs
+17-11Lines changed: 17 additions & 11 deletions
@@ -76,7 +76,7 @@ mod _sqlite {
         ffi::{c_int, c_longlong, c_uint, c_void, CStr},
         fmt::Debug,
         ops::Deref,
-        ptr::{null, null_mut},
+        ptr::{null, null_mut, NonNull},
         thread::ThreadId,
     };
 
@@ -381,7 +381,7 @@ mod _sqlite {
     }
 
     struct CallbackData {
-        obj: *const PyObject,
+        obj: NonNull<PyObject>,
         vm: *const VirtualMachine,
     }
 
@@ -394,7 +394,7 @@ mod _sqlite {
         }
 
         fn retrieve(&self) -> (&PyObject, &VirtualMachine) {
-            unsafe { (&*self.obj, &*self.vm) }
+            unsafe { (self.obj.as_ref(), &*self.vm) }
         }
 
         unsafe extern "C" fn destructor(data: *mut c_void) {
@@ -439,7 +439,7 @@ mod _sqlite {
             let instance = context.aggregate_context::<*const PyObject>();
             if unsafe { (*instance).is_null() } {
                 match cls.call((), vm) {
-                    Ok(obj) => unsafe { *instance = obj.into_raw() },
+                    Ok(obj) => unsafe { *instance = obj.into_raw().as_ptr() },
                     Err(exc) => {
                         return context.result_exception(
                             vm,
 
@@ -354,7 +354,7 @@ impl PyWeak {
             if !obj_ptr.as_ref().0.ref_count.safe_inc() {
                 return None;
             }
-            Some(PyObjectRef::from_raw(obj_ptr.as_ptr()))
+            Some(PyObjectRef::from_raw(obj_ptr))
         }
     }
 
@@ -508,8 +508,8 @@ impl ToOwned for PyObject {
 
 impl PyObjectRef {
     #[inline(always)]
-    pub fn into_raw(self) -> *const PyObject {
-        let ptr = self.as_raw();
+    pub fn into_raw(self) -> NonNull<PyObject> {
+        let ptr = self.ptr;
         std::mem::forget(self);
         ptr
     }
@@ -520,10 +520,8 @@ impl PyObjectRef {
     /// dropped more than once due to mishandling the reference count by calling this function
     /// too many times.
     #[inline(always)]
-    pub unsafe fn from_raw(ptr: *const PyObject) -> Self {
-        Self {
-            ptr: unsafe { NonNull::new_unchecked(ptr as *mut PyObject) },
-        }
+    pub unsafe fn from_raw(ptr: NonNull<PyObject>) -> Self {
+        Self { ptr }
     }
 
     /// Attempt to downcast this reference to a subclass.
 
@@ -12,7 +12,13 @@ use crate::{
     vm::Context,
     VirtualMachine,
 };
-use std::{borrow::Borrow, fmt, marker::PhantomData, ops::Deref, ptr::null_mut};
+use std::{
+    borrow::Borrow,
+    fmt,
+    marker::PhantomData,
+    ops::Deref,
+    ptr::{null_mut, NonNull},
+};
 
 /* Python objects and references.
 
@@ -352,7 +358,7 @@ impl From<PyObjectRef> for PyAtomicRef<PyObject> {
     fn from(obj: PyObjectRef) -> Self {
         let obj = obj.into_raw();
         Self {
-            inner: Radium::new(obj as *mut _),
+            inner: Radium::new(obj.cast().as_ptr()),
             _phantom: Default::default(),
         }
     }
@@ -379,8 +385,8 @@ impl PyAtomicRef<PyObject> {
     #[must_use]
     pub unsafe fn swap(&self, obj: PyObjectRef) -> PyObjectRef {
         let obj = obj.into_raw();
-        let old = Radium::swap(&self.inner, obj as *mut _, Ordering::AcqRel);
-        unsafe { PyObjectRef::from_raw(old as _) }
+        let old = Radium::swap(&self.inner, obj.cast().as_ptr(), Ordering::AcqRel);
+        unsafe { PyObjectRef::from_raw(NonNull::new_unchecked(old.cast())) }
     }
 
     pub fn swap_to_temporary_refs(&self, obj: PyObjectRef, vm: &VirtualMachine) {
@@ -393,7 +399,9 @@ impl PyAtomicRef<PyObject> {
 
 impl From<Option<PyObjectRef>> for PyAtomicRef<Option<PyObject>> {
     fn from(obj: Option<PyObjectRef>) -> Self {
-        let val = obj.map(|x| x.into_raw() as *mut _).unwrap_or(null_mut());
+        let val = obj
+            .map(|x| x.into_raw().as_ptr().cast())
+            .unwrap_or(null_mut());
         Self {
             inner: Radium::new(val),
             _phantom: Default::default(),
@@ -420,13 +428,11 @@ impl PyAtomicRef<Option<PyObject>> {
     /// until no more reference can be used via PyAtomicRef::deref()
     #[must_use]
     pub unsafe fn swap(&self, obj: Option<PyObjectRef>) -> Option<PyObjectRef> {
-        let val = obj.map(|x| x.into_raw() as *mut _).unwrap_or(null_mut());
+        let val = obj
+            .map(|x| x.into_raw().as_ptr().cast())
+            .unwrap_or(null_mut());
         let old = Radium::swap(&self.inner, val, Ordering::AcqRel);
-        unsafe {
-            old.cast::<PyObject>()
-                .as_ref()
-                .map(|x| PyObjectRef::from_raw(x))
-        }
+        unsafe { NonNull::new(old.cast::<PyObject>()).map(|x| PyObjectRef::from_raw(x)) }
     }
 
     pub fn swap_to_temporary_refs(&self, obj: Option<PyObjectRef>, vm: &VirtualMachine) {