diff --git a/actix-rt/Cargo.toml b/actix-rt/Cargo.toml index bee209cc..54a2ac3c 100644 --- a/actix-rt/Cargo.toml +++ b/actix-rt/Cargo.toml @@ -15,15 +15,16 @@ rust-version.workspace = true allowed_external_types = ["actix_macros::*", "tokio::*"] [features] -default = ["macros"] +default = ["macros", "net"] macros = ["actix-macros"] io-uring = ["tokio-uring"] +net = ["tokio/net", "tokio/signal"] [dependencies] actix-macros = { version = "0.2.3", optional = true } futures-core = { version = "0.3", default-features = false } -tokio = { version = "1.23.1", features = ["rt", "net", "parking_lot", "signal", "sync", "time"] } +tokio = { version = "1.23.1", features = ["rt", "parking_lot", "sync", "time"] } # runtime for `io-uring` feature [target.'cfg(target_os = "linux")'.dependencies] diff --git a/actix-rt/src/lib.rs b/actix-rt/src/lib.rs index 9dce19b8..431430c1 100644 --- a/actix-rt/src/lib.rs +++ b/actix-rt/src/lib.rs @@ -44,6 +44,7 @@ #![allow(clippy::type_complexity)] #![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_favicon_url = "https://actix.rs/favicon.ico")] +#![cfg_attr(docsrs, feature(doc_auto_cfg))] #[cfg(all(not(target_os = "linux"), feature = "io-uring"))] compile_error!("io_uring is a linux only feature."); @@ -70,6 +71,7 @@ pub use self::{ system::{System, SystemRunner}, }; +#[cfg(feature = "net")] pub mod signal { //! Asynchronous signal handling (Tokio re-exports). @@ -81,6 +83,7 @@ pub mod signal { pub use tokio::signal::ctrl_c; } +#[cfg(feature = "net")] pub mod net { //! TCP/UDP/Unix bindings (mostly Tokio re-exports). diff --git a/actix-rt/src/runtime.rs b/actix-rt/src/runtime.rs index 55e29a77..4b1afd6e 100644 --- a/actix-rt/src/runtime.rs +++ b/actix-rt/src/runtime.rs @@ -14,8 +14,7 @@ pub struct Runtime { pub(crate) fn default_tokio_runtime() -> io::Result { tokio::runtime::Builder::new_current_thread() - .enable_io() - .enable_time() + .enable_all() .build() }