change http headers callback FnMut<> to Fn<>

BenLocal · Sep 5, 2024 · f4b911a · f4b911a
1 parent a5a0a86
commit f4b911a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/examples/server.rs b/examples/server.rs
@@ -271,7 +271,8 @@ fn start_zlm_background(
 
                     let uri = format!("http://127.0.0.1:{}{}", AXUM_PORT, path_query);
                     let headers = msg.parser.headers();
-
+                    println!("uri: {}", uri);
+                    println!("headers: {:?}", headers);
                     if let Ok(mut req) = hyper::Request::builder()
                         .method(msg.parser.method().as_str())
                         .uri(uri)

diff --git a/src/obj.rs b/src/obj.rs
@@ -311,9 +311,11 @@ impl Parser {
     pub fn headers(&self) -> HashMap<String, String> {
         let headers = std::rc::Rc::new(RefCell::new(HashMap::new()));
 
-        let headers_clone = headers.clone();
-        self.headers_for_each(Box::new(move |key, val| {
-            headers_clone.borrow_mut().insert(key, val);
+        self.headers_for_each(Box::new({
+            let headers_clone = headers.clone();
+            move |key, val| {
+                headers_clone.borrow_mut().insert(key, val);
+            }
         }));
 
         let tmp = headers.as_ref().borrow().to_owned();
@@ -331,14 +333,14 @@ impl Parser {
     }
 }
 
-type ParserHeadersForEachCallbackFn = Box<dyn FnMut(String, String) + 'static>;
+type ParserHeadersForEachCallbackFn = Box<dyn Fn(String, String) + 'static>;
 extern "C" fn parser_headers_for_each(
     user_data: *mut ::std::os::raw::c_void,
     key: *const ::std::os::raw::c_char,
     val: *const ::std::os::raw::c_char,
 ) {
     unsafe {
-        let cb: &mut ParserHeadersForEachCallbackFn = std::mem::transmute(user_data);
+        let cb: &ParserHeadersForEachCallbackFn = std::mem::transmute(user_data);
         let key = const_ptr_to_string!(key);
         let val = const_ptr_to_string!(val);
         cb(key, val);