chore: apply group_imports = "StdExternalCrate"[1]

Unmerge a few excessively complex import statements. The option itself is unstable, so it is commented in rustfmt.toml. [1]: https://rust-lang.github.io/rustfmt/?version=master&search=#group_imports
nginx · Oct 25, 2024 · 969c870 · 969c870
1 parent a8231c3
commit 969c870
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 54 deletions.
diff --git a/examples/async.rs b/examples/async.rs
@@ -1,3 +1,9 @@
+use std::ffi::{c_char, c_void};
+use std::ptr::{addr_of, addr_of_mut};
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+use std::time::Instant;
+
 use ngx::core;
 use ngx::ffi::{
     nginx_version, ngx_array_push, ngx_command_t, ngx_conf_t, ngx_cycle, ngx_event_t, ngx_http_core_module,
@@ -7,11 +13,6 @@ use ngx::ffi::{
 };
 use ngx::http::{self, HTTPModule, MergeConfigError};
 use ngx::{http_request_handler, ngx_log_debug_http, ngx_null_command, ngx_string};
-use std::ffi::{c_char, c_void};
-use std::ptr::{addr_of, addr_of_mut};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-use std::time::Instant;
 use tokio::runtime::Runtime;
 
 struct Module;

diff --git a/examples/awssig.rs b/examples/awssig.rs
@@ -1,3 +1,6 @@
+use std::ffi::{c_char, c_void};
+use std::ptr::addr_of;
+
 use http::HeaderMap;
 use ngx::core;
 use ngx::ffi::{
@@ -8,8 +11,6 @@ use ngx::ffi::{
 };
 use ngx::http::*;
 use ngx::{http_request_handler, ngx_log_debug_http, ngx_null_command, ngx_string};
-use std::ffi::{c_char, c_void};
-use std::ptr::addr_of;
 
 struct Module;
 

diff --git a/examples/curl.rs b/examples/curl.rs
@@ -1,3 +1,6 @@
+use std::ffi::{c_char, c_void};
+use std::ptr::addr_of;
+
 use ngx::core;
 use ngx::ffi::{
     nginx_version, ngx_array_push, ngx_command_t, ngx_conf_t, ngx_http_core_module, ngx_http_handler_pt,
@@ -6,8 +9,6 @@ use ngx::ffi::{
 };
 use ngx::http::{self, HTTPModule, MergeConfigError};
 use ngx::{http_request_handler, ngx_log_debug_http, ngx_null_command, ngx_string};
-use std::ffi::{c_char, c_void};
-use std::ptr::addr_of;
 
 struct Module;
 

diff --git a/examples/httporigdst.rs b/examples/httporigdst.rs
@@ -1,3 +1,6 @@
+use std::ffi::{c_char, c_int, c_void};
+use std::ptr::addr_of;
+
 use ngx::core;
 use ngx::ffi::{
     in_port_t, nginx_version, ngx_conf_t, ngx_connection_local_sockaddr, ngx_http_add_variable, ngx_http_module_t,
@@ -6,8 +9,6 @@ use ngx::ffi::{
 };
 use ngx::http::{self, HTTPModule};
 use ngx::{http_variable_get, ngx_http_null_variable, ngx_log_debug_http, ngx_null_string, ngx_string};
-use std::ffi::{c_char, c_int, c_void};
-use std::ptr::addr_of;
 
 const IPV4_STRLEN: usize = INET_ADDRSTRLEN as usize;
 

diff --git a/examples/upstream.rs b/examples/upstream.rs
@@ -6,30 +6,26 @@
  * The NGINX authors are grateful to @gabihodoroaga for their contributions
  * to the community at large.
  */
-use ngx::{
-    core::{Pool, Status},
-    ffi::{
-        nginx_version, ngx_atoi, ngx_command_t, ngx_conf_log_error, 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_module,
-        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_UPS_CONF,
-        NGX_LOG_EMERG, NGX_RS_HTTP_SRV_CONF_OFFSET, NGX_RS_MODULE_SIGNATURE,
-    },
-    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,
-    },
-    http_upstream_init_peer_pt,
-    log::DebugMask,
-    ngx_log_debug_http, ngx_log_debug_mask, ngx_null_command, ngx_string,
+use std::ffi::{c_char, c_void};
+use std::mem;
+use std::ptr::addr_of;
+use std::slice;
+
+use ngx::core::{Pool, Status};
+use ngx::ffi::{
+    nginx_version, ngx_atoi, ngx_command_t, ngx_conf_log_error, 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_module, 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_UPS_CONF, NGX_LOG_EMERG, NGX_RS_HTTP_SRV_CONF_OFFSET,
+    NGX_RS_MODULE_SIGNATURE,
 };
-use std::{
-    ffi::{c_char, c_void},
-    mem,
-    ptr::addr_of,
-    slice,
+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::log::DebugMask;
+use ngx::{http_upstream_init_peer_pt, ngx_log_debug_http, ngx_log_debug_mask, ngx_null_command, ngx_string};
 
 #[derive(Clone, Copy, Debug)]
 #[repr(C)]

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1 +1,2 @@
+# group_imports = "StdExternalCrate" # unstable
 max_width = 120
diff --git a/src/core/buffer.rs b/src/core/buffer.rs
@@ -1,7 +1,7 @@
-use crate::ffi::*;
-
 use std::slice;
 
+use crate::ffi::*;
+
 /// The `Buffer` trait provides methods for working with an nginx buffer (`ngx_buf_t`).
 pub trait Buffer {
     /// Returns a raw pointer to the underlying `ngx_buf_t` of the buffer.

diff --git a/src/core/pool.rs b/src/core/pool.rs
@@ -1,9 +1,9 @@
-use crate::core::buffer::{Buffer, MemoryBuffer, TemporaryBuffer};
-use crate::ffi::*;
-
 use std::ffi::c_void;
 use std::{mem, ptr};
 
+use crate::core::buffer::{Buffer, MemoryBuffer, TemporaryBuffer};
+use crate::ffi::*;
+
 /// Wrapper struct for an `ngx_pool_t` pointer, providing methods for working with memory pools.
 pub struct Pool(*mut ngx_pool_t);
 

diff --git a/src/core/status.rs b/src/core/status.rs
@@ -1,6 +1,7 @@
-use crate::ffi::*;
 use std::fmt;
 
+use crate::ffi::*;
+
 /// Status
 ///
 /// Rust native wrapper for NGINX status codes.

diff --git a/src/core/string.rs b/src/core/string.rs
@@ -1,9 +1,9 @@
-use crate::ffi::*;
-
 use std::borrow::Cow;
 use std::slice;
 use std::str::{self, Utf8Error};
 
+use crate::ffi::*;
+
 /// Static string initializer for [`ngx_str_t`].
 ///
 /// The resulting byte string is always nul-terminated (just like a C string).

diff --git a/src/http/conf.rs b/src/http/conf.rs
@@ -1,7 +1,7 @@
-use crate::ffi::*;
-
 use std::ffi::c_void;
 
+use crate::ffi::*;
+
 /// # Safety
 ///
 /// The caller has provided a valid `ngx_conf_t` that points to valid memory and is non-null.

diff --git a/src/http/module.rs b/src/http/module.rs
@@ -1,10 +1,10 @@
+use std::ffi::{c_char, c_void};
+use std::ptr;
+
 use crate::core::NGX_CONF_ERROR;
 use crate::core::*;
 use crate::ffi::*;
 
-use std::ffi::{c_char, c_void};
-use std::ptr;
-
 /// MergeConfigError - configuration cannot be merged with levels above.
 #[derive(Debug)]
 pub enum MergeConfigError {

diff --git a/src/http/request.rs b/src/http/request.rs
@@ -1,12 +1,12 @@
+use std::error::Error;
+use std::ffi::c_void;
+use std::fmt;
+use std::str::FromStr;
+
 use crate::core::*;
 use crate::ffi::*;
 use crate::http::status::*;
 use crate::ngx_null_string;
-use std::ffi::c_void;
-use std::fmt;
-
-use std::error::Error;
-use std::str::FromStr;
 
 /// Define a static request handler.
 ///

diff --git a/src/http/status.rs b/src/http/status.rs
@@ -1,8 +1,9 @@
-use crate::core::Status;
-use crate::ffi::*;
 use std::error::Error;
 use std::fmt;
 
+use crate::core::Status;
+use crate::ffi::*;
+
 /// Represents an HTTP status code.
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct HTTPStatus(pub ngx_uint_t);

diff --git a/tests/log_test.rs b/tests/log_test.rs
@@ -97,9 +97,10 @@ impl Nginx {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::env;
 
+    use super::*;
+
     const TEST_NGINX_CONFIG: &str = "tests/nginx.conf";
 
     #[test]
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		# group_imports = "StdExternalCrate" # unstable
		max_width = 120