stash!

Author: JyJyJcr

examples/Cargo.toml

@@ -52,6 +52,9 @@ name = "type_driven"
 path = "type_driven.rs"
 crate-type = ["cdylib"]
 
+[example.type_driven.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(static_ref_mut)'] }
+
 [features]
 default = ["export-modules", "ngx/vendored"]
 # Generate `ngx_modules` table with module exports

examples/type_driven.rs

@@ -1,23 +1,51 @@
 use std::ffi::CStr;
-use std::ptr::addr_of_mut;
 
 use ngx::ffi::{ngx_conf_t, ngx_str_t};
-use ngx::http::{HttpMainConf, HttpModuleSkel};
+use ngx::http::HttpMainConf;
 use ngx::module::{
     CommandArgFlag, CommandArgFlagSet, CommandCallRule, CommandContextFlag, CommandContextFlagSet, CommandError,
 };
-use ngx::{arg_flags, context_flags, ngx_string};
+use ngx::{arg_flags, context_flags, exhibit_modules, ngx_string};
 use ngx::{
     http::{DefaultInit, DefaultMerge, HttpModule, NgxHttpModule, NgxHttpModuleCommands},
     module::{Command, NgxModuleCommandsBuilder},
 };
 
 #[cfg(static_ref_mut)]
 use ngx::{exhibit_modules, http::NgxHttpModuleCommandsRefMut, util::StaticRefMut};
+#[cfg(not(static_ref_mut))]
+use std::ptr::addr_of_mut;
+
+#[cfg(not(static_ref_mut))]
+use ngx::{
+    http::HttpModuleSkel,
+    module::{NgxModule, NgxModuleCtx},
+    ngx_modules,
+};
+#[cfg(not(static_ref_mut))]
+use std::ptr::addr_of;
 
 #[cfg(all(static_ref_mut, feature = "export-modules"))]
 exhibit_modules!(HttpModuleSkel<FooBarHttpModule>);
 
+#[cfg(all(not(static_ref_mut), feature = "export-modules"))]
+exhibit_modules!(HttpModuleSkel<FooBarHttpModule> => &mut FOO_BAR_HTTP_MODULE);
+
+#[cfg(not(static_ref_mut))]
+static mut FOO_BAR_HTTP_MODULE: NgxModule<HttpModuleSkel<FooBarHttpModule>> = unsafe {
+    NgxModule::new_from_ptr(
+        addr_of!(FOO_BAR_HTTP_MODULE_CTX),
+        addr_of!(FOO_BAR_HTTP_MODULE_COMMANDS),
+    )
+};
+#[cfg(not(static_ref_mut))]
+static mut FOO_BAR_HTTP_MODULE_CTX: NgxModuleCtx<HttpModuleSkel<FooBarHttpModule>> =
+    unsafe { NgxModuleCtx::from_raw() };
+
+#[cfg(not(static_ref_mut))]
+static mut FOO_BAR_HTTP_MODULE_COMMANDS: NgxHttpModuleCommands<FooBarHttpModule, { 1 + 1 }> =
+    NgxModuleCommandsBuilder::new().add::<FooBarCommand>().build();
+
 struct FooBarHttpModule;
 impl HttpModule for FooBarHttpModule {
     #[cfg(static_ref_mut)]

src/module.rs

@@ -449,14 +449,39 @@ macro_rules! exhibit_modules {
     };
 }
 
+/// Exhibit modules exported by this library.
+///
+/// These are normally generated by the Nginx module system, but need to be
+/// defined when building modules outside of it.
+#[macro_export]
+#[cfg(not(static_ref_mut))]
+macro_rules! exhibit_modules {
+    ($( $mod:ty => $entity:expr),+) => {
+        #[no_mangle]
+        #[allow(non_upper_case_globals)]
+        pub static mut ngx_modules: [*const $crate::ffi::ngx_module_t; $( {let _:[$mod;0]; 1}+ )+ 1] =
+        unsafe {$crate::module::__macro::NgxModulesBuilder::new()$(.add::<$mod>($entity))+ .build() };
+
+        #[no_mangle]
+        #[allow(non_upper_case_globals)]
+        pub static mut ngx_module_names: [*const $crate::module::__macro::c_char; $( {let _:[$mod;0]; 1}+ ) + 1] =
+        $crate::module::__macro::NgxModuleNamesBuilder::new()$(.add::<$mod>())+ .build();
+
+        #[no_mangle]
+        #[allow(non_upper_case_globals)]
+        pub static mut ngx_module_order: [*const ::core::ffi::c_char; 1] = [
+            $crate::module::__macro::null()
+        ];
+    };
+}
+
 #[doc(hidden)]
-#[cfg(static_ref_mut)]
 pub mod __macro {
     pub use core::{ffi::c_char, ptr::null};
 
-    use crate::{ffi::ngx_module_t, util::ConstArrayBuilder};
-
     use super::Module;
+    use super::NgxModule;
+    use crate::{ffi::ngx_module_t, util::ConstArrayBuilder};
 
     pub struct NgxModulesBuilder<const N: usize>(ConstArrayBuilder<*const ngx_module_t, N>);
     impl<const N: usize> Default for NgxModulesBuilder<N> {
@@ -469,10 +494,16 @@ pub mod __macro {
         pub const fn new() -> Self {
             Self(ConstArrayBuilder::new())
         }
+        #[cfg(static_ref_mut)]
         pub const fn add<M: Module>(mut self) -> Self {
             self.0 = self.0.push(unsafe { &M::SELF.to_ref().0 as *const _ });
             self
         }
+        #[cfg(not(static_ref_mut))]
+        pub const unsafe fn add<M: Module>(mut self, module: &'static mut NgxModule<M>) -> Self {
+            self.0 = self.0.push(&module.0 as *const _);
+            self
+        }
         pub const fn build(self) -> [*const ngx_module_t; N] {
             self.0.push(null()).build()
         }