Skip to content

Commit e89b02f

Browse files
ririsoftjbr
authored andcommitted
fix clippy errors and warnings
This fixes a few clippy errors and warnings with some noticable exceptions: * new_without_default has been deactivated at crate level since it does not seem to be considered mandatory (see 92#pullrequestreview-391768723) * module_inception is allowed for private module headers::headers since it would lead to too much refactoring. This is left as a TODO for the future.
1 parent 9bb7539 commit e89b02f

File tree

8 files changed

+19
-18
lines changed

8 files changed

+19
-18
lines changed

src/body.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ impl<'a> From<&'a str> for Body {
439439

440440
impl From<Vec<u8>> for Body {
441441
fn from(b: Vec<u8>) -> Self {
442-
Self::from_bytes(b.to_owned())
442+
Self::from_bytes(b)
443443
}
444444
}
445445

src/headers/header_values.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ impl<'a> PartialEq<[&'a str]> for HeaderValues {
113113

114114
impl PartialEq<String> for HeaderValues {
115115
fn eq(&self, other: &String) -> bool {
116-
self.inner.len() == 1 && &self.inner[0] == other
116+
self.inner.len() == 1 && self.inner[0] == *other
117117
}
118118
}
119119

120120
impl<'a> PartialEq<&String> for HeaderValues {
121121
fn eq(&self, other: &&String) -> bool {
122-
self.inner.len() == 1 && &&self.inner[0] == other
122+
self.inner.len() == 1 && self.inner[0] == **other
123123
}
124124
}
125125

src/headers/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ mod constants;
44
mod header_name;
55
mod header_value;
66
mod header_values;
7+
#[allow(clippy::module_inception)]
78
mod headers;
89
mod into_iter;
910
mod iter;

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
9696
#![deny(missing_debug_implementations, nonstandard_style)]
9797
#![warn(missing_docs, unreachable_pub)]
98+
#![allow(clippy::new_without_default)]
9899
#![cfg_attr(test, deny(warnings))]
99100
#![cfg_attr(feature = "docs", feature(doc_cfg))]
100101
#![doc(html_favicon_url = "https://yoshuawuyts.com/assets/http-rs/favicon.ico")]

src/request.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,16 @@ impl Request {
115115
self.forwarded_header_part("host")
116116
.or_else(|| {
117117
self.header("X-Forwarded-Host")
118-
.and_then(|h| h.as_str().split(",").next())
118+
.and_then(|h| h.as_str().split(',').next())
119119
})
120120
.or_else(|| self.header(&headers::HOST).map(|h| h.as_str()))
121121
.or_else(|| self.url().host_str())
122122
}
123123

124124
fn forwarded_header_part(&self, part: &str) -> Option<&str> {
125125
self.header("Forwarded").and_then(|header| {
126-
header.as_str().split(";").find_map(|key_equals_value| {
127-
let parts = key_equals_value.split("=").collect::<Vec<_>>();
126+
header.as_str().split(';').find_map(|key_equals_value| {
127+
let parts = key_equals_value.split('=').collect::<Vec<_>>();
128128
if parts.len() == 2 && parts[0].eq_ignore_ascii_case(part) {
129129
Some(parts[1])
130130
} else {
@@ -137,7 +137,7 @@ impl Request {
137137
fn forwarded_for(&self) -> Option<&str> {
138138
self.forwarded_header_part("for").or_else(|| {
139139
self.header("X-Forwarded-For")
140-
.and_then(|header| header.as_str().split(",").next())
140+
.and_then(|header| header.as_str().split(',').next())
141141
})
142142
}
143143

@@ -871,10 +871,10 @@ impl Clone for Request {
871871
/// extensions.
872872
fn clone(&self) -> Self {
873873
Request {
874-
method: self.method.clone(),
874+
method: self.method,
875875
url: self.url.clone(),
876876
headers: self.headers.clone(),
877-
version: self.version.clone(),
877+
version: self.version,
878878
trailers_sender: None,
879879
trailers_receiver: None,
880880
body: Body::empty(),
@@ -1145,8 +1145,8 @@ mod tests {
11451145
set_x_forwarded_for(&mut request, "forwarded-for-client.com");
11461146
request.peer_addr = Some("127.0.0.1:8000".into());
11471147

1148-
assert_eq!(request.forwarded_for(), Some("forwarded.com".into()));
1149-
assert_eq!(request.remote(), Some("forwarded.com".into()));
1148+
assert_eq!(request.forwarded_for(), Some("forwarded.com"));
1149+
assert_eq!(request.remote(), Some("forwarded.com"));
11501150
}
11511151

11521152
#[test]
@@ -1155,7 +1155,7 @@ mod tests {
11551155
request.peer_addr = Some("127.0.0.1:8000".into());
11561156

11571157
assert_eq!(request.forwarded_for(), None);
1158-
assert_eq!(request.remote(), Some("127.0.0.1:8000".into()));
1158+
assert_eq!(request.remote(), Some("127.0.0.1:8000"));
11591159
}
11601160

11611161
#[test]

src/response.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,9 +666,9 @@ impl Clone for Response {
666666
/// - Any attached error is not cloned.
667667
fn clone(&self) -> Self {
668668
Self {
669-
status: self.status.clone(),
669+
status: self.status,
670670
headers: self.headers.clone(),
671-
version: self.version.clone(),
671+
version: self.version,
672672
trailers_sender: self.trailers_sender.clone(),
673673
trailers_receiver: self.trailers_receiver.clone(),
674674
has_trailers: false,

src/security/csp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,6 @@ impl ContentSecurityPolicy {
354354
} else {
355355
"Content-Security-Policy"
356356
};
357-
headers.as_mut().insert(name, self.value().to_owned());
357+
headers.as_mut().insert(name, self.value());
358358
}
359359
}

tests/error.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ fn can_be_boxed() {
1313
#[test]
1414
fn internal_server_error_by_default() {
1515
fn run() -> http_types::Result<()> {
16-
Err(io::Error::new(io::ErrorKind::Other, "Oh no"))?;
17-
Ok(())
16+
Err(io::Error::new(io::ErrorKind::Other, "Oh no").into())
1817
}
1918
let err = run().unwrap_err();
2019
assert_eq!(err.status(), 500);
@@ -23,7 +22,7 @@ fn internal_server_error_by_default() {
2322
#[test]
2423
fn ensure() {
2524
fn inner() -> http_types::Result<()> {
26-
ensure!(1 == 1, "Oh yes");
25+
ensure!(true, "Oh yes");
2726
bail!("Oh no!");
2827
}
2928
let res = inner();

0 commit comments

Comments
 (0)