Clippy fixes

kyleect · kyleect · commit 64e66759c1f7 · 2025-10-04T11:27:39.000-05:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -6,10 +6,10 @@ pub mod span;
 
 /// Parse a partial HTTP request message string in to [PartialHttpRequest]
 pub fn parse_partial_request(input: &str) -> Result<PartialHttpRequest<'_>, error::Error> {
-    PartialHttpRequest::from_str(input)
+    PartialHttpRequest::parse(input)
 }
 
 /// Parse a spec compliant HTTP request message string in to [ParsedHttpRequest]
 pub fn parse_request(input: &str) -> Result<ParsedHttpRequest<'_>, error::Error> {
-    ParsedHttpRequest::from_str(input)
+    ParsedHttpRequest::parse(input)
 }
diff --git a/src/main.rs b/src/main.rs
@@ -13,7 +13,7 @@ fn main() {
 
     match fs::read_to_string(&args[1]) {
         Ok(contents) => {
-            let partial = PartialHttpRequest::from_str(&contents);
+            let partial = PartialHttpRequest::parse(&contents);
 
             println!("{partial:#?}");
         }
diff --git a/src/models/headers.rs b/src/models/headers.rs
@@ -64,7 +64,7 @@ mod tests {
     #[test]
     fn test_http_header_display() {
         let header = HttpHeader::new("Content-Type", "application/json");
-        assert_eq!(format!("{}", header), "Content-Type: application/json");
+        assert_eq!(format!("{header}"), "Content-Type: application/json");
     }
 
     #[test]
diff --git a/src/models/parsed_request.rs b/src/models/parsed_request.rs
@@ -26,7 +26,7 @@ impl<'http_message> fmt::Display for ParsedHttpRequest<'http_message> {
 }
 
 impl<'http_message> ParsedHttpRequest<'http_message> {
-    pub fn from_str(message: &'http_message str) -> Result<Self, Error> {
+    pub fn parse(message: &'http_message str) -> Result<Self, Error> {
         parse_request(message, parse_first_line)
     }
 
@@ -105,7 +105,7 @@ impl<'http_message> ParsedHttpRequest<'http_message> {
 
     /// Get the original HTTP request message text
     pub fn message(&self) -> &str {
-        &self.message
+        self.message
     }
 
     /// Get the text span of the uri, if defined
@@ -176,12 +176,12 @@ impl<'http_message> ParsedHttpRequest<'http_message> {
 
 fn assert_text_span(text: &str, span: &Range<usize>) {
     text.get(span.clone())
-        .expect(&format!("span {:?} is outside of text bounds", span));
+        .unwrap_or_else(|| panic!("span {span:?} is outside of text bounds"));
 }
 
 impl<'http_message> Default for ParsedHttpRequest<'http_message> {
     fn default() -> Self {
-        Self::from_str("GET https://example.com HTTP/1.1\n\n").unwrap()
+        Self::parse("GET https://example.com HTTP/1.1\n\n").unwrap()
     }
 }
 
@@ -249,7 +249,7 @@ fn parse_first_line(first_line: &str) -> FirstLineParts {
         parts.push(last_end..first_line.len());
     }
 
-    let method_span = parts.get(0).cloned();
+    let method_span = parts.first().cloned();
     let uri_span = parts.get(1).cloned();
     let http_version_span = parts.get(2).cloned();
 
diff --git a/src/models/partial_request.rs b/src/models/partial_request.rs
@@ -26,7 +26,7 @@ impl<'http_message> fmt::Display for PartialHttpRequest<'http_message> {
 }
 
 impl<'http_message> PartialHttpRequest<'http_message> {
-    pub fn from_str(message: &'http_message str) -> Result<Self, Error> {
+    pub fn parse(message: &'http_message str) -> Result<Self, Error> {
         parse_request(message, parse_first_line)
     }
 
@@ -97,7 +97,7 @@ impl<'http_message> PartialHttpRequest<'http_message> {
 
     /// Get the original HTTP request message text
     pub fn message(&self) -> &str {
-        &self.message
+        self.message
     }
 
     /// Get the text span of the uri, if defined
@@ -170,12 +170,12 @@ impl<'http_message> PartialHttpRequest<'http_message> {
 
 fn assert_text_span(text: &str, span: &Range<usize>) {
     text.get(span.clone())
-        .expect(&format!("span {:?} is outside of text bounds", span));
+        .unwrap_or_else(|| panic!("span {span:?} is outside of text bounds"));
 }
 
 impl<'http_message> Default for PartialHttpRequest<'http_message> {
     fn default() -> Self {
-        Self::from_str("GET https://example.com HTTP/1.1").unwrap()
+        Self::parse("GET https://example.com HTTP/1.1").unwrap()
     }
 }
 
@@ -246,7 +246,7 @@ fn parse_first_line(first_line: &str) -> FirstLineParts {
         parts.push(last_end..first_line.len());
     }
 
-    let method_span = parts.get(0).cloned();
+    let method_span = parts.first().cloned();
     let uri_span = parts.get(1).cloned();
     let http_version_span = parts.get(2).cloned();
 
@@ -275,7 +275,7 @@ fn get_header_and_body_spans(
 }
 
 fn get_span_extent_from_spans(body_spans: Option<Vec<Range<usize>>>) -> Option<Range<usize>> {
-    let body_span = body_spans.and_then(|spans| {
+    body_spans.and_then(|spans| {
         if spans.is_empty() {
             return None;
         }
@@ -284,8 +284,7 @@ fn get_span_extent_from_spans(body_spans: Option<Vec<Range<usize>>>) -> Option<R
         let last = spans.last().unwrap();
 
         Some(first.start + 1..last.end)
-    });
-    body_span
+    })
 }
 
 #[cfg(test)]
diff --git a/src/models/response.rs b/src/models/response.rs
@@ -13,9 +13,9 @@ pub struct HttpResponse {
 }
 
 impl HttpResponse {
-    pub fn new(status_cdoe: HttpStatusCode, headers: Vec<HttpHeader>, body: Option<&str>) -> Self {
+    pub fn new(status_code: HttpStatusCode, headers: Vec<HttpHeader>, body: Option<&str>) -> Self {
         Self {
-            status_code: status_cdoe.into(),
+            status_code,
             headers,
             body: body.map(|b| b.to_string()),
         }
@@ -87,7 +87,7 @@ mod tests {
     #[test]
     fn test_http_status_code_display() {
         let status_code = HttpStatusCode::new(200);
-        assert_eq!(format!("{}", status_code), "200");
+        assert_eq!(format!("{status_code}"), "200");
     }
 
     #[test]
diff --git a/tests/parse_tests.rs b/tests/parse_tests.rs
@@ -9,10 +9,10 @@ use pretty_assertions::assert_eq;
 fn parse_empty_request() {
     let content = include_str!("../tests/fixtures/empty.request");
 
-    let partial = parse_partial_request(&content).expect("should be parsable");
+    let partial = parse_partial_request(content).expect("should be parsable");
 
     assert_eq!(
-        PartialHttpRequest::parsed(&content, None, None, None, vec![], None),
+        PartialHttpRequest::parsed(content, None, None, None, vec![], None),
         partial
     );
 }
@@ -21,10 +21,10 @@ fn parse_empty_request() {
 fn parse_whitespace_request() {
     let content = include_str!("../tests/fixtures/whitespace.request");
 
-    let partial = parse_partial_request(&content).expect("should be parsable");
+    let partial = parse_partial_request(content).expect("should be parsable");
 
     assert_eq!(
-        PartialHttpRequest::parsed(&content, None, None, None, vec![], None),
+        PartialHttpRequest::parsed(content, None, None, None, vec![], None),
         partial
     );
 }
@@ -33,7 +33,7 @@ fn parse_whitespace_request() {
 fn parse_get_request() {
     let content = include_str!("../tests/fixtures/get.request");
 
-    let partial = parse_partial_request(&content).expect("should be parsable");
+    let partial = parse_partial_request(content).expect("should be parsable");
 
     assert_eq!(
         PartialHttpRequest::parsed(content, Some(0..3), Some(4..23), Some(24..32), vec![], None),
@@ -58,7 +58,7 @@ fn parse_get_request() {
 fn parse_get_without_http_version_request() {
     let content = include_str!("../tests/fixtures/get_without_http_version.request");
 
-    let partial = parse_partial_request(&content);
+    let partial = parse_partial_request(content);
 
     assert_eq!(
         Ok(PartialHttpRequest::parsed(
@@ -81,7 +81,7 @@ fn parse_get_without_http_version_request() {
 fn parse_get_with_headers_request() {
     let content = include_str!("../tests/fixtures/get_with_headers.request");
 
-    let partial = parse_partial_request(&content).expect("should be parsable");
+    let partial = parse_partial_request(content).expect("should be parsable");
 
     assert_eq!(
         PartialHttpRequest::parsed(
@@ -113,7 +113,7 @@ fn parse_get_with_headers_request() {
 fn parse_post_with_headers_and_body_request() {
     let content = include_str!("../tests/fixtures/post_with_headers_and_body.request");
 
-    let partial = parse_partial_request(&content).expect("should be parsable");
+    let partial = parse_partial_request(content).expect("should be parsable");
 
     let method = Some(0..4);
     let uri = Some(5..24);
@@ -122,7 +122,7 @@ fn parse_post_with_headers_and_body_request() {
     let body = Some(53..64);
 
     assert_eq!(
-        PartialHttpRequest::parsed(&content, method, uri, http_version, headers, body),
+        PartialHttpRequest::parsed(content, method, uri, http_version, headers, body),
         partial
     );
 
@@ -144,7 +144,7 @@ fn parse_post_with_headers_and_body_request() {
 fn parse_post_with_body_request() {
     let content = include_str!("../tests/fixtures/post_with_body.request");
 
-    let partial = parse_partial_request(&content).expect("should be parsable");
+    let partial = parse_partial_request(content).expect("should be parsable");
 
     assert_eq!(
         PartialHttpRequest::parsed(
@@ -176,11 +176,11 @@ fn parse_post_with_body_request() {
 fn parse_get_with_multiple_spaces_request() {
     let content = include_str!("../tests/fixtures/get_with_multiple_spaces.request");
 
-    let partial = parse_partial_request(&content).expect("should be parsable");
+    let partial = parse_partial_request(content).expect("should be parsable");
 
     assert_eq!(
         PartialHttpRequest::parsed(
-            &content,
+            content,
             Some(0..3),
             Some(5..24),
             Some(26..34),

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@ pub mod span;`
`6`	`6`
`7`	`7`	`/// Parse a partial HTTP request message string in to [PartialHttpRequest]`
`8`	`8`	`pub fn parse_partial_request(input: &str) -> Result<PartialHttpRequest<'_>, error::Error> {`
`9`		`- PartialHttpRequest::from_str(input)`
	`9`	`+ PartialHttpRequest::parse(input)`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`/// Parse a spec compliant HTTP request message string in to [ParsedHttpRequest]`
`13`	`13`	`pub fn parse_request(input: &str) -> Result<ParsedHttpRequest<'_>, error::Error> {`
`14`		`- ParsedHttpRequest::from_str(input)`
	`14`	`+ ParsedHttpRequest::parse(input)`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ fn main() {`
`13`	`13`
`14`	`14`	`match fs::read_to_string(&args[1]) {`
`15`	`15`	`Ok(contents) => {`
`16`		`- let partial = PartialHttpRequest::from_str(&contents);`
	`16`	`+ let partial = PartialHttpRequest::parse(&contents);`
`17`	`17`
`18`	`18`	`println!("{partial:#?}");`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ mod tests {`
`64`	`64`	`#[test]`
`65`	`65`	`fn test_http_header_display() {`
`66`	`66`	`let header = HttpHeader::new("Content-Type", "application/json");`
`67`		`- assert_eq!(format!("{}", header), "Content-Type: application/json");`
	`67`	`+ assert_eq!(format!("{header}"), "Content-Type: application/json");`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`#[test]`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ impl<'http_message> fmt::Display for ParsedHttpRequest<'http_message> {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`impl<'http_message> ParsedHttpRequest<'http_message> {`
`29`		`- pub fn from_str(message: &'http_message str) -> Result<Self, Error> {`
	`29`	`+ pub fn parse(message: &'http_message str) -> Result<Self, Error> {`
`30`	`30`	`parse_request(message, parse_first_line)`
`31`	`31`	`}`
`32`	`32`
`@@ -105,7 +105,7 @@ impl<'http_message> ParsedHttpRequest<'http_message> {`
`105`	`105`
`106`	`106`	`/// Get the original HTTP request message text`
`107`	`107`	`pub fn message(&self) -> &str {`
`108`		`- &self.message`
	`108`	`+ self.message`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`/// Get the text span of the uri, if defined`
`@@ -176,12 +176,12 @@ impl<'http_message> ParsedHttpRequest<'http_message> {`
`176`	`176`
`177`	`177`	`fn assert_text_span(text: &str, span: &Range<usize>) {`
`178`	`178`	`text.get(span.clone())`
`179`		`- .expect(&format!("span {:?} is outside of text bounds", span));`
	`179`	`+ .unwrap_or_else(\|\| panic!("span {span:?} is outside of text bounds"));`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`impl<'http_message> Default for ParsedHttpRequest<'http_message> {`
`183`	`183`	`fn default() -> Self {`
`184`		`- Self::from_str("GET https://example.com HTTP/1.1\n\n").unwrap()`
	`184`	`+ Self::parse("GET https://example.com HTTP/1.1\n\n").unwrap()`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`@@ -249,7 +249,7 @@ fn parse_first_line(first_line: &str) -> FirstLineParts {`
`249`	`249`	`parts.push(last_end..first_line.len());`
`250`	`250`	`}`
`251`	`251`
`252`		`- let method_span = parts.get(0).cloned();`
	`252`	`+ let method_span = parts.first().cloned();`
`253`	`253`	`let uri_span = parts.get(1).cloned();`
`254`	`254`	`let http_version_span = parts.get(2).cloned();`
`255`	`255`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ pub struct HttpResponse {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`impl HttpResponse {`
`16`		`- pub fn new(status_cdoe: HttpStatusCode, headers: Vec<HttpHeader>, body: Option<&str>) -> Self {`
	`16`	`+ pub fn new(status_code: HttpStatusCode, headers: Vec<HttpHeader>, body: Option<&str>) -> Self {`
`17`	`17`	`Self {`
`18`		`- status_code: status_cdoe.into(),`
	`18`	`+ status_code,`
`19`	`19`	`headers,`
`20`	`20`	`body: body.map(\|b\| b.to_string()),`
`21`	`21`	`}`
`@@ -87,7 +87,7 @@ mod tests {`
`87`	`87`	`#[test]`
`88`	`88`	`fn test_http_status_code_display() {`
`89`	`89`	`let status_code = HttpStatusCode::new(200);`
`90`		`- assert_eq!(format!("{}", status_code), "200");`
	`90`	`+ assert_eq!(format!("{status_code}"), "200");`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`#[test]`