DRY

Signed-off-by: Alex Leong <[email protected]>
linkerd · Jul 19, 2023 · 6f6be6e · 6f6be6e
1 parent 22b6052
commit 6f6be6e
Showing 1 changed file with 13 additions and 26 deletions.
diff --git a/linkerd/http-route/src/http/filter/modify_header.rs b/linkerd/http-route/src/http/filter/modify_header.rs
@@ -46,19 +46,6 @@ pub mod proto {
         type Error = InvalidModifyHeader;
 
         fn try_from(rhm: api::RequestHeaderModifier) -> Result<Self, Self::Error> {
-            fn to_pairs(
-                hs: Option<http_types::Headers>,
-            ) -> Result<Vec<(HeaderName, HeaderValue)>, InvalidModifyHeader> {
-                hs.into_iter()
-                    .flat_map(|a| a.headers.into_iter())
-                    .map(|h| {
-                        let name = h.name.parse::<HeaderName>()?;
-                        let value = HeaderValue::from_bytes(&h.value)?;
-                        Ok((name, value))
-                    })
-                    .collect()
-            }
-
             let add = to_pairs(rhm.add)?;
             let set = to_pairs(rhm.set)?;
             let remove = rhm
@@ -76,19 +63,6 @@ pub mod proto {
         type Error = InvalidModifyHeader;
 
         fn try_from(rhm: api::ResponseHeaderModifier) -> Result<Self, Self::Error> {
-            fn to_pairs(
-                hs: Option<http_types::Headers>,
-            ) -> Result<Vec<(HeaderName, HeaderValue)>, InvalidModifyHeader> {
-                hs.into_iter()
-                    .flat_map(|a| a.headers.into_iter())
-                    .map(|h| {
-                        let name = h.name.parse::<HeaderName>()?;
-                        let value = HeaderValue::from_bytes(&h.value)?;
-                        Ok((name, value))
-                    })
-                    .collect()
-            }
-
             let add = to_pairs(rhm.add)?;
             let set = to_pairs(rhm.set)?;
             let remove = rhm
@@ -99,4 +73,17 @@ pub mod proto {
             Ok(ModifyHeader { add, set, remove })
         }
     }
+
+    fn to_pairs(
+        hs: Option<http_types::Headers>,
+    ) -> Result<Vec<(HeaderName, HeaderValue)>, InvalidModifyHeader> {
+        hs.into_iter()
+            .flat_map(|a| a.headers.into_iter())
+            .map(|h| {
+                let name = h.name.parse::<HeaderName>()?;
+                let value = HeaderValue::from_bytes(&h.value)?;
+                Ok((name, value))
+            })
+            .collect()
+    }
 }