diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02f083fd9a4..7c3d2d8a8af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,9 @@ jobs: run: rustup update stable - uses: Swatinem/rust-cache@v1 - name: Install cargo-hack - run: cargo install cargo-hack --version 0.5.26 + uses: taiki-e/install-action@v2 + with: + tool: cargo-hack # Run `tokio` with `full` features. This excludes testing utilities which # can alter the runtime behavior of Tokio. @@ -220,7 +222,7 @@ jobs: with: toolchain: ${{ env.rust_nightly }} override: true - - uses: Swatinem/rust-cache@v1 + # - uses: Swatinem/rust-cache@v1 -> CI failure observed due to insufficient storage space - name: asan run: cargo test --workspace --all-features --target x86_64-unknown-linux-gnu --tests -- --test-threads 1 env: @@ -274,7 +276,9 @@ jobs: override: true - uses: Swatinem/rust-cache@v1 - name: Install cargo-hack - run: cargo install cargo-hack --version 0.5.26 + uses: taiki-e/install-action@v2 + with: + tool: cargo-hack - name: check --each-feature run: cargo hack check --all --each-feature -Z avoid-dev-deps # Try with unstable feature flags @@ -310,7 +314,9 @@ jobs: override: true - uses: Swatinem/rust-cache@v1 - name: Install cargo-hack - run: cargo install cargo-hack --version 0.5.26 + uses: taiki-e/install-action@v2 + with: + tool: cargo-hack - name: "check --all-features -Z minimal-versions" run: | # Remove dev-dependencies from Cargo.toml to prevent the next `cargo update` @@ -408,10 +414,10 @@ jobs: - macos-latest steps: - uses: actions/checkout@v3 - - name: Install Rust ${{ env.rust_stable }} + - name: Install Rust 1.65.0 uses: actions-rs/toolchain@v1 with: - toolchain: ${{ env.rust_stable }} + toolchain: 1.65.0 override: true - uses: Swatinem/rust-cache@v1 - name: Test hyper @@ -462,8 +468,9 @@ jobs: # Install dependencies - name: Install cargo-hack - run: cargo install cargo-hack - + uses: taiki-e/install-action@v2 + with: + tool: cargo-hack - name: Install wasm32-wasi target run: rustup target add wasm32-wasi diff --git a/Cargo.lock b/Cargo.lock index 85d35ddc504..2bfbb9db7eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,44 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "quote" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5907a1b7c277254a8b15170f6e7c97cfa60ee7872a3217663bb81151e48184bb" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "proc-macro2" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92de25114670a878b1261c79c9f8f729fb97e95bac93f6312f583c60dd6a1dfe" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys", +] + [[package]] name = "predicates" version = "1.0.8" diff --git a/tokio/src/future/mod.rs b/tokio/src/future/mod.rs index 084ddc571f5..7c883eb3c34 100644 --- a/tokio/src/future/mod.rs +++ b/tokio/src/future/mod.rs @@ -20,6 +20,7 @@ cfg_sync! { cfg_trace! { mod trace; + #[allow(unused_imports)] pub(crate) use trace::InstrumentedFuture as Future; }