refactor: changes to support edition = "2024"

this change set is created automatically by `cargo fix --edition --all`,
then `cargo fmt --all`

Author: pchickey

examples/async.rs

@@ -24,19 +24,21 @@ impl http::HttpModule for Module {
     }
 
     unsafe extern "C" fn postconfiguration(cf: *mut ngx_conf_t) -> ngx_int_t {
-        // SAFETY: this function is called with non-NULL cf always
-        let cf = &mut *cf;
-        let cmcf = NgxHttpCoreModule::main_conf_mut(cf).expect("http core main conf");
-
-        let h = ngx_array_push(
-            &mut cmcf.phases[ngx_http_phases_NGX_HTTP_ACCESS_PHASE as usize].handlers,
-        ) as *mut ngx_http_handler_pt;
-        if h.is_null() {
-            return core::Status::NGX_ERROR.into();
+        unsafe {
+            // SAFETY: this function is called with non-NULL cf always
+            let cf = &mut *cf;
+            let cmcf = NgxHttpCoreModule::main_conf_mut(cf).expect("http core main conf");
+
+            let h = ngx_array_push(
+                &mut cmcf.phases[ngx_http_phases_NGX_HTTP_ACCESS_PHASE as usize].handlers,
+            ) as *mut ngx_http_handler_pt;
+            if h.is_null() {
+                return core::Status::NGX_ERROR.into();
+            }
+            // set an Access phase handler
+            *h = Some(async_access_handler);
+            core::Status::NGX_OK.into()
         }
-        // set an Access phase handler
-        *h = Some(async_access_handler);
-        core::Status::NGX_OK.into()
     }
 }
 

examples/awssig.rs

@@ -19,19 +19,21 @@ impl HttpModule for Module {
     }
 
     unsafe extern "C" fn postconfiguration(cf: *mut ngx_conf_t) -> ngx_int_t {
-        // SAFETY: this function is called with non-NULL cf always
-        let cf = &mut *cf;
-        let cmcf = NgxHttpCoreModule::main_conf_mut(cf).expect("http core main conf");
-
-        let h = ngx_array_push(
-            &mut cmcf.phases[ngx_http_phases_NGX_HTTP_PRECONTENT_PHASE as usize].handlers,
-        ) as *mut ngx_http_handler_pt;
-        if h.is_null() {
-            return core::Status::NGX_ERROR.into();
+        unsafe {
+            // SAFETY: this function is called with non-NULL cf always
+            let cf = &mut *cf;
+            let cmcf = NgxHttpCoreModule::main_conf_mut(cf).expect("http core main conf");
+
+            let h = ngx_array_push(
+                &mut cmcf.phases[ngx_http_phases_NGX_HTTP_PRECONTENT_PHASE as usize].handlers,
+            ) as *mut ngx_http_handler_pt;
+            if h.is_null() {
+                return core::Status::NGX_ERROR.into();
+            }
+            // set an phase handler
+            *h = Some(awssigv4_header_handler);
+            core::Status::NGX_OK.into()
         }
-        // set an phase handler
-        *h = Some(awssigv4_header_handler);
-        core::Status::NGX_OK.into()
     }
 }
 
@@ -298,10 +300,13 @@ http_request_handler!(awssigv4_header_handler, |request: &mut Request| {
         for (name, value) in request.headers_in_iterator() {
             if let Ok(name) = name.to_str() {
                 if name.to_lowercase() == "host" {
-                    if let Ok(value) = http::HeaderValue::from_bytes(value.as_bytes()) {
-                        headers.insert(http::header::HOST, value);
-                    } else {
-                        return core::Status::NGX_DECLINED;
+                    match http::HeaderValue::from_bytes(value.as_bytes()) {
+                        Ok(value) => {
+                            headers.insert(http::header::HOST, value);
+                        }
+                        _ => {
+                            return core::Status::NGX_DECLINED;
+                        }
                     }
                 }
             } else {

examples/curl.rs

@@ -18,19 +18,21 @@ impl http::HttpModule for Module {
     }
 
     unsafe extern "C" fn postconfiguration(cf: *mut ngx_conf_t) -> ngx_int_t {
-        // SAFETY: this function is called with non-NULL cf always
-        let cf = &mut *cf;
-        let cmcf = NgxHttpCoreModule::main_conf_mut(cf).expect("http core main conf");
-
-        let h = ngx_array_push(
-            &mut cmcf.phases[ngx_http_phases_NGX_HTTP_ACCESS_PHASE as usize].handlers,
-        ) as *mut ngx_http_handler_pt;
-        if h.is_null() {
-            return core::Status::NGX_ERROR.into();
+        unsafe {
+            // SAFETY: this function is called with non-NULL cf always
+            let cf = &mut *cf;
+            let cmcf = NgxHttpCoreModule::main_conf_mut(cf).expect("http core main conf");
+
+            let h = ngx_array_push(
+                &mut cmcf.phases[ngx_http_phases_NGX_HTTP_ACCESS_PHASE as usize].handlers,
+            ) as *mut ngx_http_handler_pt;
+            if h.is_null() {
+                return core::Status::NGX_ERROR.into();
+            }
+            // set an Access phase handler
+            *h = Some(curl_access_handler);
+            core::Status::NGX_OK.into()
         }
-        // set an Access phase handler
-        *h = Some(curl_access_handler);
-        core::Status::NGX_OK.into()
     }
 }
 

examples/shared_dict.rs

@@ -23,16 +23,18 @@ impl HttpModule for HttpSharedDictModule {
     }
 
     unsafe extern "C" fn preconfiguration(cf: *mut ngx_conf_t) -> ngx_int_t {
-        for mut v in NGX_HTTP_SHARED_DICT_VARS {
-            let var = ngx_http_add_variable(cf, &mut v.name, v.flags);
-            if var.is_null() {
-                return Status::NGX_ERROR.into();
+        unsafe {
+            for mut v in NGX_HTTP_SHARED_DICT_VARS {
+                let var = ngx_http_add_variable(cf, &mut v.name, v.flags);
+                if var.is_null() {
+                    return Status::NGX_ERROR.into();
+                }
+                (*var).get_handler = v.get_handler;
+                (*var).set_handler = v.set_handler;
+                (*var).data = v.data;
             }
-            (*var).get_handler = v.get_handler;
-            (*var).set_handler = v.set_handler;
-            (*var).data = v.data;
+            Status::NGX_OK.into()
         }
-        Status::NGX_OK.into()
     }
 }