Use more constants for headers

algesten · algesten · commit 0d274df41b01 · 2025-01-28T21:59:39.000+01:00
diff --git a/src/util.rs b/src/util.rs
@@ -335,7 +335,7 @@ impl UriExt for Uri {
 }
 
 pub(crate) trait HeaderMapExt {
-    fn get_str(&self, k: &str) -> Option<&str>;
+    fn get_str(&self, k: HeaderName) -> Option<&str>;
     fn is_chunked(&self) -> bool;
     fn content_length(&self) -> Option<u64>;
     fn has_accept_encoding(&self) -> bool;
@@ -349,39 +349,39 @@ pub(crate) trait HeaderMapExt {
 }
 
 impl HeaderMapExt for HeaderMap {
-    fn get_str(&self, k: &str) -> Option<&str> {
+    fn get_str(&self, k: HeaderName) -> Option<&str> {
         self.get(k).and_then(|v| v.to_str().ok())
     }
 
     fn is_chunked(&self) -> bool {
-        self.get_str("transfer-encoding")
+        self.get_str(TRANSFER_ENCODING)
             .map(|v| v.contains("chunked"))
             .unwrap_or(false)
     }
 
     fn content_length(&self) -> Option<u64> {
-        let h = self.get_str("content-length")?;
+        let h = self.get_str(CONTENT_LENGTH)?;
         let len: u64 = h.parse().ok()?;
         Some(len)
     }
 
     fn has_accept_encoding(&self) -> bool {
-        self.contains_key("accept-encoding")
+        self.contains_key(ACCEPT_ENCODING)
     }
 
     fn has_user_agent(&self) -> bool {
-        self.contains_key("user-agent")
+        self.contains_key(USER_AGENT)
     }
 
     fn has_accept(&self) -> bool {
-        self.contains_key("accept")
+        self.contains_key(ACCEPT)
     }
 
     fn has_content_type(&self) -> bool {
-        self.contains_key("content-type")
+        self.contains_key(CONTENT_TYPE)
     }
 
     fn has_location(&self) -> bool {
-        self.contains_key("location")
+        self.contains_key(LOCATION)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ impl UriExt for Uri {`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`pub(crate) trait HeaderMapExt {`
`338`		`- fn get_str(&self, k: &str) -> Option<&str>;`
	`338`	`+ fn get_str(&self, k: HeaderName) -> Option<&str>;`
`339`	`339`	`fn is_chunked(&self) -> bool;`
`340`	`340`	`fn content_length(&self) -> Option<u64>;`
`341`	`341`	`fn has_accept_encoding(&self) -> bool;`
`@@ -349,39 +349,39 @@ pub(crate) trait HeaderMapExt {`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`impl HeaderMapExt for HeaderMap {`
`352`		`- fn get_str(&self, k: &str) -> Option<&str> {`
	`352`	`+ fn get_str(&self, k: HeaderName) -> Option<&str> {`
`353`	`353`	`self.get(k).and_then(\|v\| v.to_str().ok())`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`fn is_chunked(&self) -> bool {`
`357`		`- self.get_str("transfer-encoding")`
	`357`	`+ self.get_str(TRANSFER_ENCODING)`
`358`	`358`	`.map(\|v\| v.contains("chunked"))`
`359`	`359`	`.unwrap_or(false)`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`fn content_length(&self) -> Option<u64> {`
`363`		`- let h = self.get_str("content-length")?;`
	`363`	`+ let h = self.get_str(CONTENT_LENGTH)?;`
`364`	`364`	`let len: u64 = h.parse().ok()?;`
`365`	`365`	`Some(len)`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`fn has_accept_encoding(&self) -> bool {`
`369`		`- self.contains_key("accept-encoding")`
	`369`	`+ self.contains_key(ACCEPT_ENCODING)`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`fn has_user_agent(&self) -> bool {`
`373`		`- self.contains_key("user-agent")`
	`373`	`+ self.contains_key(USER_AGENT)`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`fn has_accept(&self) -> bool {`
`377`		`- self.contains_key("accept")`
	`377`	`+ self.contains_key(ACCEPT)`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`fn has_content_type(&self) -> bool {`
`381`		`- self.contains_key("content-type")`
	`381`	`+ self.contains_key(CONTENT_TYPE)`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`fn has_location(&self) -> bool {`
`385`		`- self.contains_key("location")`
	`385`	`+ self.contains_key(LOCATION)`
`386`	`386`	`}`
`387`	`387`	`}`