diff --git a/actix-rt/src/arbiter.rs b/actix-rt/src/arbiter.rs index 80ba055b..0fd30db8 100644 --- a/actix-rt/src/arbiter.rs +++ b/actix-rt/src/arbiter.rs @@ -172,7 +172,7 @@ impl Arbiter { let system_id = sys.id(); let arb_id = COUNT.fetch_add(1, Ordering::Relaxed); - let name = format!("actix-rt|system:{}|arbiter:{}", system_id, arb_id); + let name = format!("actix-rt|system:{system_id}|arbiter:{arb_id}"); let (tx, rx) = mpsc::unbounded_channel(); let (ready_tx, ready_rx) = std::sync::mpsc::channel::<()>(); diff --git a/actix-server/src/worker.rs b/actix-server/src/worker.rs index dcecda0e..30554c84 100644 --- a/actix-server/src/worker.rs +++ b/actix-server/src/worker.rs @@ -224,9 +224,10 @@ impl WorkerService { } } -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] enum WorkerServiceStatus { Available, + #[default] Unavailable, Failed, Restarting, @@ -234,12 +235,6 @@ enum WorkerServiceStatus { Stopped, } -impl Default for WorkerServiceStatus { - fn default() -> Self { - Self::Unavailable - } -} - /// Config for worker behavior passed down from server builder. #[derive(Debug, Clone, Copy)] pub(crate) struct ServerWorkerConfig { @@ -543,8 +538,10 @@ impl ServerWorker { } } +#[derive(Default)] enum WorkerState { Available, + #[default] Unavailable, Restarting(Restart), Shutdown(Shutdown), @@ -568,12 +565,6 @@ struct Shutdown { tx: oneshot::Sender, } -impl Default for WorkerState { - fn default() -> Self { - Self::Unavailable - } -} - impl Drop for ServerWorker { fn drop(&mut self) { Arbiter::try_current().as_ref().map(ArbiterHandle::stop); diff --git a/actix-tls/src/connect/connect_addrs.rs b/actix-tls/src/connect/connect_addrs.rs index 13e4c4fa..467cf9d9 100644 --- a/actix-tls/src/connect/connect_addrs.rs +++ b/actix-tls/src/connect/connect_addrs.rs @@ -4,8 +4,9 @@ use std::{ net::SocketAddr, }; -#[derive(Debug, Clone, Eq, PartialEq, Hash)] +#[derive(Debug, Clone, Eq, PartialEq, Hash, Default)] pub(crate) enum ConnectAddrs { + #[default] None, One(SocketAddr), // TODO: consider using smallvec @@ -22,12 +23,6 @@ impl ConnectAddrs { } } -impl Default for ConnectAddrs { - fn default() -> Self { - Self::None - } -} - impl From> for ConnectAddrs { fn from(addr: Option) -> Self { match addr { diff --git a/actix-tls/src/connect/resolver.rs b/actix-tls/src/connect/resolver.rs index e5d1b891..dedb9ae2 100644 --- a/actix-tls/src/connect/resolver.rs +++ b/actix-tls/src/connect/resolver.rs @@ -49,23 +49,18 @@ impl ServiceFactory> for Resolver { } } -#[derive(Clone)] +#[derive(Clone, Default)] enum ResolverKind { /// Built-in DNS resolver. /// /// See [`std::net::ToSocketAddrs`] trait. + #[default] Default, /// Custom, user-provided DNS resolver. Custom(Rc), } -impl Default for ResolverKind { - fn default() -> Self { - Self::Default - } -} - /// DNS resolver service. #[derive(Clone, Default)] pub struct ResolverService {