From 3c8d8e60ca6ffa4a7669f35b098e454893a6a9a6 Mon Sep 17 00:00:00 2001 From: Motoyuki Kimura Date: Fri, 3 May 2024 18:23:25 +0900 Subject: [PATCH] chore: fix latest rust-1.78.0 warnings (#6528) --- .github/workflows/ci.yml | 26 +++++++++---------- tokio/src/process/unix/orphan.rs | 1 + .../runtime/scheduler/multi_thread/worker.rs | 1 + tokio/src/util/markers.rs | 1 + 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e39333ba6..4f5e90049 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: - x86_64-fortanix-unknown-sgx - check-redox - wasm32-unknown-unknown - - wasm32-wasi + - wasm32-wasip1 - check-external-types - check-fuzzing - check-unstable-mt-counters @@ -908,15 +908,15 @@ jobs: run: wasm-pack test --node -- --features "macros sync" working-directory: tokio - wasm32-wasi: + wasm32-wasip1: name: ${{ matrix.target }} needs: basics runs-on: ubuntu-latest strategy: matrix: target: - - wasm32-wasi - - wasm32-wasi-preview1-threads + - wasm32-wasip1 + - wasm32-wasip1-threads steps: - uses: actions/checkout@v4 - name: Install Rust ${{ env.rust_stable }} @@ -935,36 +935,36 @@ jobs: - name: WASI test tokio full run: cargo test -p tokio --target ${{ matrix.target }} --features full env: - CARGO_TARGET_WASM32_WASI_RUNNER: "wasmtime run --" - CARGO_TARGET_WASM32_WASI_PREVIEW1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --" + CARGO_TARGET_WASM32_WASIP1_RUNNER: "wasmtime run --" + CARGO_TARGET_WASM32_WASIP1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --" RUSTFLAGS: --cfg tokio_unstable -Dwarnings -C target-feature=+atomics,+bulk-memory -C link-args=--max-memory=67108864 - name: WASI test tokio-util full run: cargo test -p tokio-util --target ${{ matrix.target }} --features full env: - CARGO_TARGET_WASM32_WASI_RUNNER: "wasmtime run --" - CARGO_TARGET_WASM32_WASI_PREVIEW1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --" + CARGO_TARGET_WASM32_WASIP1_RUNNER: "wasmtime run --" + CARGO_TARGET_WASM32_WASIP1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --" RUSTFLAGS: --cfg tokio_unstable -Dwarnings -C target-feature=+atomics,+bulk-memory -C link-args=--max-memory=67108864 - name: WASI test tokio-stream run: cargo test -p tokio-stream --target ${{ matrix.target }} --features time,net,io-util,sync env: - CARGO_TARGET_WASM32_WASI_RUNNER: "wasmtime run --" - CARGO_TARGET_WASM32_WASI_PREVIEW1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --" + CARGO_TARGET_WASM32_WASIP1_RUNNER: "wasmtime run --" + CARGO_TARGET_WASM32_WASIP1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --" RUSTFLAGS: --cfg tokio_unstable -Dwarnings -C target-feature=+atomics,+bulk-memory -C link-args=--max-memory=67108864 - name: test tests-integration --features wasi-rt # TODO: this should become: `cargo hack wasi test --each-feature` run: cargo wasi test --test rt_yield --features wasi-rt - if: matrix.target == 'wasm32-wasi' + if: matrix.target == 'wasm32-wasip1' working-directory: tests-integration - name: test tests-integration --features wasi-threads-rt run: cargo test --target ${{ matrix.target }} --features wasi-threads-rt - if: matrix.target == 'wasm32-wasi-preview1-threads' + if: matrix.target == 'wasm32-wasip1-threads' working-directory: tests-integration env: - CARGO_TARGET_WASM32_WASI_PREVIEW1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --" + CARGO_TARGET_WASM32_WASIP1_THREADS_RUNNER: "wasmtime run -W bulk-memory=y -W threads=y -S threads=y --" RUSTFLAGS: --cfg tokio_unstable -Dwarnings -C target-feature=+atomics,+bulk-memory -C link-args=--max-memory=67108864 check-external-types: diff --git a/tokio/src/process/unix/orphan.rs b/tokio/src/process/unix/orphan.rs index b6ca7da23..a89555f58 100644 --- a/tokio/src/process/unix/orphan.rs +++ b/tokio/src/process/unix/orphan.rs @@ -8,6 +8,7 @@ use std::process::ExitStatus; /// An interface for waiting on a process to exit. pub(crate) trait Wait { /// Get the identifier for this process or diagnostics. + #[allow(dead_code)] fn id(&self) -> u32; /// Try waiting for a process to exit in a non-blocking manner. fn try_wait(&mut self) -> io::Result>; diff --git a/tokio/src/runtime/scheduler/multi_thread/worker.rs b/tokio/src/runtime/scheduler/multi_thread/worker.rs index f07fb8568..83e70795f 100644 --- a/tokio/src/runtime/scheduler/multi_thread/worker.rs +++ b/tokio/src/runtime/scheduler/multi_thread/worker.rs @@ -450,6 +450,7 @@ impl Launch { } fn run(worker: Arc) { + #[allow(dead_code)] struct AbortOnPanic; impl Drop for AbortOnPanic { diff --git a/tokio/src/util/markers.rs b/tokio/src/util/markers.rs index c16ebdf0b..fee1d1ccc 100644 --- a/tokio/src/util/markers.rs +++ b/tokio/src/util/markers.rs @@ -1,4 +1,5 @@ /// Marker for types that are `Sync` but not `Send` +#[allow(dead_code)] pub(crate) struct SyncNotSend(#[allow(dead_code)] *mut ()); unsafe impl Sync for SyncNotSend {}