drop memoffset dependency (#5545)

* drop `memoffset` dependency

* drop "Runtime" building of `PyMethodDefType`

* Update src/impl_/pyclass.rs

Co-authored-by: Icxolu <[email protected]>

* coverage

* newsfragment

---------

Co-authored-by: Icxolu <[email protected]>

Author: davidhewitt

Cargo.toml

@@ -26,7 +26,6 @@ rust-version.workspace = true
 
 [dependencies]
 libc = "0.2.62"
-memoffset = "0.9"
 once_cell = "1.21"
 
 # ffi bindings to the python interpreter, split into a separate crate so they can be used independently

newsfragments/5545.packaging.md

@@ -0,0 +1 @@
+Drop `memoffset` dependency.

pyo3-macros-backend/src/pyclass.rs

@@ -1671,14 +1671,12 @@ pub fn gen_complex_enum_variant_attr(
     };
 
     let method_def = quote! {
-        #pyo3_path::impl_::pyclass::MaybeRuntimePyMethodDef::Static(
-            #pyo3_path::impl_::pymethods::PyMethodDefType::ClassAttribute({
-                #pyo3_path::impl_::pymethods::PyClassAttributeDef::new(
-                    #python_name,
-                    #cls_type::#wrapper_ident
-                )
-            })
-        )
+        #pyo3_path::impl_::pymethods::PyMethodDefType::ClassAttribute({
+            #pyo3_path::impl_::pymethods::PyClassAttributeDef::new(
+                #python_name,
+                #cls_type::#wrapper_ident
+            )
+        })
     };
 
     MethodAndMethodDef {

pyo3-macros-backend/src/pyimpl.rs

@@ -242,14 +242,12 @@ pub fn gen_py_const(cls: &syn::Type, spec: &ConstSpec, ctx: &Ctx) -> MethodAndMe
     };
 
     let method_def = quote! {
-        #pyo3_path::impl_::pyclass::MaybeRuntimePyMethodDef::Static(
-            #pyo3_path::impl_::pymethods::PyMethodDefType::ClassAttribute({
-                #pyo3_path::impl_::pymethods::PyClassAttributeDef::new(
-                    #python_name,
-                    #cls::#wrapper_ident
-                )
-            })
-        )
+        #pyo3_path::impl_::pymethods::PyMethodDefType::ClassAttribute({
+            #pyo3_path::impl_::pymethods::PyClassAttributeDef::new(
+                #python_name,
+                #cls::#wrapper_ident
+            )
+        })
     };
 
     MethodAndMethodDef {

pyo3-macros-backend/src/pymethod.rs

@@ -365,9 +365,7 @@ pub fn impl_py_method_def(
     };
     let methoddef = spec.get_methoddef(quote! { #cls::#wrapper_ident }, doc, ctx);
     let method_def = quote! {
-        #pyo3_path::impl_::pyclass::MaybeRuntimePyMethodDef::Static(
-            #pyo3_path::impl_::pymethods::PyMethodDefType::#methoddef_type(#methoddef #add_flags)
-        )
+        #pyo3_path::impl_::pymethods::PyMethodDefType::#methoddef_type(#methoddef #add_flags)
     };
     Ok(MethodAndMethodDef {
         associated_method,
@@ -600,14 +598,12 @@ pub(crate) fn impl_py_class_attribute(
     };
 
     let method_def = quote! {
-        #pyo3_path::impl_::pyclass::MaybeRuntimePyMethodDef::Static(
-            #pyo3_path::impl_::pymethods::PyMethodDefType::ClassAttribute({
-                #pyo3_path::impl_::pymethods::PyClassAttributeDef::new(
-                    #python_name,
-                    #cls::#wrapper_ident
-                )
-            })
-        )
+        #pyo3_path::impl_::pymethods::PyMethodDefType::ClassAttribute({
+            #pyo3_path::impl_::pymethods::PyClassAttributeDef::new(
+                #python_name,
+                #cls::#wrapper_ident
+            )
+        })
     };
 
     Ok(MethodAndMethodDef {
@@ -788,13 +784,11 @@ pub fn impl_py_setter_def(
 
     let method_def = quote! {
         #cfg_attrs
-        #pyo3_path::impl_::pyclass::MaybeRuntimePyMethodDef::Static(
-            #pyo3_path::impl_::pymethods::PyMethodDefType::Setter(
-                #pyo3_path::impl_::pymethods::PySetterDef::new(
-                    #python_name,
-                    #cls::#wrapper_ident,
-                    #doc
-                )
+        #pyo3_path::impl_::pymethods::PyMethodDefType::Setter(
+            #pyo3_path::impl_::pymethods::PySetterDef::new(
+                #python_name,
+                #cls::#wrapper_ident,
+                #doc
             )
         )
     };
@@ -862,33 +856,21 @@ pub fn impl_py_getter_def(
                 syn::Index::from(field_index).to_token_stream()
             };
 
-            // TODO: on MSRV 1.77+, we can use `::std::mem::offset_of!` here, and it should
-            // make it possible for the `MaybeRuntimePyMethodDef` to be a `Static` variant.
             let generator = quote_spanned! { ty.span() =>
-                #pyo3_path::impl_::pyclass::MaybeRuntimePyMethodDef::Runtime(
-                    || GENERATOR.generate(#python_name, #doc)
-                )
+                GENERATOR.generate(#python_name, #doc)
             };
-            // This is separate so that the unsafe below does not inherit the span and thus does not
+            // This is separate from `generator` so that the unsafe below does not inherit the span and thus does not
             // trigger the `unsafe_code` lint
             let method_def = quote! {
                 #cfg_attrs
                 {
                     #[allow(unused_imports)]  // might not be used if all probes are positive
                     use #pyo3_path::impl_::pyclass::Probe as _;
 
-                    struct Offset;
-                    unsafe impl #pyo3_path::impl_::pyclass::OffsetCalculator<#cls, #ty> for Offset {
-                        fn offset() -> usize {
-                            #pyo3_path::impl_::pyclass::class_offset::<#cls>() +
-                            #pyo3_path::impl_::pyclass::offset_of!(#cls, #field)
-                        }
-                    }
-
                     const GENERATOR: #pyo3_path::impl_::pyclass::PyClassGetterGenerator::<
                         #cls,
                         #ty,
-                        Offset,
+                        { ::std::mem::offset_of!(#cls, #field) },
                         { #pyo3_path::impl_::pyclass::IsPyT::<#ty>::VALUE },
                         { #pyo3_path::impl_::pyclass::IsIntoPyObjectRef::<#ty>::VALUE },
                         { #pyo3_path::impl_::pyclass::IsIntoPyObject::<#ty>::VALUE },
@@ -930,13 +912,11 @@ pub fn impl_py_getter_def(
 
             let method_def = quote! {
                 #cfg_attrs
-                #pyo3_path::impl_::pyclass::MaybeRuntimePyMethodDef::Static(
-                    #pyo3_path::impl_::pymethods::PyMethodDefType::Getter(
-                        #pyo3_path::impl_::pymethods::PyGetterDef::new(
-                            #python_name,
-                            #cls::#wrapper_ident,
-                            #doc
-                        )
+                #pyo3_path::impl_::pymethods::PyMethodDefType::Getter(
+                    #pyo3_path::impl_::pymethods::PyGetterDef::new(
+                        #python_name,
+                        #cls::#wrapper_ident,
+                        #doc
                     )
                 )
             };