use raw references instead of addr_of! / addr_of_mut! (#5879)

Author: Icxolu

pyo3-ffi/README.md

@@ -78,8 +78,8 @@ static mut MODULE_DEF: PyModuleDef = PyModuleDef {
     m_name: c"string_sum".as_ptr(),
     m_doc: c"A Python module written in Rust.".as_ptr(),
     m_size: 0,
-    m_methods: std::ptr::addr_of_mut!(METHODS).cast(),
-    m_slots: std::ptr::addr_of_mut!(SLOTS).cast(),
+    m_methods: (&raw mut METHODS).cast(),
+    m_slots: (&raw mut SLOTS).cast(),
     m_traverse: None,
     m_clear: None,
     m_free: None,
@@ -107,7 +107,7 @@ static mut SLOTS: [PyModuleDef_Slot; SLOTS_LEN] = [
     #[cfg(Py_3_15)]
     PyModuleDef_Slot {
         slot: Py_mod_abi,
-        value: std::ptr::addr_of_mut!(ABI_INFO).cast(),
+        value: (&raw mut ABI_INFO).cast(),
     },
     #[cfg(Py_3_15)]
     PyModuleDef_Slot {
@@ -124,7 +124,7 @@ static mut SLOTS: [PyModuleDef_Slot; SLOTS_LEN] = [
     #[cfg(Py_3_15)]
     PyModuleDef_Slot {
         slot: Py_mod_methods,
-        value: std::ptr::addr_of_mut!(METHODS).cast(),
+        value: (&raw mut METHODS).cast(),
     },
     #[cfg(Py_3_12)]
     PyModuleDef_Slot {
@@ -147,14 +147,14 @@ static mut SLOTS: [PyModuleDef_Slot; SLOTS_LEN] = [
 #[allow(non_snake_case, reason = "must be named `PyInit_<your_module>`")]
 #[no_mangle]
 pub unsafe extern "C" fn PyInit_string_sum() -> *mut PyObject {
-    PyModuleDef_Init(ptr::addr_of_mut!(MODULE_DEF))
+    PyModuleDef_Init(&raw mut MODULE_DEF)
 }
 
 #[cfg(Py_3_15)]
 #[allow(non_snake_case, reason = "must be named `PyModExport_<your_module>`")]
 #[no_mangle]
 pub unsafe extern "C" fn PyModExport_string_sum() -> *mut PyModuleDef_Slot {
-    std::ptr::addr_of_mut!(SLOTS).cast()
+    (&raw mut SLOTS).cast()
 }
 
 /// A helper to parse function arguments

pyo3-ffi/examples/sequential/src/id.rs

@@ -43,7 +43,7 @@ unsafe extern "C" fn id_new(
     } else {
         let id = Id::new();
         let slf = slf.cast::<PyId>();
-        ptr::addr_of_mut!((*slf).id).write(id);
+        (&raw mut (*slf).id).write(id);
     }
 
     slf
@@ -131,5 +131,5 @@ pub static mut ID_SPEC: PyType_Spec = PyType_Spec {
     basicsize: mem::size_of::<PyId>() as c_int,
     itemsize: 0,
     flags: (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE) as c_uint,
-    slots: ptr::addr_of_mut!(SLOTS).cast(),
+    slots: (&raw mut SLOTS).cast(),
 };

pyo3-ffi/examples/sequential/src/lib.rs

@@ -1,5 +1,3 @@
-use std::ptr;
-
 use pyo3_ffi::*;
 
 mod id;
@@ -13,12 +11,12 @@ use crate::module::SEQUENTIAL_SLOTS;
 #[allow(non_snake_case, reason = "must be named `PyInit_<your_module>`")]
 #[no_mangle]
 pub unsafe extern "C" fn PyInit_sequential() -> *mut PyObject {
-    PyModuleDef_Init(ptr::addr_of_mut!(MODULE_DEF))
+    PyModuleDef_Init(&raw mut MODULE_DEF)
 }
 
 #[cfg(Py_3_15)]
 #[allow(non_snake_case, reason = "must be named `PyModExport_<your_module>`")]
 #[no_mangle]
 pub unsafe extern "C" fn PyModExport_sequential() -> *mut PyModuleDef_Slot {
-    ptr::addr_of_mut!(SEQUENTIAL_SLOTS).cast()
+    (&raw mut SEQUENTIAL_SLOTS).cast()
 }

pyo3-ffi/examples/sequential/src/module.rs

@@ -9,7 +9,7 @@ pub static mut MODULE_DEF: PyModuleDef = PyModuleDef {
     m_doc: c"A library for generating sequential ids, written in Rust.".as_ptr(),
     m_size: mem::size_of::<sequential_state>() as Py_ssize_t,
     m_methods: std::ptr::null_mut(),
-    m_slots: std::ptr::addr_of_mut!(SEQUENTIAL_SLOTS).cast(),
+    m_slots: (&raw mut SEQUENTIAL_SLOTS).cast(),
     m_traverse: Some(sequential_traverse),
     m_clear: Some(sequential_clear),
     m_free: Some(sequential_free),
@@ -24,7 +24,7 @@ pub static mut SEQUENTIAL_SLOTS: [PyModuleDef_Slot; SEQUENTIAL_SLOTS_LEN] = [
     #[cfg(Py_3_15)]
     PyModuleDef_Slot {
         slot: Py_mod_abi,
-        value: std::ptr::addr_of_mut!(ABI_INFO).cast(),
+        value: (&raw mut ABI_INFO).cast(),
     },
     #[cfg(Py_3_15)]
     PyModuleDef_Slot {
@@ -81,11 +81,7 @@ pub static mut SEQUENTIAL_SLOTS: [PyModuleDef_Slot; SEQUENTIAL_SLOTS_LEN] = [
 unsafe extern "C" fn sequential_exec(module: *mut PyObject) -> c_int {
     let state: *mut sequential_state = PyModule_GetState(module).cast();
 
-    let id_type = PyType_FromModuleAndSpec(
-        module,
-        ptr::addr_of_mut!(crate::id::ID_SPEC),
-        ptr::null_mut(),
-    );
+    let id_type = PyType_FromModuleAndSpec(module, &raw mut crate::id::ID_SPEC, ptr::null_mut());
     if id_type.is_null() {
         PyErr_SetString(PyExc_SystemError, c"cannot locate type object".as_ptr());
         return -1;
@@ -112,7 +108,7 @@ unsafe extern "C" fn sequential_traverse(
 
 unsafe extern "C" fn sequential_clear(module: *mut PyObject) -> c_int {
     let state: *mut sequential_state = PyModule_GetState(module.cast()).cast();
-    Py_CLEAR(ptr::addr_of_mut!((*state).id_type).cast());
+    Py_CLEAR((&raw mut (*state).id_type).cast());
     0
 }
 

pyo3-ffi/examples/string-sum/src/lib.rs

@@ -11,8 +11,8 @@ static mut MODULE_DEF: PyModuleDef = PyModuleDef {
     m_name: c"string_sum".as_ptr(),
     m_doc: c"A Python module written in Rust.".as_ptr(),
     m_size: 0,
-    m_methods: std::ptr::addr_of_mut!(METHODS).cast(),
-    m_slots: std::ptr::addr_of_mut!(SLOTS).cast(),
+    m_methods: (&raw mut METHODS).cast(),
+    m_slots: (&raw mut SLOTS).cast(),
     m_traverse: None,
     m_clear: None,
     m_free: None,
@@ -40,7 +40,7 @@ static mut SLOTS: [PyModuleDef_Slot; SLOTS_LEN] = [
     #[cfg(Py_3_15)]
     PyModuleDef_Slot {
         slot: Py_mod_abi,
-        value: std::ptr::addr_of_mut!(ABI_INFO).cast(),
+        value: (&raw mut ABI_INFO).cast(),
     },
     #[cfg(Py_3_15)]
     PyModuleDef_Slot {
@@ -57,7 +57,7 @@ static mut SLOTS: [PyModuleDef_Slot; SLOTS_LEN] = [
     #[cfg(Py_3_15)]
     PyModuleDef_Slot {
         slot: Py_mod_methods,
-        value: std::ptr::addr_of_mut!(METHODS).cast(),
+        value: (&raw mut METHODS).cast(),
     },
     #[cfg(Py_3_12)]
     PyModuleDef_Slot {
@@ -80,14 +80,14 @@ static mut SLOTS: [PyModuleDef_Slot; SLOTS_LEN] = [
 #[allow(non_snake_case, reason = "must be named `PyInit_<your_module>`")]
 #[no_mangle]
 pub unsafe extern "C" fn PyInit_string_sum() -> *mut PyObject {
-    PyModuleDef_Init(ptr::addr_of_mut!(MODULE_DEF))
+    PyModuleDef_Init(&raw mut MODULE_DEF)
 }
 
 #[cfg(Py_3_15)]
 #[allow(non_snake_case, reason = "must be named `PyModExport_<your_module>`")]
 #[no_mangle]
 pub unsafe extern "C" fn PyModExport_string_sum() -> *mut PyModuleDef_Slot {
-    std::ptr::addr_of_mut!(SLOTS).cast()
+    (&raw mut SLOTS).cast()
 }
 
 /// A helper to parse function arguments

pyo3-ffi/src/boolobject.rs

@@ -2,11 +2,10 @@
 use crate::longobject::PyLongObject;
 use crate::object::*;
 use std::ffi::{c_int, c_long};
-use std::ptr::addr_of_mut;
 
 #[inline]
 pub unsafe fn PyBool_Check(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == addr_of_mut!(PyBool_Type)) as c_int
+    (Py_TYPE(op) == &raw mut PyBool_Type) as c_int
 }
 
 extern_libpython! {
@@ -26,15 +25,15 @@ extern_libpython! {
 #[inline]
 pub unsafe fn Py_False() -> *mut PyObject {
     #[cfg(not(GraalPy))]
-    return addr_of_mut!(_Py_FalseStruct) as *mut PyObject;
+    return (&raw mut _Py_FalseStruct).cast();
     #[cfg(GraalPy)]
     return _Py_FalseStructReference;
 }
 
 #[inline]
 pub unsafe fn Py_True() -> *mut PyObject {
     #[cfg(not(GraalPy))]
-    return addr_of_mut!(_Py_TrueStruct) as *mut PyObject;
+    return (&raw mut _Py_TrueStruct).cast();
     #[cfg(GraalPy)]
     return _Py_TrueStructReference;
 }

pyo3-ffi/src/bytearrayobject.rs

@@ -1,7 +1,6 @@
 use crate::object::*;
 use crate::pyport::Py_ssize_t;
 use std::ffi::{c_char, c_int};
-use std::ptr::addr_of_mut;
 
 #[cfg(not(any(PyPy, GraalPy, Py_LIMITED_API)))]
 #[repr(C)]
@@ -30,12 +29,12 @@ extern_libpython! {
 
 #[inline]
 pub unsafe fn PyByteArray_Check(op: *mut PyObject) -> c_int {
-    PyObject_TypeCheck(op, addr_of_mut!(PyByteArray_Type))
+    PyObject_TypeCheck(op, &raw mut PyByteArray_Type)
 }
 
 #[inline]
 pub unsafe fn PyByteArray_CheckExact(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == addr_of_mut!(PyByteArray_Type)) as c_int
+    (Py_TYPE(op) == &raw mut PyByteArray_Type) as c_int
 }
 
 extern_libpython! {

pyo3-ffi/src/bytesobject.rs

@@ -1,7 +1,6 @@
 use crate::object::*;
 use crate::pyport::Py_ssize_t;
 use std::ffi::{c_char, c_int};
-use std::ptr::addr_of_mut;
 
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyBytes_Type")]
@@ -16,7 +15,7 @@ pub unsafe fn PyBytes_Check(op: *mut PyObject) -> c_int {
 
 #[inline]
 pub unsafe fn PyBytes_CheckExact(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == addr_of_mut!(PyBytes_Type)) as c_int
+    (Py_TYPE(op) == &raw mut PyBytes_Type) as c_int
 }
 
 extern_libpython! {

pyo3-ffi/src/complexobject.rs

@@ -1,6 +1,5 @@
 use crate::object::*;
 use std::ffi::{c_double, c_int};
-use std::ptr::addr_of_mut;
 
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyComplex_Type")]
@@ -9,12 +8,12 @@ extern_libpython! {
 
 #[inline]
 pub unsafe fn PyComplex_Check(op: *mut PyObject) -> c_int {
-    PyObject_TypeCheck(op, addr_of_mut!(PyComplex_Type))
+    PyObject_TypeCheck(op, &raw mut PyComplex_Type)
 }
 
 #[inline]
 pub unsafe fn PyComplex_CheckExact(op: *mut PyObject) -> c_int {
-    Py_IS_TYPE(op, addr_of_mut!(PyComplex_Type))
+    Py_IS_TYPE(op, &raw mut PyComplex_Type)
 }
 
 extern_libpython! {

pyo3-ffi/src/context.rs

@@ -1,6 +1,5 @@
 use crate::object::{PyObject, PyTypeObject, Py_TYPE};
 use std::ffi::{c_char, c_int};
-use std::ptr::addr_of_mut;
 
 extern_libpython! {
     pub static mut PyContext_Type: PyTypeObject;
@@ -13,17 +12,17 @@ extern_libpython! {
 
 #[inline]
 pub unsafe fn PyContext_CheckExact(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == addr_of_mut!(PyContext_Type)) as c_int
+    (Py_TYPE(op) == &raw mut PyContext_Type) as c_int
 }
 
 #[inline]
 pub unsafe fn PyContextVar_CheckExact(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == addr_of_mut!(PyContextVar_Type)) as c_int
+    (Py_TYPE(op) == &raw mut PyContextVar_Type) as c_int
 }
 
 #[inline]
 pub unsafe fn PyContextToken_CheckExact(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == addr_of_mut!(PyContextToken_Type)) as c_int
+    (Py_TYPE(op) == &raw mut PyContextToken_Type) as c_int
 }
 
 extern_libpython! {