berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 26289b8427 into 8204690568

This commit is contained in:
Akos Vandra-Meyer 2025-03-21 05:35:53 +00:00 committed by GitHub
parent 8204690568 26289b8427
commit 4b5399d377
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actix-rt/Cargo.toml
View File

@ -15,15 +15,16 @@ rust-version.workspace = true
allowed_external_types = ["actix_macros::*", "tokio::*"] allowed_external_types = ["actix_macros::*", "tokio::*"]
[features] [features]
default = ["macros"] default = ["macros", "net"]
macros = ["actix-macros"] macros = ["actix-macros"]
io-uring = ["tokio-uring"] io-uring = ["tokio-uring"]
net = ["tokio/net", "tokio/signal"]
[dependencies] [dependencies]
actix-macros = { version = "0.2.3", optional = true } actix-macros = { version = "0.2.3", optional = true }
futures-core = { version = "0.3", default-features = false } 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 # runtime for `io-uring` feature
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]

3
actix-rt/src/lib.rs
View File

@ -44,6 +44,7 @@
#![allow(clippy::type_complexity)] #![allow(clippy::type_complexity)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")] #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] #![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"))] #[cfg(all(not(target_os = "linux"), feature = "io-uring"))]
compile_error!("io_uring is a linux only feature."); compile_error!("io_uring is a linux only feature.");
@ -70,6 +71,7 @@ pub use self::{
system::{System, SystemRunner}, system::{System, SystemRunner},
}; };
#[cfg(feature = "net")]
pub mod signal { pub mod signal {
//! Asynchronous signal handling (Tokio re-exports). //! Asynchronous signal handling (Tokio re-exports).
@ -81,6 +83,7 @@ pub mod signal {
pub use tokio::signal::ctrl_c; pub use tokio::signal::ctrl_c;
} }
#[cfg(feature = "net")]
pub mod net { pub mod net {
//! TCP/UDP/Unix bindings (mostly Tokio re-exports). //! TCP/UDP/Unix bindings (mostly Tokio re-exports).

3
actix-rt/src/runtime.rs
View File

@ -14,8 +14,7 @@ pub struct Runtime {
pub(crate) fn default_tokio_runtime() -> io::Result<tokio::runtime::Runtime> { pub(crate) fn default_tokio_runtime() -> io::Result<tokio::runtime::Runtime> {
tokio::runtime::Builder::new_current_thread() tokio::runtime::Builder::new_current_thread()
.enable_io() .enable_all()
.enable_time()
.build() .build()
} }