diff --git a/actix-http/src/config.rs b/actix-http/src/config.rs index 469974930..96e2aef07 100644 --- a/actix-http/src/config.rs +++ b/actix-http/src/config.rs @@ -9,6 +9,7 @@ use bytes::BytesMut; use crate::{date::DateService, KeepAlive}; /// A builder for creating a [`ServiceConfig`] +#[derive(Default, Debug)] pub struct ServiceConfigBuilder { inner: Inner, } @@ -75,16 +76,8 @@ impl ServiceConfigBuilder { } } -impl Default for ServiceConfigBuilder { - fn default() -> Self { - Self { - inner: Inner::default(), - } - } -} - /// HTTP service configuration. -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Default)] pub struct ServiceConfig(Rc); #[derive(Debug)] @@ -112,12 +105,6 @@ impl Default for Inner { } } -impl Default for ServiceConfig { - fn default() -> Self { - Self(Rc::default()) - } -} - impl ServiceConfig { /// Create instance of `ServiceConfig`. pub fn new( diff --git a/actix-http/src/test.rs b/actix-http/src/test.rs index 32d09d12c..926efe2f5 100644 --- a/actix-http/src/test.rs +++ b/actix-http/src/test.rs @@ -337,8 +337,8 @@ impl io::Read for TestSeqBuffer { let mut inner = self.0.borrow_mut(); if inner.read_buf.is_empty() { - if let Some(e) = inner.err.take() { - Err(e) + if let Some(err) = inner.err.take() { + Err(err) } else if inner.read_closed { Ok(0) } else {