actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-03-20 17:15:17 +01:00
Code Issues Releases Wiki Activity

prepare rt 2.0.0-beta.2 release

Browse Source
This commit is contained in:
Rob Ede 2021-01-09 15:12:59 +00:00
parent f07d807707
commit 6edf9b8278
No known key found for this signature in database
GPG Key ID: C2A3B36E841A91E6
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-rt/CHANGES.md
View File

@ -1,10 +1,14 @@
# Changes # Changes
## Unreleased - 2021-xx-xx ## Unreleased - 2021-xx-xx
## 2.0.0-beta.2 - 2021-01-09
* Add `task` mod with re-export of `tokio::task::{spawn_blocking, yield_now, JoinHandle}` [#245] * Add `task` mod with re-export of `tokio::task::{spawn_blocking, yield_now, JoinHandle}` [#245]
[#245]: https://github.com/actix/actix-net/pull/245 [#245]: https://github.com/actix/actix-net/pull/245
## 2.0.0-beta.1 - 2020-12-28 ## 2.0.0-beta.1 - 2020-12-28
### Added ### Added
* Add `System::attach_to_tokio` method. [#173] * Add `System::attach_to_tokio` method. [#173]

8
actix-rt/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-rt" name = "actix-rt"
version = "2.0.0-beta.1" version = "2.0.0-beta.2"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Tokio-based single-thread async runtime for the Actix ecosystem" description = "Tokio-based single-thread async runtime for the Actix ecosystem"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]
@ -15,7 +15,11 @@ edition = "2018"
name = "actix_rt" name = "actix_rt"
path = "src/lib.rs" path = "src/lib.rs"
[features]
default = ["macros"]
macros = ["actix-macros"]
[dependencies] [dependencies]
actix-macros = "0.2.0-beta.1" actix-macros = { version = "0.2.0-beta.1", optional = true }
tokio = { version = "1", features = ["rt", "net", "parking_lot", "signal", "sync", "time"] } tokio = { version = "1", features = ["rt", "net", "parking_lot", "signal", "sync", "time"] }

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

@ -7,7 +7,9 @@
use std::future::Future; use std::future::Future;
#[cfg(not(test))] // Work around for rust-lang/rust#62127 // Cannot define a main macro when compiled into test harness.
// Workaround for https://github.com/rust-lang/rust/issues/62127.
#[cfg(all(feature = "macros", not(test)))]
pub use actix_macros::{main, test}; pub use actix_macros::{main, test};
mod arbiter; mod arbiter;
@ -64,7 +66,7 @@ pub mod time {
pub use tokio::time::{timeout, Timeout}; pub use tokio::time::{timeout, Timeout};
} }
/// task management. /// Blocking task management.
pub mod task { pub mod task {
pub use tokio::task::{spawn_blocking, yield_now, JoinHandle}; pub use tokio::task::{spawn_blocking, yield_now, JoinHandle};
} }