refactor!: replace ngx_null_command! with ngx_command_t::empty()

Author: bavshin-f5

examples/async.rs

@@ -12,7 +12,7 @@ use ngx::ffi::{
     NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_MODULE,
 };
 use ngx::http::{self, HTTPModule, MergeConfigError};
-use ngx::{http_request_handler, ngx_log_debug_http, ngx_null_command, ngx_string};
+use ngx::{http_request_handler, ngx_log_debug_http, ngx_string};
 use tokio::runtime::Runtime;
 
 struct Module;
@@ -63,7 +63,7 @@ static mut NGX_HTTP_ASYNC_COMMANDS: [ngx_command_t; 2] = [
         offset: 0,
         post: std::ptr::null_mut(),
     },
-    ngx_null_command!(),
+    ngx_command_t::empty(),
 ];
 
 static NGX_HTTP_ASYNC_MODULE_CTX: ngx_http_module_t = ngx_http_module_t {

examples/awssig.rs

@@ -9,7 +9,7 @@ use ngx::ffi::{
     NGX_HTTP_LOC_CONF, NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_MODULE, NGX_HTTP_SRV_CONF,
 };
 use ngx::http::*;
-use ngx::{http_request_handler, ngx_log_debug_http, ngx_null_command, ngx_string};
+use ngx::{http_request_handler, ngx_log_debug_http, ngx_string};
 
 struct Module;
 
@@ -82,7 +82,7 @@ static mut NGX_HTTP_AWSSIGV4_COMMANDS: [ngx_command_t; 6] = [
         offset: 0,
         post: std::ptr::null_mut(),
     },
-    ngx_null_command!(),
+    ngx_command_t::empty(),
 ];
 
 static NGX_HTTP_AWSSIGV4_MODULE_CTX: ngx_http_module_t = ngx_http_module_t {

examples/curl.rs

@@ -8,7 +8,7 @@ use ngx::ffi::{
     NGX_HTTP_LOC_CONF, NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_MODULE,
 };
 use ngx::http::{self, HTTPModule, MergeConfigError};
-use ngx::{http_request_handler, ngx_log_debug_http, ngx_null_command, ngx_string};
+use ngx::{http_request_handler, ngx_log_debug_http, ngx_string};
 
 struct Module;
 
@@ -45,7 +45,7 @@ static mut NGX_HTTP_CURL_COMMANDS: [ngx_command_t; 2] = [
         offset: 0,
         post: std::ptr::null_mut(),
     },
-    ngx_null_command!(),
+    ngx_command_t::empty(),
 ];
 
 static NGX_HTTP_CURL_MODULE_CTX: ngx_http_module_t = ngx_http_module_t {

examples/upstream.rs

@@ -23,10 +23,7 @@ use ngx::http::{
     ngx_http_conf_get_module_srv_conf, ngx_http_conf_upstream_srv_conf_immutable,
     ngx_http_conf_upstream_srv_conf_mutable, HTTPModule, Merge, MergeConfigError, Request,
 };
-use ngx::{
-    http_upstream_init_peer_pt, ngx_conf_log_error, ngx_log_debug_http, ngx_log_debug_mask, ngx_null_command,
-    ngx_string,
-};
+use ngx::{http_upstream_init_peer_pt, ngx_conf_log_error, ngx_log_debug_http, ngx_log_debug_mask, ngx_string};
 
 #[derive(Clone, Copy, Debug)]
 #[repr(C)]
@@ -97,7 +94,7 @@ static mut NGX_HTTP_UPSTREAM_CUSTOM_COMMANDS: [ngx_command_t; 2] = [
         offset: 0,
         post: std::ptr::null_mut(),
     },
-    ngx_null_command!(),
+    ngx_command_t::empty(),
 ];
 
 // Generate the `ngx_modules` table with exported modules.

nginx-sys/src/lib.rs

@@ -212,6 +212,25 @@ impl TryFrom<ngx_str_t> for &str {
     }
 }
 
+impl ngx_command_t {
+    /// Creates a new empty [`ngx_command_t`] instance.
+    ///
+    /// This method replaces the `ngx_null_command` C macro. This is typically used to terminate an
+    /// array of configuration directives.
+    ///
+    /// [`ngx_command_t`]: https://nginx.org/en/docs/dev/development_guide.html#config_directives
+    pub const fn empty() -> Self {
+        Self {
+            name: ngx_str_t::empty(),
+            type_: 0,
+            set: None,
+            conf: 0,
+            offset: 0,
+            post: ptr::null_mut(),
+        }
+    }
+}
+
 impl ngx_module_t {
     /// Create a new `ngx_module_t` instance with default values.
     pub const fn default() -> Self {

src/core/mod.rs

@@ -7,22 +7,3 @@ pub use buffer::*;
 pub use pool::*;
 pub use status::*;
 pub use string::*;
-
-/// Static empty configuration directive initializer for [`ngx_command_t`].
-///
-/// This is typically used to terminate an array of configuration directives.
-///
-/// [`ngx_command_t`]: https://nginx.org/en/docs/dev/development_guide.html#config_directives
-#[macro_export]
-macro_rules! ngx_null_command {
-    () => {
-        $crate::ffi::ngx_command_t {
-            name: $crate::ffi::ngx_str_t::empty(),
-            type_: 0,
-            set: None,
-            conf: 0,
-            offset: 0,
-            post: ::core::ptr::null_mut(),
-        }
-    };
-}