Initial free threaded bindings

examples/sequential/src/module.rs

@@ -3,7 +3,7 @@ use pyo3_ffi::*;
 use std::os::raw::{c_int, c_void};
 
 pub static mut MODULE_DEF: PyModuleDef = PyModuleDef {
-    m_base: PyModuleDef_HEAD_INIT,
+    m_base: PyModuleDef_HEAD_INIT(),
     m_name: c_str!("sequential").as_ptr(),
     m_doc: c_str!("A library for generating sequential ids, written in Rust.").as_ptr(),
     m_size: mem::size_of::<sequential_state>() as Py_ssize_t,

examples/string-sum/src/lib.rs

@@ -4,7 +4,7 @@ use std::ptr;
 use pyo3_ffi::*;
 
 static mut MODULE_DEF: PyModuleDef = PyModuleDef {
-    m_base: PyModuleDef_HEAD_INIT,
+    m_base: PyModuleDef_HEAD_INIT(),
     m_name: c_str!("string_sum").as_ptr(),
     m_doc: c_str!("A Python module written in Rust.").as_ptr(),
     m_size: 0,

pyo3-ffi/README.md

@@ -50,7 +50,7 @@ use std::ptr;
 use pyo3_ffi::*;
 
 static mut MODULE_DEF: PyModuleDef = PyModuleDef {
-    m_base: PyModuleDef_HEAD_INIT,
+    m_base: PyModuleDef_HEAD_INIT(),
     m_name: c_str!("string_sum").as_ptr(),
     m_doc: c_str!("A Python module written in Rust.").as_ptr(),
     m_size: 0,

pyo3-ffi/src/lib.rs

@@ -88,7 +88,7 @@
 //! use pyo3_ffi::*;
 //!
 //! static mut MODULE_DEF: PyModuleDef = PyModuleDef {
-//!     m_base: PyModuleDef_HEAD_INIT,
+//!     m_base: PyModuleDef_HEAD_INIT(),
 //!     m_name: c_str!("string_sum").as_ptr(),
 //!     m_doc: c_str!("A Python module written in Rust.").as_ptr(),
 //!     m_size: 0,

pyo3-ffi/src/moduleobject.rs

@@ -59,12 +59,14 @@ pub struct PyModuleDef_Base {
     pub m_copy: *mut PyObject,
 }
 
-pub const PyModuleDef_HEAD_INIT: PyModuleDef_Base = PyModuleDef_Base {
-    ob_base: PyObject_HEAD_INIT,
-    m_init: None,
-    m_index: 0,
-    m_copy: std::ptr::null_mut(),
-};
+pub const fn PyModuleDef_HEAD_INIT() -> PyModuleDef_Base {
+    PyModuleDef_Base {
+        ob_base: PyObject_HEAD_INIT(),
+        m_init: None,
+        m_index: 0,
+        m_copy: std::ptr::null_mut(),
+    }
+}
 
 #[repr(C)]
 #[derive(Copy, Clone, Eq, PartialEq)]

pyo3-ffi/src/object.rs

@@ -1,5 +1,5 @@
 use crate::pyport::{Py_hash_t, Py_ssize_t};
-#[cfg(all(Py_3_13, not(Py_LIMITED_API)))]
+#[cfg(Py_GIL_DISABLED)]
 use crate::PyMutex;
 use std::mem;
 use std::os::raw::{c_char, c_int, c_uint, c_ulong, c_void};
@@ -31,31 +31,33 @@ pub const _Py_IMMORTAL_REFCNT_LOCAL: u32 = u32::MAX;
 #[cfg(Py_GIL_DISABLED)]
 pub const _Py_REF_SHARED_SHIFT: isize = 2;
 
-pub const PyObject_HEAD_INIT: PyObject = PyObject {
-    #[cfg(py_sys_config = "Py_TRACE_REFS")]
-    _ob_next: std::ptr::null_mut(),
-    #[cfg(py_sys_config = "Py_TRACE_REFS")]
-    _ob_prev: std::ptr::null_mut(),
-    #[cfg(Py_GIL_DISABLED)]
-    ob_tid: 0,
-    #[cfg(Py_GIL_DISABLED)]
-    _padding: 0,
-    #[cfg(Py_GIL_DISABLED)]
-    ob_mutex: unsafe { mem::zeroed::<PyMutex>() },
-    #[cfg(Py_GIL_DISABLED)]
-    ob_gc_bits: 0,
-    #[cfg(Py_GIL_DISABLED)]
-    ob_ref_local: AtomicU32::new(0),
-    #[cfg(Py_GIL_DISABLED)]
-    ob_ref_shared: AtomicIsize::new(0),
-    #[cfg(all(not(Py_GIL_DISABLED), Py_3_12))]
-    ob_refcnt: PyObjectObRefcnt { ob_refcnt: 1 },
-    #[cfg(not(Py_3_12))]
-    ob_refcnt: 1,
-    #[cfg(PyPy)]
-    ob_pypy_link: 0,
-    ob_type: std::ptr::null_mut(),
-};
+pub const fn PyObject_HEAD_INIT() -> PyObject {
+    PyObject {
+        #[cfg(py_sys_config = "Py_TRACE_REFS")]
+        _ob_next: std::ptr::null_mut(),
+        #[cfg(py_sys_config = "Py_TRACE_REFS")]
+        _ob_prev: std::ptr::null_mut(),
+        #[cfg(Py_GIL_DISABLED)]
+        ob_tid: 0,
+        #[cfg(Py_GIL_DISABLED)]
+        _padding: 0,
+        #[cfg(Py_GIL_DISABLED)]
+        ob_mutex: unsafe { mem::zeroed::<PyMutex>() },
+        #[cfg(Py_GIL_DISABLED)]
+        ob_gc_bits: 0,
+        #[cfg(Py_GIL_DISABLED)]
+        ob_ref_local: AtomicU32::new(0),
+        #[cfg(Py_GIL_DISABLED)]
+        ob_ref_shared: AtomicIsize::new(0),
+        #[cfg(all(not(Py_GIL_DISABLED), Py_3_12))]
+        ob_refcnt: PyObjectObRefcnt { ob_refcnt: 1 },
+        #[cfg(not(Py_3_12))]
+        ob_refcnt: 1,
+        #[cfg(PyPy)]
+        ob_pypy_link: 0,
+        ob_type: std::ptr::null_mut(),
+    }
+}
 
 // skipped PyObject_VAR_HEAD
 // skipped Py_INVALID_SIZE

src/impl_/pymodule.rs

@@ -55,7 +55,7 @@ impl ModuleDef {
         initializer: ModuleInitializer,
     ) -> Self {
         const INIT: ffi::PyModuleDef = ffi::PyModuleDef {
-            m_base: ffi::PyModuleDef_HEAD_INIT,
+            m_base: ffi::PyModuleDef_HEAD_INIT(),
             m_name: std::ptr::null(),
             m_doc: std::ptr::null(),
             m_size: 0,