From d0a8ffc885a2f093e4f4a072b7b4f7af0232fa3e Mon Sep 17 00:00:00 2001 From: Daiki Mizukami Date: Mon, 11 Jan 2021 05:58:07 +0900 Subject: [PATCH 1/8] chore: prepare tokio-util v0.6.1 release # 0.6.1 (January 10, 2020) ### Added - codec: `get_ref()`, `get_mut()`, `get_pin_mut()` and `into_inner()` for `Framed`, `FramedRead`, `FramedWrite`, `StreamReader`, `StreamReader`, `StreamReader` and `StreamReader` (#3364). - codec: `write_buffer()` and `write_buffer_mut()` for `Framed` and `FramedWrite` (#3387). --- tokio-util/CHANGELOG.md | 12 ++++++++++++ tokio-util/Cargo.toml | 4 ++-- tokio-util/src/lib.rs | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tokio-util/CHANGELOG.md b/tokio-util/CHANGELOG.md index 460e6bcc3db..75ef869e59d 100644 --- a/tokio-util/CHANGELOG.md +++ b/tokio-util/CHANGELOG.md @@ -1,3 +1,13 @@ +# 0.6.1 (January 10, 2020) + +### Added + +- codec: `get_ref()`, `get_mut()`, `get_pin_mut()` and `into_inner()` for + `Framed`, `FramedRead`, `FramedWrite`, `StreamReader`, `StreamReader`, + `StreamReader` and `StreamReader` ([#3364]). +- codec: `write_buffer()` and `write_buffer_mut()` for `Framed` and + `FramedWrite` ([#3387]). + # 0.6.0 (December 23, 2020) ### Changed @@ -53,6 +63,8 @@ - Initial release +[#3387]: https://github.com/tokio-rs/tokio/pull/3387 +[#3364]: https://github.com/tokio-rs/tokio/pull/3364 [#2326]: https://github.com/tokio-rs/tokio/pull/2326 [#2215]: https://github.com/tokio-rs/tokio/pull/2215 [#2198]: https://github.com/tokio-rs/tokio/pull/2198 diff --git a/tokio-util/Cargo.toml b/tokio-util/Cargo.toml index 72717d2106b..4a1d3a0e556 100644 --- a/tokio-util/Cargo.toml +++ b/tokio-util/Cargo.toml @@ -7,13 +7,13 @@ name = "tokio-util" # - Cargo.toml # - Update CHANGELOG.md. # - Create "tokio-util-0.6.x" git tag. -version = "0.6.0" +version = "0.6.1" edition = "2018" authors = ["Tokio Contributors "] license = "MIT" repository = "https://github.com/tokio-rs/tokio" homepage = "https://tokio.rs" -documentation = "https://docs.rs/tokio-util/0.6.0/tokio_util" +documentation = "https://docs.rs/tokio-util/0.6.1/tokio_util" description = """ Additional utilities for working with Tokio. """ diff --git a/tokio-util/src/lib.rs b/tokio-util/src/lib.rs index 065c6298b68..d16ea1e0afe 100644 --- a/tokio-util/src/lib.rs +++ b/tokio-util/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/tokio-util/0.6.0")] +#![doc(html_root_url = "https://docs.rs/tokio-util/0.6.1")] #![allow(clippy::needless_doctest_main)] #![warn( missing_debug_implementations, From b0c7ca25b887895fad8bdb5e40c695d22a68a078 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Mon, 11 Jan 2021 17:34:42 +0100 Subject: [PATCH 2/8] Update date in changelog --- tokio-util/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio-util/CHANGELOG.md b/tokio-util/CHANGELOG.md index 75ef869e59d..b95050e9d52 100644 --- a/tokio-util/CHANGELOG.md +++ b/tokio-util/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.6.1 (January 10, 2020) +# 0.6.1 (January 11, 2020) ### Added From 2aae972627edb69f73a03de8a5834f78438ff9cd Mon Sep 17 00:00:00 2001 From: Daiki Mizukami Date: Tue, 12 Jan 2021 15:44:31 +0900 Subject: [PATCH 3/8] chore: fix typo in CHANGELOG --- tokio-util/CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tokio-util/CHANGELOG.md b/tokio-util/CHANGELOG.md index b95050e9d52..7d0b66552e8 100644 --- a/tokio-util/CHANGELOG.md +++ b/tokio-util/CHANGELOG.md @@ -3,8 +3,7 @@ ### Added - codec: `get_ref()`, `get_mut()`, `get_pin_mut()` and `into_inner()` for - `Framed`, `FramedRead`, `FramedWrite`, `StreamReader`, `StreamReader`, - `StreamReader` and `StreamReader` ([#3364]). + `Framed`, `FramedRead`, `FramedWrite` and `StreamReader` ([#3364]). - codec: `write_buffer()` and `write_buffer_mut()` for `Framed` and `FramedWrite` ([#3387]). From 734c582eca09e3258be4298c7b26938bb9ca9652 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Tue, 12 Jan 2021 10:27:04 +0100 Subject: [PATCH 4/8] Update date --- tokio-util/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio-util/CHANGELOG.md b/tokio-util/CHANGELOG.md index 7d0b66552e8..4ca548e2bf1 100644 --- a/tokio-util/CHANGELOG.md +++ b/tokio-util/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.6.1 (January 11, 2020) +# 0.6.1 (January 12, 2020) ### Added From a582ad39fb032079ff2249268660bcc0f3a11b25 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Tue, 12 Jan 2021 11:24:07 +0100 Subject: [PATCH 5/8] Remove path dependencies --- tokio-util/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tokio-util/Cargo.toml b/tokio-util/Cargo.toml index 4a1d3a0e556..d48ac8083a9 100644 --- a/tokio-util/Cargo.toml +++ b/tokio-util/Cargo.toml @@ -36,8 +36,8 @@ rt = ["tokio/rt"] __docs_rs = ["futures-util"] [dependencies] -tokio = { version = "1.0.0", path = "../tokio" } -tokio-stream = { version = "0.1", path = "../tokio-stream" } +tokio = { version = "1.0.0" } +tokio-stream = { version = "0.1" } bytes = "1.0.0" futures-core = "0.3.0" @@ -49,8 +49,8 @@ pin-project-lite = "0.2.0" slab = { version = "0.4.1", optional = true } # Backs `DelayQueue` [dev-dependencies] -tokio = { version = "1.0.0", path = "../tokio", features = ["full"] } -tokio-test = { version = "0.4.0", path = "../tokio-test" } +tokio = { version = "1.0.0", features = ["full"] } +tokio-test = { version = "0.4.0" } futures = "0.3.0" futures-test = "0.3.5" From 4974371443d771777253d1e5f9152d1e48ba2dd7 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Tue, 12 Jan 2021 12:02:09 +0100 Subject: [PATCH 6/8] Remove more path dependencies --- examples/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 67dde991d35..9de2edb69a8 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" # If you copy one of the examples into a new project, you should be using # [dependencies] instead. [dev-dependencies] -tokio = { version = "1.0.0", path = "../tokio", features = ["full", "tracing"] } -tokio-util = { version = "0.6.0", path = "../tokio-util", features = ["full"] } -tokio-stream = { version = "0.1", path = "../tokio-stream" } +tokio = { version = "1.0.0", features = ["full", "tracing"] } +tokio-util = { version = "0.6.0", features = ["full"] } +tokio-stream = { version = "0.1" } async-stream = "0.3" tracing = "0.1" From c1f130d97fb415bfc37cf316b5bb0278afc367ea Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Tue, 12 Jan 2021 12:08:40 +0100 Subject: [PATCH 7/8] Revert "Remove path dependencies" This reverts commit a582ad39fb032079ff2249268660bcc0f3a11b25. --- tokio-util/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tokio-util/Cargo.toml b/tokio-util/Cargo.toml index d48ac8083a9..4a1d3a0e556 100644 --- a/tokio-util/Cargo.toml +++ b/tokio-util/Cargo.toml @@ -36,8 +36,8 @@ rt = ["tokio/rt"] __docs_rs = ["futures-util"] [dependencies] -tokio = { version = "1.0.0" } -tokio-stream = { version = "0.1" } +tokio = { version = "1.0.0", path = "../tokio" } +tokio-stream = { version = "0.1", path = "../tokio-stream" } bytes = "1.0.0" futures-core = "0.3.0" @@ -49,8 +49,8 @@ pin-project-lite = "0.2.0" slab = { version = "0.4.1", optional = true } # Backs `DelayQueue` [dev-dependencies] -tokio = { version = "1.0.0", features = ["full"] } -tokio-test = { version = "0.4.0" } +tokio = { version = "1.0.0", path = "../tokio", features = ["full"] } +tokio-test = { version = "0.4.0", path = "../tokio-test" } futures = "0.3.0" futures-test = "0.3.5" From cccd03399df9eb12d9ceec3c388f6e69dd7f2b69 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Tue, 12 Jan 2021 12:08:47 +0100 Subject: [PATCH 8/8] Revert "Remove more path dependencies" This reverts commit 4974371443d771777253d1e5f9152d1e48ba2dd7. --- examples/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 9de2edb69a8..67dde991d35 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" # If you copy one of the examples into a new project, you should be using # [dependencies] instead. [dev-dependencies] -tokio = { version = "1.0.0", features = ["full", "tracing"] } -tokio-util = { version = "0.6.0", features = ["full"] } -tokio-stream = { version = "0.1" } +tokio = { version = "1.0.0", path = "../tokio", features = ["full", "tracing"] } +tokio-util = { version = "0.6.0", path = "../tokio-util", features = ["full"] } +tokio-stream = { version = "0.1", path = "../tokio-stream" } async-stream = "0.3" tracing = "0.1"