chore: reformat for edition 2024

bavshin-f5 · bavshin-f5 · commit 7ce22d1f20d6 · 2026-01-27T13:33:15.000-08:00
diff --git a/examples/async.rs b/examples/async.rs
@@ -6,10 +6,10 @@ use std::time::Instant;
 
 use ngx::core;
 use ngx::ffi::{
+    NGX_CONF_TAKE1, NGX_HTTP_LOC_CONF, NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_MODULE, NGX_LOG_EMERG,
     ngx_array_push, ngx_command_t, ngx_conf_t, ngx_connection_t, ngx_event_t, ngx_http_handler_pt,
     ngx_http_module_t, ngx_http_phases_NGX_HTTP_ACCESS_PHASE, ngx_int_t, ngx_module_t,
     ngx_post_event, ngx_posted_events, ngx_posted_next_events, ngx_str_t, ngx_uint_t,
-    NGX_CONF_TAKE1, NGX_HTTP_LOC_CONF, NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_MODULE, NGX_LOG_EMERG,
 };
 use ngx::http::{self, HttpModule, MergeConfigError};
 use ngx::http::{HttpModuleLocationConf, HttpModuleMainConf, NgxHttpCoreModule};
diff --git a/examples/awssig.rs b/examples/awssig.rs
@@ -3,10 +3,10 @@ use std::ffi::{c_char, c_void};
 use http::HeaderMap;
 use ngx::core;
 use ngx::ffi::{
-    ngx_array_push, ngx_command_t, ngx_conf_t, ngx_http_handler_pt, ngx_http_module_t,
-    ngx_http_phases_NGX_HTTP_PRECONTENT_PHASE, ngx_int_t, ngx_module_t, ngx_str_t, ngx_uint_t,
     NGX_CONF_TAKE1, NGX_HTTP_LOC_CONF, NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_MODULE,
-    NGX_HTTP_SRV_CONF, NGX_LOG_EMERG,
+    NGX_HTTP_SRV_CONF, NGX_LOG_EMERG, ngx_array_push, ngx_command_t, ngx_conf_t,
+    ngx_http_handler_pt, ngx_http_module_t, ngx_http_phases_NGX_HTTP_PRECONTENT_PHASE, ngx_int_t,
+    ngx_module_t, ngx_str_t, ngx_uint_t,
 };
 use ngx::http::*;
 use ngx::{http_request_handler, ngx_conf_log_error, ngx_log_debug_http, ngx_string};
@@ -267,11 +267,7 @@ http_request_handler!(awssigv4_header_handler, |request: &mut Request| {
     // get Module Config from request
     let conf = Module::location_conf(request).expect("module conf");
     ngx_log_debug_http!(request, "AWS signature V4 module {}", {
-        if conf.enable {
-            "enabled"
-        } else {
-            "disabled"
-        }
+        if conf.enable { "enabled" } else { "disabled" }
     });
     if !conf.enable {
         return core::Status::NGX_DECLINED;
diff --git a/examples/curl.rs b/examples/curl.rs
@@ -2,9 +2,9 @@ use std::ffi::{c_char, c_void};
 
 use ngx::core;
 use ngx::ffi::{
+    NGX_CONF_TAKE1, NGX_HTTP_LOC_CONF, NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_MODULE, NGX_LOG_EMERG,
     ngx_array_push, ngx_command_t, ngx_conf_t, ngx_http_handler_pt, ngx_http_module_t,
     ngx_http_phases_NGX_HTTP_ACCESS_PHASE, ngx_int_t, ngx_module_t, ngx_str_t, ngx_uint_t,
-    NGX_CONF_TAKE1, NGX_HTTP_LOC_CONF, NGX_HTTP_LOC_CONF_OFFSET, NGX_HTTP_MODULE, NGX_LOG_EMERG,
 };
 use ngx::http::{self, HttpModule, MergeConfigError};
 use ngx::http::{HttpModuleLocationConf, HttpModuleMainConf, NgxHttpCoreModule};
diff --git a/examples/httporigdst.rs b/examples/httporigdst.rs
@@ -1,11 +1,11 @@
 use std::ffi::{c_int, c_void};
-use std::ptr::{addr_of, NonNull};
+use std::ptr::{NonNull, addr_of};
 
 use ngx::core;
 use ngx::ffi::{
-    in_port_t, ngx_conf_t, ngx_connection_local_sockaddr, ngx_http_add_variable, ngx_http_module_t,
-    ngx_http_variable_t, ngx_inet_get_port, ngx_int_t, ngx_module_t, ngx_sock_ntop, ngx_str_t,
-    ngx_variable_value_t, sockaddr, sockaddr_storage, INET_ADDRSTRLEN, NGX_HTTP_MODULE,
+    INET_ADDRSTRLEN, NGX_HTTP_MODULE, in_port_t, ngx_conf_t, ngx_connection_local_sockaddr,
+    ngx_http_add_variable, ngx_http_module_t, ngx_http_variable_t, ngx_inet_get_port, ngx_int_t,
+    ngx_module_t, ngx_sock_ntop, ngx_str_t, ngx_variable_value_t, sockaddr, sockaddr_storage,
 };
 use ngx::http::{self, HttpModule};
 use ngx::{http_variable_get, ngx_log_debug_http, ngx_string};
diff --git a/examples/shared_dict.rs b/examples/shared_dict.rs
@@ -1,17 +1,16 @@
 #![no_std]
 use ::core::ffi::{c_char, c_void};
 use ::core::{mem, ptr};
-
 use nginx_sys::{
+    NGX_CONF_TAKE2, NGX_HTTP_DELETE, NGX_HTTP_MAIN_CONF, NGX_HTTP_MAIN_CONF_OFFSET,
+    NGX_HTTP_MODULE, NGX_HTTP_VAR_CHANGEABLE, NGX_HTTP_VAR_NOCACHEABLE, NGX_LOG_EMERG,
     ngx_command_t, ngx_conf_t, ngx_http_add_variable, ngx_http_compile_complex_value_t,
     ngx_http_complex_value, ngx_http_complex_value_t, ngx_http_module_t, ngx_http_request_t,
     ngx_http_variable_t, ngx_http_variable_value_t, ngx_int_t, ngx_module_t, ngx_parse_size,
-    ngx_shared_memory_add, ngx_shm_zone_t, ngx_str_t, ngx_uint_t, NGX_CONF_TAKE2, NGX_HTTP_DELETE,
-    NGX_HTTP_MAIN_CONF, NGX_HTTP_MAIN_CONF_OFFSET, NGX_HTTP_MODULE, NGX_HTTP_VAR_CHANGEABLE,
-    NGX_HTTP_VAR_NOCACHEABLE, NGX_LOG_EMERG,
+    ngx_shared_memory_add, ngx_shm_zone_t, ngx_str_t, ngx_uint_t,
 };
 use ngx::collections::RbTreeMap;
-use ngx::core::{NgxStr, NgxString, Pool, SlabPool, Status, NGX_CONF_ERROR, NGX_CONF_OK};
+use ngx::core::{NGX_CONF_ERROR, NGX_CONF_OK, NgxStr, NgxString, Pool, SlabPool, Status};
 use ngx::http::{HttpModule, HttpModuleMainConf};
 use ngx::{ngx_conf_log_error, ngx_log_debug, ngx_string};
 
diff --git a/examples/upstream.rs b/examples/upstream.rs
@@ -11,12 +11,12 @@ use std::mem;
 
 use ngx::core::{Pool, Status};
 use ngx::ffi::{
-    ngx_atoi, ngx_command_t, ngx_conf_t, ngx_connection_t, ngx_event_free_peer_pt,
-    ngx_event_get_peer_pt, ngx_http_module_t, ngx_http_upstream_init_peer_pt,
-    ngx_http_upstream_init_pt, ngx_http_upstream_init_round_robin, ngx_http_upstream_srv_conf_t,
-    ngx_http_upstream_t, ngx_int_t, ngx_module_t, ngx_peer_connection_t, ngx_str_t, ngx_uint_t,
     NGX_CONF_NOARGS, NGX_CONF_TAKE1, NGX_CONF_UNSET, NGX_ERROR, NGX_HTTP_MODULE,
-    NGX_HTTP_SRV_CONF_OFFSET, NGX_HTTP_UPS_CONF, NGX_LOG_EMERG,
+    NGX_HTTP_SRV_CONF_OFFSET, NGX_HTTP_UPS_CONF, NGX_LOG_EMERG, ngx_atoi, ngx_command_t,
+    ngx_conf_t, ngx_connection_t, ngx_event_free_peer_pt, ngx_event_get_peer_pt, ngx_http_module_t,
+    ngx_http_upstream_init_peer_pt, ngx_http_upstream_init_pt, ngx_http_upstream_init_round_robin,
+    ngx_http_upstream_srv_conf_t, ngx_http_upstream_t, ngx_int_t, ngx_module_t,
+    ngx_peer_connection_t, ngx_str_t, ngx_uint_t,
 };
 use ngx::http::{HttpModule, Merge, MergeConfigError, Request};
 use ngx::http::{HttpModuleServerConf, NgxHttpUpstreamModule};
diff --git a/nginx-src/src/download.rs b/nginx-src/src/download.rs
@@ -120,8 +120,8 @@ static CACHE_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
     let base_dir = env::var("OUT_DIR")
         .map(PathBuf::from)
         .unwrap_or_else(|_| env::current_dir().expect("Failed to get current directory"));
-    // Choose `.cache` relative to the OUT_DIR of the caller (nginx-sys) as the default cache directory
-    // Environment variable `CACHE_DIR` overrides this
+    // Choose `.cache` relative to the OUT_DIR of the caller (nginx-sys) as the default cache
+    // directory Environment variable `CACHE_DIR` overrides this
     // Recommendation: set env "CACHE_DIR = { value = ".cache", relative = true }" in
     // `.cargo/config.toml` in your project
     let cache_dir = env::var("CACHE_DIR")
diff --git a/nginx-sys/build/main.rs b/nginx-sys/build/main.rs
@@ -2,7 +2,7 @@ extern crate bindgen;
 
 use std::env;
 use std::error::Error as StdError;
-use std::fs::{read_to_string, File};
+use std::fs::{File, read_to_string};
 use std::io::Write;
 use std::path::{Path, PathBuf};
 
diff --git a/nginx-sys/src/event.rs b/nginx-sys/src/event.rs
@@ -1,8 +1,8 @@
 use core::ptr;
 
 use crate::{
-    ngx_current_msec, ngx_event_t, ngx_event_timer_rbtree, ngx_msec_t, ngx_queue_insert_before,
-    ngx_queue_remove, ngx_queue_t, ngx_rbtree_delete, ngx_rbtree_insert, NGX_TIMER_LAZY_DELAY,
+    NGX_TIMER_LAZY_DELAY, ngx_current_msec, ngx_event_t, ngx_event_timer_rbtree, ngx_msec_t,
+    ngx_queue_insert_before, ngx_queue_remove, ngx_queue_t, ngx_rbtree_delete, ngx_rbtree_insert,
 };
 
 /// Sets a timeout for an event.
diff --git a/nginx-sys/src/rbtree.rs b/nginx-sys/src/rbtree.rs
@@ -23,7 +23,6 @@ macro_rules! ngx_rbtree_data {
 ///
 /// All of the pointers passed must be valid.
 /// `sentinel` is expected to be valid for the whole lifetime of the `tree`.
-///
 pub unsafe fn ngx_rbtree_init(
     tree: *mut ngx_rbtree_t,
     sentinel: *mut ngx_rbtree_node_t,
diff --git a/src/allocator.rs b/src/allocator.rs
@@ -10,9 +10,7 @@
 use ::core::alloc::Layout;
 use ::core::mem;
 use ::core::ptr::{self, NonNull};
-
 pub use allocator_api2::alloc::{AllocError, Allocator};
-
 #[cfg(feature = "alloc")]
 pub use allocator_api2::{alloc::Global, boxed::Box, unsize_box};
 
diff --git a/src/async_/mod.rs b/src/async_/mod.rs
@@ -1,6 +1,6 @@
 //! Async runtime and set of utilities on top of the NGINX event loop.
-pub use self::sleep::{sleep, Sleep};
-pub use self::spawn::{spawn, Task};
+pub use self::sleep::{Sleep, sleep};
+pub use self::spawn::{Task, spawn};
 
 pub mod resolver;
 
diff --git a/src/async_/resolver.rs b/src/async_/resolver.rs
@@ -15,6 +15,11 @@ use core::pin::Pin;
 use core::ptr::NonNull;
 use core::task::{Context, Poll, Waker};
 
+use nginx_sys::{
+    NGX_RESOLVE_FORMERR, NGX_RESOLVE_NOTIMP, NGX_RESOLVE_NXDOMAIN, NGX_RESOLVE_REFUSED,
+    NGX_RESOLVE_SERVFAIL, NGX_RESOLVE_TIMEDOUT,
+};
+
 use crate::{
     allocator::Box,
     collections::Vec,
@@ -24,10 +29,6 @@ use crate::{
         ngx_resolver_t, ngx_str_t,
     },
 };
-use nginx_sys::{
-    NGX_RESOLVE_FORMERR, NGX_RESOLVE_NOTIMP, NGX_RESOLVE_NXDOMAIN, NGX_RESOLVE_REFUSED,
-    NGX_RESOLVE_SERVFAIL, NGX_RESOLVE_TIMEDOUT,
-};
 
 /// Error type for all uses of `Resolver`.
 #[derive(Debug)]
diff --git a/src/async_/spawn.rs b/src/async_/spawn.rs
@@ -80,8 +80,7 @@ impl SchedulerInner {
             // This handler always receives a non-null pointer to an event embedded into a
             // UnsafeCell<SchedulerInner> instance. We modify the contents of the `UnsafeCell`,
             // but we ensured that:
-            //  - we access the cell correctly, as documented in
-            //    https://doc.rust-lang.org/stable/std/cell/struct.UnsafeCell.html#memory-layout
+            //  - we access the cell correctly, as documented in https://doc.rust-lang.org/stable/std/cell/struct.UnsafeCell.html#memory-layout
             //  - the access is unique due to being single-threaded
             //  - the reference is dropped before we start processing queued runnables.
             let cell: NonNull<UnsafeCell<Self>> =
diff --git a/src/collections/mod.rs b/src/collections/mod.rs
@@ -9,7 +9,6 @@ pub use allocator_api2::{
     vec, // reexport both the module and the macro
     vec::Vec,
 };
-
 pub use queue::Queue;
 pub use rbtree::RbTreeMap;
 
diff --git a/src/core/pool.rs b/src/core/pool.rs
@@ -4,14 +4,15 @@ use core::mem;
 use core::ptr::{self, NonNull};
 
 use nginx_sys::{
-    ngx_buf_t, ngx_create_temp_buf, ngx_palloc, ngx_pcalloc, ngx_pfree, ngx_pmemalign, ngx_pnalloc,
-    ngx_pool_cleanup_add, ngx_pool_t, NGX_ALIGNMENT,
+    NGX_ALIGNMENT, ngx_buf_t, ngx_create_temp_buf, ngx_palloc, ngx_pcalloc, ngx_pfree,
+    ngx_pmemalign, ngx_pnalloc, ngx_pool_cleanup_add, ngx_pool_t,
 };
 
-use crate::allocator::{dangling_for_layout, AllocError, Allocator};
+use crate::allocator::{AllocError, Allocator, dangling_for_layout};
 use crate::core::buffer::{Buffer, MemoryBuffer, TemporaryBuffer};
 
-/// Non-owning wrapper for an [`ngx_pool_t`] pointer, providing methods for working with memory pools.
+/// Non-owning wrapper for an [`ngx_pool_t`] pointer, providing methods for working with memory
+/// pools.
 ///
 /// See <https://nginx.org/en/docs/dev/development_guide.html#pool>
 #[derive(Clone, Debug)]
diff --git a/src/core/slab.rs b/src/core/slab.rs
@@ -10,7 +10,7 @@ use nginx_sys::{
     ngx_slab_pool_t,
 };
 
-use crate::allocator::{dangling_for_layout, AllocError, Allocator};
+use crate::allocator::{AllocError, Allocator, dangling_for_layout};
 
 /// Non-owning wrapper for an [`ngx_slab_pool_t`] pointer, providing methods for working with
 /// shared memory slab pools.
diff --git a/src/core/string.rs b/src/core/string.rs
@@ -1,10 +1,9 @@
+#[cfg(feature = "alloc")]
+use alloc::{borrow::Cow, string::String};
 use core::cmp;
 use core::fmt;
 use core::str::{self, Utf8Error};
 
-#[cfg(feature = "alloc")]
-use alloc::{borrow::Cow, string::String};
-
 use crate::ffi::{ngx_str_t, u_char};
 
 /// Static string initializer for [`ngx_str_t`].
@@ -207,7 +206,6 @@ mod _alloc {
     use core::ptr;
 
     use super::*;
-
     use crate::allocator::{self, Allocator};
     use crate::collections::{TryReserveError, Vec};
 
diff --git a/src/http/request.rs b/src/http/request.rs
@@ -332,8 +332,8 @@ impl Request {
             sub_ptr as *const ngx_http_post_subrequest_t as *mut ngx_http_post_subrequest_t;
         unsafe {
             (*post_subreq).handler = Some(post_callback);
-            (*post_subreq).data = self.get_module_ctx_ptr(module); // WARN: safety! ensure that ctx
-                                                                   // is already set
+            // WARN: safety! ensure that ctx is already set
+            (*post_subreq).data = self.get_module_ctx_ptr(module);
         }
         // -------------
 
@@ -385,8 +385,8 @@ impl crate::http::HttpModuleConfExt for Request {
     #[inline]
     unsafe fn http_main_conf_unchecked<T>(&self, module: &ngx_module_t) -> Option<NonNull<T>> {
         unsafe {
-            // SAFETY: main_conf[module.ctx_index] is either NULL or allocated with ngx_p(c)alloc and
-            // explicitly initialized by the module
+            // SAFETY: main_conf[module.ctx_index] is either NULL or allocated with ngx_p(c)alloc
+            // and explicitly initialized by the module
             NonNull::new((*self.0.main_conf.add(module.ctx_index)).cast())
         }
     }
diff --git a/src/log.rs b/src/log.rs
@@ -3,7 +3,7 @@ use core::fmt::{self, Write};
 use core::mem::MaybeUninit;
 use core::ptr::NonNull;
 
-use crate::ffi::{self, ngx_err_t, ngx_log_t, ngx_uint_t, NGX_MAX_ERROR_STR};
+use crate::ffi::{self, NGX_MAX_ERROR_STR, ngx_err_t, ngx_log_t, ngx_uint_t};
 
 /// This constant is set to `true` if NGINX is compiled with debug logging (`--with-debug`).
 pub const DEBUG: bool = cfg!(ngx_feature = "debug");
diff --git a/src/sync.rs b/src/sync.rs
@@ -32,7 +32,6 @@ const NGX_RWLOCK_WLOCK: usize = usize::MAX;
 type NgxAtomic = atomic::AtomicUsize;
 
 /// Raw lock type.
-///
 pub struct RawSpinlock(NgxAtomic);
 
 /// Reader-writer lock over an atomic variable, based on the nginx rwlock implementation.
