fix MSRV

Author: davidhewitt

pyo3-macros-backend/src/module.rs

@@ -15,7 +15,7 @@ use crate::{
     get_doc,
     pyclass::PyClassPyO3Option,
     pyfunction::{impl_wrap_pyfunction, PyFunctionOptions},
-    utils::{has_attribute, has_attribute_with_namespace, Ctx, IdentOrStr, LitCStr},
+    utils::{has_attribute, has_attribute_with_namespace, Ctx, IdentOrStr, LitCStr, PythonDoc},
 };
 use proc_macro2::{Span, TokenStream};
 use quote::quote;
@@ -389,27 +389,14 @@ pub fn pymodule_module_impl(
     let introspection_id = quote! {};
 
     let gil_used = options.gil_used.map_or(true, |op| op.value.value);
-    let num_slots: usize = 2; // initializer + gil_used
 
-    let module_def = quote! {{
-        use #pyo3_path::impl_::pymodule as impl_;
-
-        unsafe extern "C" fn __pyo3_module_exec(module: *mut #pyo3_path::ffi::PyObject) -> ::std::os::raw::c_int {
-            #pyo3_path::impl_::trampoline::module_exec(module, |m| __pyo3_pymodule(m))
-        }
-
-        static SLOTS: impl_::PyModuleSlots<{ #num_slots + 1 }> = impl_::PyModuleSlotsBuilder::new()
-            .with_mod_exec(__pyo3_module_exec)
-            .with_gil_used(#gil_used)
-            .build();
-        impl_::ModuleDef::new(__PYO3_NAME, #doc, &SLOTS)
-    }};
     let initialization = module_initialization(
         &name,
         ctx,
-        module_def,
+        quote! { __pyo3_pymodule },
         options.submodule.is_some(),
-        true, // FIXME remove this
+        gil_used,
+        doc,
     );
 
     let module_consts_names = module_consts.iter().map(|i| i.unraw().to_string());
@@ -462,8 +449,14 @@ pub fn pymodule_function_impl(
 
     let gil_used = options.gil_used.map_or(true, |op| op.value.value);
 
-    let initialization =
-        module_initialization(&name, ctx, quote! { MakeDef::make_def() }, false, gil_used);
+    let initialization = module_initialization(
+        &name,
+        ctx,
+        quote! { ModuleExec::__pyo3_module_exec },
+        false,
+        gil_used,
+        doc,
+    );
 
     #[cfg(feature = "experimental-inspect")]
     let introspection =
@@ -496,24 +489,9 @@ pub fn pymodule_function_impl(
         // (and `super` doesn't always refer to the outer scope, e.g. if the `#[pymodule] is
         // inside a function body)
         #[allow(unknown_lints, non_local_definitions)]
-        impl #ident::MakeDef {
-            const fn make_def() -> #pyo3_path::impl_::pymodule::ModuleDef {
-                use #pyo3_path::impl_::pymodule as impl_;
-
-                unsafe extern "C" fn __pyo3_module_exec(module: *mut #pyo3_path::ffi::PyObject) -> ::std::os::raw::c_int {
-                    #pyo3_path::impl_::trampoline::module_exec(module, |module| #ident(#(#module_args),*))
-                }
-
-                static SLOTS: impl_::PyModuleSlots<4> = impl_::PyModuleSlotsBuilder::new()
-                    .with_mod_exec(__pyo3_module_exec)
-                    .with_gil_used(#gil_used)
-                    .build();
-
-                impl_::ModuleDef::new(
-                    #ident::__PYO3_NAME,
-                    #doc,
-                    &SLOTS
-                )
+        impl #ident::ModuleExec {
+            fn __pyo3_module_exec(module: &#pyo3_path::Bound<'_, #pyo3_path::types::PyModule>) -> #pyo3_path::PyResult<()> {
+                #ident(#(#module_args),*)
             }
         }
     })
@@ -522,9 +500,10 @@ pub fn pymodule_function_impl(
 fn module_initialization(
     name: &syn::Ident,
     ctx: &Ctx,
-    module_def: TokenStream,
+    module_exec: TokenStream,
     is_submodule: bool,
     gil_used: bool,
+    doc: PythonDoc,
 ) -> TokenStream {
     let Ctx { pyo3_path, .. } = ctx;
     let pyinit_symbol = format!("PyInit_{name}");
@@ -535,9 +514,27 @@ fn module_initialization(
         #[doc(hidden)]
         pub const __PYO3_NAME: &'static ::std::ffi::CStr = #pyo3_name;
 
-        pub(super) struct MakeDef;
+        // This structure exists for `fn` modules declared within `fn` bodies, where due to the hidden
+        // module (used for importing) the `fn` to initialize the module cannot be seen from the #module_def
+        // declaration just below.
         #[doc(hidden)]
-        pub static _PYO3_DEF: #pyo3_path::impl_::pymodule::ModuleDef = #module_def;
+        pub(super) struct ModuleExec;
+
+        #[doc(hidden)]
+        pub static _PYO3_DEF: #pyo3_path::impl_::pymodule::ModuleDef = {
+            use #pyo3_path::impl_::pymodule as impl_;
+
+            unsafe extern "C" fn __pyo3_module_exec(module: *mut #pyo3_path::ffi::PyObject) -> ::std::os::raw::c_int {
+                #pyo3_path::impl_::trampoline::module_exec(module, #module_exec)
+            }
+
+            static SLOTS: impl_::PyModuleSlots<4> = impl_::PyModuleSlotsBuilder::new()
+                .with_mod_exec(__pyo3_module_exec)
+                .with_gil_used(#gil_used)
+                .build();
+
+            impl_::ModuleDef::new(__PYO3_NAME, #doc, &SLOTS)
+        };
         #[doc(hidden)]
         // so wrapped submodules can see what gil_used is
         pub static __PYO3_GIL_USED: bool = #gil_used;