From 2a180188c62ba13667cb6952ad65fffa72876266 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Sat, 27 May 2023 14:43:04 +0200 Subject: [PATCH 1/4] ci: fix CI for 1.18.x branch (#5728) Some of these changes will be progressively reverted as we merge this into newer branches. --- .cirrus.yml | 10 ++++++---- .github/workflows/ci.yml | 6 +++--- Cargo.lock | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 Cargo.lock diff --git a/.cirrus.yml b/.cirrus.yml index 6dcd8b19226..39d8431e337 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,5 +1,7 @@ +only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'master' || $CIRRUS_BRANCH =~ 'tokio-.*') +auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'tokio-.*' freebsd_instance: - image: freebsd-12-3-release-amd64 + image_family: freebsd-13-1 env: RUST_STABLE: 1.60.0 RUST_NIGHTLY: nightly-2022-03-21 @@ -12,7 +14,7 @@ env: task: name: FreeBSD 64-bit setup_script: - - pkg install -y bash curl + - pkg install -y bash - curl https://sh.rustup.rs -sSf --output rustup.sh - sh rustup.sh -y --profile minimal --default-toolchain $RUST_STABLE - . $HOME/.cargo/env @@ -29,7 +31,7 @@ task: RUSTFLAGS: --cfg docsrs --cfg tokio_unstable RUSTDOCFLAGS: --cfg docsrs --cfg tokio_unstable -Dwarnings setup_script: - - pkg install -y bash curl + - pkg install -y bash - curl https://sh.rustup.rs -sSf --output rustup.sh - sh rustup.sh -y --profile minimal --default-toolchain $RUST_NIGHTLY - . $HOME/.cargo/env @@ -43,7 +45,7 @@ task: task: name: FreeBSD 32-bit setup_script: - - pkg install -y bash curl + - pkg install -y bash - curl https://sh.rustup.rs -sSf --output rustup.sh - sh rustup.sh -y --profile minimal --default-toolchain $RUST_STABLE - . $HOME/.cargo/env diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae99b17b7e0..e38f7768223 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: run: rustup update stable - uses: Swatinem/rust-cache@v1 - name: Install cargo-hack - run: cargo install cargo-hack + run: cargo install cargo-hack --version 0.5.26 # Run `tokio` with `full` features. This excludes testing utilities which # can alter the runtime behavior of Tokio. @@ -263,7 +263,7 @@ jobs: override: true - uses: Swatinem/rust-cache@v1 - name: Install cargo-hack - run: cargo install cargo-hack + run: cargo install cargo-hack --version 0.5.26 - name: check --each-feature run: cargo hack check --all --each-feature -Z avoid-dev-deps # Try with unstable feature flags @@ -299,7 +299,7 @@ jobs: override: true - uses: Swatinem/rust-cache@v1 - name: Install cargo-hack - run: cargo install cargo-hack + run: cargo install cargo-hack --version 0.5.26 - name: "check --all-features -Z minimal-versions" run: | # Remove dev-dependencies from Cargo.toml to prevent the next `cargo update` diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 00000000000..85d35ddc504 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,32 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "predicates" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" +dependencies = [ + "difference", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" + +[[package]] +name = "predicates-tree" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +dependencies = [ + "predicates-core", + "termtree", +] From d6a9ef533348c787376b1a64f3cf1103d60a3785 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Sat, 27 May 2023 14:29:08 +0200 Subject: [PATCH 2/4] tokio: disable default features for mio (#5728) --- tokio/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 3e6b95784b6..a60f348fb3c 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -94,7 +94,7 @@ pin-project-lite = "0.2.0" # Everything else is optional... bytes = { version = "1.0.0", optional = true } memchr = { version = "2.2", optional = true } -mio = { version = "0.8.1", optional = true } +mio = { version = "0.8.1", optional = true, default-features = false } socket2 = { version = "0.4.4", optional = true, features = [ "all" ] } num_cpus = { version = "1.8.0", optional = true } parking_lot = { version = "0.12.0", optional = true } From 0f898a3148c41dffe3f5cd8d5c391ea603d1b22b Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Sat, 27 May 2023 15:23:38 +0200 Subject: [PATCH 3/4] chore: prepare Tokio v1.18.6 (#5729) --- README.md | 2 +- tokio/CHANGELOG.md | 8 ++++++++ tokio/Cargo.toml | 2 +- tokio/README.md | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 46b1e089cfd..39acc200e47 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.18.5", features = ["full"] } +tokio = { version = "1.18.6", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 05f4d8152e0..d1c02f39f72 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,11 @@ +# 1.18.6 (May 28, 2023) + +### Fixed + +- deps: disable default features for mio ([#5728]) + +[#5728]: https://github.com/tokio-rs/tokio/pull/5728 + # 1.18.5 (January 17, 2023) ### Fixed diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index a60f348fb3c..30f78191cda 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.18.5" +version = "1.18.6" edition = "2018" rust-version = "1.49" authors = ["Tokio Contributors "] diff --git a/tokio/README.md b/tokio/README.md index 46b1e089cfd..39acc200e47 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.18.5", features = ["full"] } +tokio = { version = "1.18.6", features = ["full"] } ``` Then, on your main.rs: From edd172cd3257e36cdfb2925716cdfddb91c4c038 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Sat, 27 May 2023 15:41:02 +0200 Subject: [PATCH 4/4] chore: prepare Tokio v1.20.5 (#5731) --- README.md | 2 +- tokio/CHANGELOG.md | 10 ++++++++++ tokio/Cargo.toml | 2 +- tokio/README.md | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 288662716ef..2f7126a770b 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.20.4", features = ["full"] } +tokio = { version = "1.20.5", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index b81de10951f..d01d91bab24 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,13 @@ +# 1.20.5 (May 28, 2023) + +Forward ports 1.18.6 changes. + +### Fixed + +- deps: disable default features for mio ([#5728]) + +[#5728]: https://github.com/tokio-rs/tokio/pull/5728 + # 1.20.4 (January 17, 2023) Forward ports 1.18.5 changes. diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index e60e5a9a7cd..e63c09f854d 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.20.4" +version = "1.20.5" edition = "2018" rust-version = "1.49" authors = ["Tokio Contributors "] diff --git a/tokio/README.md b/tokio/README.md index 288662716ef..2f7126a770b 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.20.4", features = ["full"] } +tokio = { version = "1.20.5", features = ["full"] } ``` Then, on your main.rs: