From 3b7368a724c17092b8c57340b718c9467c5e0b9b Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Thu, 28 Nov 2019 15:28:14 -0800 Subject: [PATCH 1/5] chore: prepare v0.2.2 release --- tokio/CHANGELOG.md | 16 ++++++++++++++++ tokio/Cargo.toml | 8 ++++---- tokio/src/lib.rs | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 944b9d5100d..df0187ec748 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,19 @@ +# 0.2.2 (November 28, 2019) + +### Fixes +- Update `spawn` panic message to specify that a task scheduler is required (#1839). +- API docs example for `runtime::Builder` to include a task scheduler (#1841). +- general documentation (#1834). +- building on illumos/solaris (#1772). +- panic when dropping `LocalSet` (#1843). +- API docs mention the required Cargo features for `Builder::{basic, threaded}_scheduler` (#1858). + +### Added +- impl `Stream` for `signal::unix::Signal` (#1849). +- API docs for platform specific behavior of `signal::ctrl_c` and `signal::unix::Signal` (#1854). +- API docs for `signal::unix::Signal::{recv, poll_recv}` and `signal::windows::CtrlBreak::{recv, poll_recv}` (#1854). +- `File::into_std` and `File::try_into_std` methods (#1856). + # 0.2.1 (November 26, 2019) ### Fixes diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 065c971cd9d..918b3550d18 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -8,12 +8,12 @@ name = "tokio" # - README.md # - Update CHANGELOG.md. # - Create "v0.2.x" git tag. -version = "0.2.1" +version = "0.2.2" edition = "2018" authors = ["Tokio Contributors "] license = "MIT" readme = "README.md" -documentation = "https://docs.rs/tokio/0.2.1/tokio/" +documentation = "https://docs.rs/tokio/0.2.2/tokio/" repository = "https://github.com/tokio-rs/tokio" homepage = "https://tokio.rs" description = """ @@ -92,7 +92,7 @@ uds = ["io-driver", "mio-uds", "libc"] [dependencies] -tokio-macros = { version = "0.2.0", optional = true, path = "../tokio-macros" } +tokio-macros = { version = "0.2.0", optional = true } bytes = "0.5.0" pin-project-lite = "0.1.1" @@ -121,7 +121,7 @@ default-features = false optional = true [dev-dependencies] -tokio-test = { version = "0.2.0", path = "../tokio-test" } +tokio-test = { version = "0.2.0" } futures = { version = "0.3.0", features = ["async-await"] } loom = { version = "0.2.13", features = ["futures", "checkpoint"] } proptest = "0.9.4" diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs index 3b8e37bf454..9c561d771b1 100644 --- a/tokio/src/lib.rs +++ b/tokio/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/tokio/0.2.1")] +#![doc(html_root_url = "https://docs.rs/tokio/0.2.2")] #![warn( missing_debug_implementations, missing_docs, From a68fbfcee9decfefcddf2ce1eca56aafa35fedc1 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Fri, 29 Nov 2019 08:42:56 -0800 Subject: [PATCH 2/5] Bring back tokio-test path dep --- tokio/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 918b3550d18..217a29c95e3 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -121,7 +121,7 @@ default-features = false optional = true [dev-dependencies] -tokio-test = { version = "0.2.0" } +tokio-test = { version = "0.2.0", path = "../tokio-test" } futures = { version = "0.3.0", features = ["async-await"] } loom = { version = "0.2.13", features = ["futures", "checkpoint"] } proptest = "0.9.4" From 0270bfb1c878a87f408c83863fa012ea930cc1af Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Fri, 29 Nov 2019 08:44:03 -0800 Subject: [PATCH 3/5] Fix date --- tokio/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index df0187ec748..16224ad9d0f 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.2.2 (November 28, 2019) +# 0.2.2 (November 29, 2019) ### Fixes - Update `spawn` panic message to specify that a task scheduler is required (#1839). From 2a191ed3f91e05f03f49a5b058ef9c428635bbc4 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Fri, 29 Nov 2019 09:25:04 -0800 Subject: [PATCH 4/5] ci: Turn on "full" feature when running loom --- ci/azure-loom.yml | 2 +- tokio/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure-loom.yml b/ci/azure-loom.yml index 6bc30535763..fdfb8670563 100644 --- a/ci/azure-loom.yml +++ b/ci/azure-loom.yml @@ -10,7 +10,7 @@ jobs: rust_version: ${{ parameters.rust }} - ${{ each crate in parameters.crates }}: - - script: RUSTFLAGS="--cfg loom" cargo test --lib --release -- --test-threads=1 --nocapture + - script: RUSTFLAGS="--cfg loom" cargo test --lib --release --features "full" -- --test-threads=1 --nocapture env: LOOM_MAX_PREEMPTIONS: 1 CI: 'True' diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 217a29c95e3..918b3550d18 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -121,7 +121,7 @@ default-features = false optional = true [dev-dependencies] -tokio-test = { version = "0.2.0", path = "../tokio-test" } +tokio-test = { version = "0.2.0" } futures = { version = "0.3.0", features = ["async-await"] } loom = { version = "0.2.13", features = ["futures", "checkpoint"] } proptest = "0.9.4" From 929aee109394771e3c61329815325adda9d76239 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Fri, 29 Nov 2019 10:39:28 -0800 Subject: [PATCH 5/5] update changelog --- tokio/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 16224ad9d0f..389a764d0c0 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,7 +1,8 @@ # 0.2.2 (November 29, 2019) ### Fixes -- Update `spawn` panic message to specify that a task scheduler is required (#1839). +- scheduling with `basic_scheduler` (#1861). +- update `spawn` panic message to specify that a task scheduler is required (#1839). - API docs example for `runtime::Builder` to include a task scheduler (#1841). - general documentation (#1834). - building on illumos/solaris (#1772).