mirror of https://github.com/fafhrd91/actix-net
remove actix-threadpool re-export from actix-rt
This commit is contained in:
parent
1f990005c6
commit
2f927487e8
|
@ -15,13 +15,8 @@ edition = "2018"
|
||||||
name = "actix_rt"
|
name = "actix_rt"
|
||||||
path = "src/lib.rs"
|
path = "src/lib.rs"
|
||||||
|
|
||||||
[features]
|
|
||||||
default = ["blocking"]
|
|
||||||
blocking = ["actix-threadpool"]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
actix-macros = "0.1.0"
|
actix-macros = "0.1.0"
|
||||||
actix-threadpool = { version = "0.3", optional = true }
|
|
||||||
copyless = "0.1.4"
|
copyless = "0.1.4"
|
||||||
futures-channel = "0.3.4"
|
futures-channel = "0.3.4"
|
||||||
futures-util = { version = "0.3.4", default-features = false, features = ["alloc"] }
|
futures-util = { version = "0.3.4", default-features = false, features = ["alloc"] }
|
||||||
|
|
|
@ -134,10 +134,7 @@ impl Arbiter {
|
||||||
.unbounded_send(SystemCommand::RegisterArbiter(id, arb));
|
.unbounded_send(SystemCommand::RegisterArbiter(id, arb));
|
||||||
|
|
||||||
// run loop
|
// run loop
|
||||||
let _ = match rt.block_on(stop_rx) {
|
let _ = rt.block_on(stop_rx).unwrap_or(1);
|
||||||
Ok(code) => code,
|
|
||||||
Err(_) => 1,
|
|
||||||
};
|
|
||||||
|
|
||||||
// unregister arbiter
|
// unregister arbiter
|
||||||
let _ = System::current()
|
let _ = System::current()
|
||||||
|
|
|
@ -15,10 +15,6 @@ pub use self::builder::{Builder, SystemRunner};
|
||||||
pub use self::runtime::Runtime;
|
pub use self::runtime::Runtime;
|
||||||
pub use self::system::System;
|
pub use self::system::System;
|
||||||
|
|
||||||
#[doc(hidden)]
|
|
||||||
#[cfg(feature = "blocking")]
|
|
||||||
pub use actix_threadpool as blocking;
|
|
||||||
|
|
||||||
/// Spawns a future on the current arbiter.
|
/// Spawns a future on the current arbiter.
|
||||||
///
|
///
|
||||||
/// # Panics
|
/// # Panics
|
||||||
|
|
Loading…
Reference in New Issue