Remove static type references

bschoenmaeckers · bschoenmaeckers · commit 87e669a21371 · 2026-04-23T16:34:03.000+02:00
diff --git a/pyo3-ffi/src/boolobject.rs b/pyo3-ffi/src/boolobject.rs
@@ -5,7 +5,16 @@ use std::ffi::{c_int, c_long};
 
 #[inline]
 pub unsafe fn PyBool_Check(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == &raw mut PyBool_Type) as c_int
+    #[cfg(not(RustPython))]
+    {
+        Py_IS_TYPE(op, &raw mut PyBool_Type)
+    }
+
+    #[cfg(RustPython)]
+    Py_IS_TYPE(
+        op,
+        crate::PyObject_GetAttrString(crate::PyEval_GetBuiltins(), c"bool".as_ptr()).cast(),
+    )
 }
 
 extern_libpython! {
diff --git a/pyo3-ffi/src/bytearrayobject.rs b/pyo3-ffi/src/bytearrayobject.rs
@@ -2,6 +2,7 @@ use crate::object::*;
 use crate::pyport::Py_ssize_t;
 use std::ffi::{c_char, c_int};
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyByteArray_Type")]
     pub static mut PyByteArray_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/bytesobject.rs b/pyo3-ffi/src/bytesobject.rs
@@ -2,6 +2,7 @@ use crate::object::*;
 use crate::pyport::Py_ssize_t;
 use std::ffi::{c_char, c_int};
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyBytes_Type")]
     pub static mut PyBytes_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/complexobject.rs b/pyo3-ffi/src/complexobject.rs
@@ -1,6 +1,7 @@
 use crate::object::*;
 use std::ffi::{c_double, c_int};
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyComplex_Type")]
     pub static mut PyComplex_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/context.rs b/pyo3-ffi/src/context.rs
@@ -1,6 +1,9 @@
-use crate::object::{PyObject, PyTypeObject, Py_TYPE};
+#[cfg(not(RustPython))]
+use crate::object::PyTypeObject;
+use crate::object::{PyObject, Py_TYPE};
 use std::ffi::{c_char, c_int};
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     pub static mut PyContext_Type: PyTypeObject;
     // skipped non-limited opaque PyContext
diff --git a/pyo3-ffi/src/descrobject.rs b/pyo3-ffi/src/descrobject.rs
@@ -35,6 +35,7 @@ impl Default for PyGetSetDef {
     }
 }
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyClassMethodDescr_Type")]
     pub static mut PyClassMethodDescr_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/dictobject.rs b/pyo3-ffi/src/dictobject.rs
@@ -2,6 +2,7 @@ use crate::object::*;
 use crate::pyport::Py_ssize_t;
 use std::ffi::{c_char, c_int};
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyDict_Type")]
     pub static mut PyDict_Type: PyTypeObject;
@@ -88,6 +89,7 @@ extern_libpython! {
     // skipped 3.10 / ex-non-limited PyObject_GenericGetDict
 }
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     pub static mut PyDictKeys_Type: PyTypeObject;
     pub static mut PyDictValues_Type: PyTypeObject;
@@ -114,6 +116,7 @@ pub unsafe fn PyDictViewSet_Check(op: *mut PyObject) -> c_int {
     (PyDictKeys_Check(op) != 0 || PyDictItems_Check(op) != 0) as c_int
 }
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     pub static mut PyDictIterKey_Type: PyTypeObject;
     pub static mut PyDictIterValue_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/floatobject.rs b/pyo3-ffi/src/floatobject.rs
@@ -5,14 +5,24 @@ use std::ffi::{c_double, c_int};
 // TODO: remove (see https://github.com/PyO3/pyo3/pull/1341#issuecomment-751515985)
 opaque_struct!(pub PyFloatObject);
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyFloat_Type")]
     pub static mut PyFloat_Type: PyTypeObject;
 }
 
 #[inline]
 pub unsafe fn PyFloat_Check(op: *mut PyObject) -> c_int {
-    PyObject_TypeCheck(op, &raw mut PyFloat_Type)
+    #[cfg(not(RustPython))]
+    {
+        PyObject_TypeCheck(op, &raw mut PyFloat_Type)
+    }
+
+    #[cfg(RustPython)]
+    PyObject_TypeCheck(
+        op,
+        crate::PyObject_GetAttrString(crate::PyEval_GetBuiltins(), c"float".as_ptr()).cast(),
+    )
 }
 
 #[inline]
diff --git a/pyo3-ffi/src/genericaliasobject.rs b/pyo3-ffi/src/genericaliasobject.rs
@@ -1,11 +1,13 @@
 #[cfg(Py_3_9)]
-use crate::object::{PyObject, PyTypeObject};
+use crate::PyObject;
+#[cfg(not(RustPython))]
+use crate::PyTypeObject;
 
 extern_libpython! {
     #[cfg(Py_3_9)]
     #[cfg_attr(PyPy, link_name = "PyPy_GenericAlias")]
     pub fn Py_GenericAlias(origin: *mut PyObject, args: *mut PyObject) -> *mut PyObject;
 
-    #[cfg(Py_3_9)]
+    #[cfg(all(Py_3_9, not(RustPython)))]
     pub static mut Py_GenericAliasType: PyTypeObject;
 }
diff --git a/pyo3-ffi/src/iterobject.rs b/pyo3-ffi/src/iterobject.rs
@@ -1,6 +1,7 @@
 use crate::object::*;
 use std::ffi::c_int;
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     pub static mut PySeqIter_Type: PyTypeObject;
     pub static mut PyCallIter_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/lib.rs b/pyo3-ffi/src/lib.rs
@@ -429,6 +429,7 @@ pub mod compat;
 mod impl_;
 
 pub use self::abstract_::*;
+#[cfg(not(RustPython))]
 pub use self::bltinmodule::*;
 pub use self::boolobject::*;
 pub use self::bytearrayobject::*;
@@ -443,6 +444,7 @@ pub use self::context::*;
 pub use self::datetime::*;
 pub use self::descrobject::*;
 pub use self::dictobject::*;
+#[cfg(not(RustPython))]
 pub use self::enumobject::*;
 pub use self::fileobject::*;
 pub use self::fileutils::*;
diff --git a/pyo3-ffi/src/listobject.rs b/pyo3-ffi/src/listobject.rs
@@ -2,6 +2,7 @@ use crate::object::*;
 use crate::pyport::Py_ssize_t;
 use std::ffi::c_int;
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyList_Type")]
     pub static mut PyList_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/memoryobject.rs b/pyo3-ffi/src/memoryobject.rs
@@ -4,6 +4,7 @@ use std::ffi::{c_char, c_int};
 
 // skipped _PyManagedBuffer_Type
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyMemoryView_Type")]
     pub static mut PyMemoryView_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/methodobject.rs b/pyo3-ffi/src/methodobject.rs
@@ -15,6 +15,7 @@ pub struct PyCFunctionObject {
     pub vectorcall: Option<crate::vectorcallfunc>,
 }
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyCFunction_Type")]
     pub static mut PyCFunction_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/moduleobject.rs b/pyo3-ffi/src/moduleobject.rs
@@ -3,6 +3,7 @@ use crate::object::*;
 use crate::pyport::Py_ssize_t;
 use std::ffi::{c_char, c_int, c_void};
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyModule_Type")]
     pub static mut PyModule_Type: PyTypeObject;
@@ -45,6 +46,7 @@ extern_libpython! {
     pub fn PyModuleDef_Init(arg1: *mut PyModuleDef) -> *mut PyObject;
 }
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     pub static mut PyModuleDef_Type: PyTypeObject;
 }
diff --git a/pyo3-ffi/src/object.rs b/pyo3-ffi/src/object.rs
@@ -166,13 +166,13 @@ pub struct PyVarObject {
 // skipped private _PyVarObject_CAST
 
 #[inline]
-#[cfg(not(any(GraalPy, PyPy)))]
+#[cfg(not(any(GraalPy, PyPy, RustPython)))]
 #[cfg_attr(docsrs, doc(cfg(all())))]
 pub unsafe fn Py_Is(x: *mut PyObject, y: *mut PyObject) -> c_int {
     (x == y).into()
 }
 
-#[cfg(any(GraalPy, PyPy))]
+#[cfg(any(GraalPy, PyPy, RustPython))]
 #[cfg_attr(docsrs, doc(cfg(all())))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPy_Is")]
@@ -211,6 +211,7 @@ extern_libpython! {
 
 // skip _Py_TYPE compat shim
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyLong_Type")]
     pub static mut PyLong_Type: PyTypeObject;
@@ -380,6 +381,7 @@ pub unsafe fn PyObject_TypeCheck(ob: *mut PyObject, tp: *mut PyTypeObject) -> c_
     (Py_IS_TYPE(ob, tp) != 0 || PyType_IsSubtype(Py_TYPE(ob), tp) != 0) as c_int
 }
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     /// built-in 'type'
     #[cfg_attr(PyPy, link_name = "PyPyType_Type")]
diff --git a/pyo3-ffi/src/pycapsule.rs b/pyo3-ffi/src/pycapsule.rs
@@ -1,6 +1,7 @@
 use crate::object::*;
 use std::ffi::{c_char, c_int, c_void};
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyCapsule_Type")]
     pub static mut PyCapsule_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/rangeobject.rs b/pyo3-ffi/src/rangeobject.rs
@@ -1,6 +1,7 @@
 use crate::object::*;
 use std::ffi::c_int;
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyRange_Type")]
     pub static mut PyRange_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/setobject.rs b/pyo3-ffi/src/setobject.rs
@@ -45,6 +45,7 @@ extern_libpython! {
     // skipped non-limited _PySet_Update
 }
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPySet_Type")]
     pub static mut PySet_Type: PyTypeObject;
diff --git a/pyo3-ffi/src/sliceobject.rs b/pyo3-ffi/src/sliceobject.rs
@@ -35,6 +35,7 @@ pub struct PySliceObject {
     pub step: *mut PyObject,
 }
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPySlice_Type")]
     pub static mut PySlice_Type: PyTypeObject;
@@ -43,7 +44,16 @@ extern_libpython! {
 
 #[inline]
 pub unsafe fn PySlice_Check(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == &raw mut PySlice_Type) as c_int
+    #[cfg(not(RustPython))]
+    {
+        Py_IS_TYPE(op, &raw mut PySlice_Type)
+    }
+
+    #[cfg(RustPython)]
+    Py_IS_TYPE(
+        op,
+        crate::PyObject_GetAttrString(crate::PyEval_GetBuiltins(), c"slice".as_ptr()).cast(),
+    )
 }
 
 extern_libpython! {
diff --git a/pyo3-ffi/src/traceback.rs b/pyo3-ffi/src/traceback.rs
@@ -9,6 +9,7 @@ extern_libpython! {
 }
 
 extern_libpython! {
+    #[cfg(not(RustPython))]
     #[cfg_attr(PyPy, link_name = "PyPyTraceBack_Type")]
     pub static mut PyTraceBack_Type: PyTypeObject;
 
@@ -20,5 +21,11 @@ extern_libpython! {
 #[inline]
 #[cfg(not(PyPy))]
 pub unsafe fn PyTraceBack_Check(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == &raw mut PyTraceBack_Type) as c_int
+    #[cfg(not(RustPython))]
+    {
+        Py_IS_TYPE(op, &raw mut PyTraceBack_Type)
+    }
+
+    #[cfg(RustPython)]
+    todo!()
 }
diff --git a/pyo3-ffi/src/tupleobject.rs b/pyo3-ffi/src/tupleobject.rs
@@ -2,6 +2,7 @@ use crate::object::*;
 use crate::pyport::Py_ssize_t;
 use std::ffi::c_int;
 
+#[cfg(not(RustPython))]
 extern_libpython! {
     #[cfg_attr(PyPy, link_name = "PyPyTuple_Type")]
     pub static mut PyTuple_Type: PyTypeObject;
@@ -15,7 +16,16 @@ pub unsafe fn PyTuple_Check(op: *mut PyObject) -> c_int {
 
 #[inline]
 pub unsafe fn PyTuple_CheckExact(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == &raw mut PyTuple_Type) as c_int
+    #[cfg(not(RustPython))]
+    {
+        Py_IS_TYPE(op, &raw mut PyTuple_Type)
+    }
+
+    #[cfg(RustPython)]
+    Py_IS_TYPE(
+        op,
+        crate::PyObject_GetAttrString(crate::PyEval_GetBuiltins(), c"tuple".as_ptr()).cast(),
+    )
 }
 
 extern_libpython! {
diff --git a/pyo3-ffi/src/unicodeobject.rs b/pyo3-ffi/src/unicodeobject.rs
@@ -15,8 +15,10 @@ pub type Py_UCS2 = u16;
 pub type Py_UCS1 = u8;
 
 extern_libpython! {
+    #[cfg(not(RustPython))]
     #[cfg_attr(PyPy, link_name = "PyPyUnicode_Type")]
     pub static mut PyUnicode_Type: PyTypeObject;
+    #[cfg(not(RustPython))]
     pub static mut PyUnicodeIter_Type: PyTypeObject;
 
     #[cfg(PyPy)]
@@ -37,7 +39,16 @@ pub unsafe fn PyUnicode_Check(op: *mut PyObject) -> c_int {
 #[inline]
 #[cfg(not(PyPy))]
 pub unsafe fn PyUnicode_CheckExact(op: *mut PyObject) -> c_int {
-    (Py_TYPE(op) == &raw mut PyUnicode_Type) as c_int
+    #[cfg(not(RustPython))]
+    {
+        Py_IS_TYPE(op, &raw mut PyUnicode_Type)
+    }
+
+    #[cfg(RustPython)]
+    Py_IS_TYPE(
+        op,
+        crate::PyObject_GetAttrString(crate::PyEval_GetBuiltins(), c"str".as_ptr()).cast(),
+    )
 }
 
 pub const Py_UNICODE_REPLACEMENT_CHARACTER: Py_UCS4 = 0xFFFD;
diff --git a/pyo3-ffi/src/weakrefobject.rs b/pyo3-ffi/src/weakrefobject.rs
diff --git a/src/pycell/impl_.rs b/src/pycell/impl_.rs
diff --git a/src/types/any.rs b/src/types/any.rs
diff --git a/src/types/boolobject.rs b/src/types/boolobject.rs
diff --git a/src/types/dict.rs b/src/types/dict.rs
diff --git a/src/types/float.rs b/src/types/float.rs
diff --git a/src/types/num.rs b/src/types/num.rs
diff --git a/src/types/string.rs b/src/types/string.rs
diff --git a/src/types/tuple.rs b/src/types/tuple.rs
diff --git a/src/types/typeobject.rs b/src/types/typeobject.rs

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ impl Default for PyGetSetDef {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
	`38`	`+#[cfg(not(RustPython))]`
`38`	`39`	`extern_libpython! {`
`39`	`40`	`#[cfg_attr(PyPy, link_name = "PyPyClassMethodDescr_Type")]`
`40`	`41`	`pub static mut PyClassMethodDescr_Type: PyTypeObject;`