1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-30 12:00:38 +00:00

fix clippy warnings (#1806)

* fix clippy warnings

* prevent CI fail status caused by codecov
This commit is contained in:
Rob Ede 2020-12-09 11:22:19 +00:00 committed by GitHub
parent 7a3776b770
commit ae63eb8bb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 16 deletions

View file

@ -550,8 +550,7 @@ impl fmt::Display for ContentDisposition {
write!(f, "{}", self.disposition)?; write!(f, "{}", self.disposition)?;
self.parameters self.parameters
.iter() .iter()
.map(|param| write!(f, "; {}", param)) .try_for_each(|param| write!(f, "; {}", param))
.collect()
} }
} }

View file

@ -7,10 +7,12 @@ use crate::header::{HeaderValue, IntoHeaderValue, InvalidHeaderValue, Writer};
/// 1. `%x21`, or /// 1. `%x21`, or
/// 2. in the range `%x23` to `%x7E`, or /// 2. in the range `%x23` to `%x7E`, or
/// 3. above `%x80` /// 3. above `%x80`
fn entity_validate_char(c: u8) -> bool {
c == 0x21 || (0x23..=0x7e).contains(&c) || (c >= 0x80)
}
fn check_slice_validity(slice: &str) -> bool { fn check_slice_validity(slice: &str) -> bool {
slice slice.bytes().all(entity_validate_char)
.bytes()
.all(|c| c == b'\x21' || (c >= b'\x23' && c <= b'\x7e') | (c >= b'\x80'))
} }
/// An entity tag, defined in [RFC7232](https://tools.ietf.org/html/rfc7232#section-2.3) /// An entity tag, defined in [RFC7232](https://tools.ietf.org/html/rfc7232#section-2.3)

View file

@ -70,9 +70,14 @@ impl WebsocketsRequest {
<Uri as TryFrom<U>>::Error: Into<HttpError>, <Uri as TryFrom<U>>::Error: Into<HttpError>,
{ {
let mut err = None; let mut err = None;
let mut head = RequestHead::default();
head.method = Method::GET; #[allow(clippy::field_reassign_with_default)]
head.version = Version::HTTP_11; let mut head = {
let mut head = RequestHead::default();
head.method = Method::GET;
head.version = Version::HTTP_11;
head
};
match Uri::try_from(uri) { match Uri::try_from(uri) {
Ok(uri) => head.uri = uri, Ok(uri) => head.uri = uri,

View file

@ -1,4 +1,13 @@
ignore: # ignore codecoverage on following paths coverage:
status:
project:
default:
threshold: 10% # make CI green
patch:
default:
threshold: 10% # make CI green
ignore: # ignore code coverage on following paths
- "**/tests" - "**/tests"
- "test-server" - "test-server"
- "**/benches" - "**/benches"

View file

@ -192,10 +192,7 @@ impl AcceptEncoding {
}; };
let quality = match parts.len() { let quality = match parts.len() {
1 => encoding.quality(), 1 => encoding.quality(),
_ => match f64::from_str(parts[1]) { _ => f64::from_str(parts[1]).unwrap_or(0.0),
Ok(q) => q,
Err(_) => 0.0,
},
}; };
Some(AcceptEncoding { encoding, quality }) Some(AcceptEncoding { encoding, quality })
} }

View file

@ -105,6 +105,7 @@ mod tests {
use crate::test::{self, TestRequest}; use crate::test::{self, TestRequest};
use crate::HttpResponse; use crate::HttpResponse;
#[allow(clippy::unnecessary_wraps)]
fn render_500<B>(mut res: ServiceResponse<B>) -> Result<ErrorHandlerResponse<B>> { fn render_500<B>(mut res: ServiceResponse<B>) -> Result<ErrorHandlerResponse<B>> {
res.response_mut() res.response_mut()
.headers_mut() .headers_mut()

View file

@ -154,6 +154,7 @@ mod tests {
use crate::test::{self, TestRequest}; use crate::test::{self, TestRequest};
use crate::HttpResponse; use crate::HttpResponse;
#[allow(clippy::unnecessary_wraps)]
fn render_500<B>(mut res: ServiceResponse<B>) -> Result<ErrorHandlerResponse<B>> { fn render_500<B>(mut res: ServiceResponse<B>) -> Result<ErrorHandlerResponse<B>> {
res.response_mut() res.response_mut()
.headers_mut() .headers_mut()

View file

@ -241,9 +241,10 @@ pub struct PayloadConfig {
impl PayloadConfig { impl PayloadConfig {
/// Create `PayloadConfig` instance and set max size of payload. /// Create `PayloadConfig` instance and set max size of payload.
pub fn new(limit: usize) -> Self { pub fn new(limit: usize) -> Self {
let mut cfg = Self::default(); Self {
cfg.limit = limit; limit,
cfg ..Default::default()
}
} }
/// Change max size of payload. By default max size is 256Kb /// Change max size of payload. By default max size is 256Kb