Resolve long-standing using module_def = PyModuleDef; // TODO: Can this be removed

The TODO was introduced with:

7800e7f

Author: rwgk

include/pybind11/detail/common.h

@@ -366,15 +366,15 @@
 PYBIND11_WARNING_PUSH
 PYBIND11_WARNING_DISABLE_CLANG("-Wgnu-zero-variadic-macro-arguments")
 #define PYBIND11_MODULE_PYINIT(name, pre_init, ...)                                               \
-    static ::pybind11::module_::module_def PYBIND11_CONCAT(pybind11_module_def_, name);           \
+    static PyModuleDef PYBIND11_CONCAT(pybind11_module_def_, name);                               \
     static ::pybind11::module_::slots_array PYBIND11_CONCAT(pybind11_module_slots_, name);        \
     static int PYBIND11_CONCAT(pybind11_exec_, name)(PyObject *);                                 \
     static void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ &);                     \
     PYBIND11_PLUGIN_IMPL(name) {                                                                  \
         PYBIND11_CHECK_PYTHON_VERSION                                                             \
         pre_init;                                                                                 \
         PYBIND11_ENSURE_INTERNALS_READY                                                           \
-        static auto def = []() {                                                                  \
+        static PyModuleDef *def = []() {                                                          \
             auto &slots = PYBIND11_CONCAT(pybind11_module_slots_, name);                          \
             slots[0] = {Py_mod_exec,                                                              \
                         reinterpret_cast<void *>(&PYBIND11_CONCAT(pybind11_exec_, name))};        \

include/pybind11/pybind11.h

@@ -1438,16 +1438,14 @@ class module_ : public object {
         PyModule_AddObject(ptr(), name, obj.inc_ref().ptr() /* steals a reference */);
     }
 
-    using module_def = PyModuleDef; // TODO: Can this be removed (it was needed only for Python 2)?
-
     /** \rst
         Create a new top-level module that can be used as the main module of a C extension.
 
         ``def`` should point to a statically allocated module_def.
     \endrst */
     static module_ create_extension_module(const char *name,
                                            const char *doc,
-                                           module_def *def,
+                                           PyModuleDef *def,
                                            mod_gil_not_used gil_not_used
                                            = mod_gil_not_used(false)) {
         // module_def is PyModuleDef
@@ -1491,11 +1489,11 @@ class module_ : public object {
             additional slots from the supplied options (and the empty sentinel slot).
     \endrst */
     template <typename... Options>
-    static module_def *initialize_multiphase_module_def(const char *name,
-                                                        const char *doc,
-                                                        module_def *def,
-                                                        slots_array &slots,
-                                                        Options &&...options) {
+    static PyModuleDef *initialize_multiphase_module_def(const char *name,
+                                                         const char *doc,
+                                                         PyModuleDef *def,
+                                                         slots_array &slots,
+                                                         Options &&...options) {
         size_t next_slot = 0;
         size_t term_slot = slots.size() - 1;
 

tests/test_modules.cpp

@@ -78,8 +78,7 @@ TEST_SUBMODULE(modules, m) {
         class DupeException {};
 
         // Go ahead and leak, until we have a non-leaking py::module_ constructor
-        auto dm
-            = py::module_::create_extension_module("dummy", nullptr, new py::module_::module_def);
+        auto dm = py::module_::create_extension_module("dummy", nullptr, new PyModuleDef);
         auto failures = py::list();
 
         py::class_<Dupe1>(dm, "Dupe1");