diff --git a/README.md b/README.md index 5e226ff71..ad192fec7 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Make sure you activated the full features of the tokio crate on Cargo.toml: ```toml [dependencies] -tokio = { version = "1.14.0", features = ["full"] } +tokio = { version = "1.15.0", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio-macros/CHANGELOG.md b/tokio-macros/CHANGELOG.md index eb5504cc5..633b43fbb 100644 --- a/tokio-macros/CHANGELOG.md +++ b/tokio-macros/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.7.0 (December 15th, 2021) + +- macros: address remainging clippy::semicolon_if_nothing_returned warning ([#4252]) + +[#4252]: https://github.com/tokio-rs/tokio/pull/4252 + # 1.6.0 (November 16th, 2021) - macros: fix mut patterns in `select!` macro ([#4211]) diff --git a/tokio-macros/Cargo.toml b/tokio-macros/Cargo.toml index e96ba20c9..d9b05795b 100644 --- a/tokio-macros/Cargo.toml +++ b/tokio-macros/Cargo.toml @@ -4,7 +4,7 @@ name = "tokio-macros" # - Remove path dependencies # - Update CHANGELOG.md. # - Create "tokio-macros-1.0.x" git tag. -version = "1.6.0" +version = "1.7.0" edition = "2018" rust-version = "1.46" authors = ["Tokio Contributors "] diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index afa8bf0ce..a17ffa9b8 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,31 @@ +# 1.15.0 (December 15, 2021) + +### Fixed + +- io: add cooperative yielding support to `io::empty()` ([#4300]) +- time: make timeout robust against budget-depleting tasks ([#4314]) + +### Changed + +- update minimum supported Rust version to 1.46. + +### Added + +- time: add `Interval::reset()` ([#4248]) +- io: add explicit lifetimes to `AsyncFdReadyGuard` ([#4267]) +- process: add `Command::as_std()` ([#4295]) + +### Added (unstable) + +- tracing: instrument `tokio::sync` types ([#4302]) + +[#4302]: https://github.com/tokio-rs/tokio/pull/4302 +[#4300]: https://github.com/tokio-rs/tokio/pull/4300 +[#4295]: https://github.com/tokio-rs/tokio/pull/4295 +[#4267]: https://github.com/tokio-rs/tokio/pull/4267 +[#4248]: https://github.com/tokio-rs/tokio/pull/4248 +[#4314]: https://github.com/tokio-rs/tokio/pull/4314 + # 1.14.0 (November 15, 2021) ### Fixed diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index ee3a2260b..06ef70740 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -6,7 +6,7 @@ name = "tokio" # - README.md # - Update CHANGELOG.md. # - Create "v1.0.x" git tag. -version = "1.14.0" +version = "1.15.0" edition = "2018" rust-version = "1.46" authors = ["Tokio Contributors "] @@ -86,7 +86,7 @@ test-util = ["rt", "sync", "time"] time = [] [dependencies] -tokio-macros = { version = "1.6.0", path = "../tokio-macros", optional = true } +tokio-macros = { version = "1.7.0", path = "../tokio-macros", optional = true } pin-project-lite = "0.2.0" diff --git a/tokio/README.md b/tokio/README.md index 5e226ff71..ad192fec7 100644 --- a/tokio/README.md +++ b/tokio/README.md @@ -56,7 +56,7 @@ Make sure you activated the full features of the tokio crate on Cargo.toml: ```toml [dependencies] -tokio = { version = "1.14.0", features = ["full"] } +tokio = { version = "1.15.0", features = ["full"] } ``` Then, on your main.rs: