feat: Modified truncate_header_values_on_key to truncate_header_value_on_position

Author: darkseid-is

Cargo.lock

@@ -201,15 +201,32 @@ impl HeaderMap {
         result
     }
 
-    pub fn truncate_header_values_on_key<T>(&mut self, key: &str, remove: T)
+    // ----- remove
+    pub fn remove_header_on_key_all(&mut self, key: &str) -> bool {
+        let mut result = false;
+        if let Some(positions) = self.header_key_position_all(key) {
+            result = true;
+            self.remove_header_all_positions(positions);
+        }
+        result
+    }
+
+    pub fn remove_header_on_key(&mut self, key: &str) -> bool {
+        let mut result = false;
+        if let Some(position) = self.header_key_position(key) {
+            result = true;
+            self.headers.remove(position);
+        }
+        result
+    }
+
+    // truncate
+    pub fn truncate_header_value_on_position<T>(&mut self, pos: usize, truncate_at: T)
     where
         T: AsRef<str>,
     {
-        let Some(pos) = self.header_key_position(key) else {
-            return;
-        };
         let value = self.headers[pos].value_as_str();
-        let Some(mut index) = value.find(remove.as_ref()) else {
+        let Some(mut index) = value.find(truncate_at.as_ref()) else {
             return;
         };
 
@@ -227,25 +244,6 @@ impl HeaderMap {
             .extend_from_slice(CRLF.as_bytes());
     }
 
-    // ----- remove
-    pub fn remove_header_on_key_all(&mut self, key: &str) -> bool {
-        let mut result = false;
-        if let Some(positions) = self.header_key_position_all(key) {
-            result = true;
-            self.remove_header_all_positions(positions);
-        }
-        result
-    }
-
-    pub fn remove_header_on_key(&mut self, key: &str) -> bool {
-        let mut result = false;
-        if let Some(position) = self.header_key_position(key) {
-            result = true;
-            self.headers.remove(position);
-        }
-        result
-    }
-
     // ---------- value
     // ------ update
     pub fn update_header_value_on_position(&mut self, pos: usize, value: &str) {
@@ -271,7 +269,7 @@ impl HeaderMap {
 #[cfg(test)]
 mod tests {
 
-    use crate::{body_headers::content_encoding::ContentEncoding, const_headers::CONTENT_ENCODING};
+    use crate::body_headers::content_encoding::ContentEncoding;
 
     use super::*;
 
@@ -610,12 +608,12 @@ mod tests {
         let data = "Header: a,  b,c\r\n\r\n";
         let buf = BytesMut::from(data);
         let mut header_map = HeaderMap::from(buf);
-        header_map.truncate_header_values_on_key("Header", "c");
+        header_map.truncate_header_value_on_position(0, "c");
         let result = header_map.into_bytes();
         assert_eq!(result, "Header: a,  b\r\n\r\n");
 
         let mut header_map = HeaderMap::from(result);
-        header_map.truncate_header_values_on_key("Header", "b");
+        header_map.truncate_header_value_on_position(0, "b");
         let result = header_map.into_bytes();
         assert_eq!(result, "Header: a\r\n\r\n");
     }
@@ -624,7 +622,7 @@ mod tests {
     fn test_header_map_truncate_header_values_middle() {
         let input = "Content-Encoding: gzip, deflate, br\r\n\r\n";
         let mut header_map = HeaderMap::from(BytesMut::from(input));
-        header_map.truncate_header_values_on_key(CONTENT_ENCODING, ContentEncoding::Deflate);
+        header_map.truncate_header_value_on_position(0, ContentEncoding::Deflate);
         let result = header_map.into_bytes();
         assert_eq!(result, "Content-Encoding: gzip\r\n\r\n");
     }
@@ -633,7 +631,7 @@ mod tests {
     fn test_header_map_truncate_header_values_all() {
         let input = "Content-Encoding: gzip, deflate, br\r\n\r\n";
         let mut header_map = HeaderMap::from(BytesMut::from(input));
-        header_map.truncate_header_values_on_key(CONTENT_ENCODING, ContentEncoding::Gzip);
+        header_map.truncate_header_value_on_position(0, ContentEncoding::Gzip);
         let result = header_map.into_bytes();
         assert_eq!(result, "Content-Encoding: \r\n\r\n");
     }

header-plz/src/message_head/header_map/mod.rs

@@ -91,18 +91,19 @@ mod tests {
     use std::error::Error;
 
     #[test]
-    fn test_infoline_request_basic() {
+    fn test_infoline_request_basic() -> Result<(), Box<dyn Error>> {
         let req = "GET /echo HTTP/1.1\r\n";
         let buf = BytesMut::from(req);
         let verify = buf[0..20].to_owned();
         let verify_ptr = buf[0..20].as_ptr_range();
-        let request = Request::try_build_infoline(buf).unwrap();
+        let request = Request::try_build_infoline(buf)?;
         assert_eq!(request.method(), b"GET");
         assert_eq!(request.uri_as_string(), "/echo");
         assert_eq!(request.version, " HTTP/1.1\r\n");
         let toverify = request.into_bytes();
         assert_eq!(verify_ptr, toverify.as_ptr_range());
         assert_eq!(toverify, verify);
+        Ok(())
     }
 
     #[test]
@@ -214,7 +215,6 @@ mod tests {
     }
 
 
-
     #[test]
     fn test_return_first_line_query_params_end_ampersand() {
         let req = "GET /users?param=value& HTTP/1.1\r\n\r\n";