diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4bf03933..88636d863 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -439,9 +439,6 @@ jobs: - target: armv7-unknown-linux-gnueabihf - target: aarch64-unknown-linux-gnu rustflags: --cfg tokio_taskdump - - # Run a platform without AtomicU64 and no const Mutex::new - - target: armv5te-unknown-linux-gnueabi steps: - uses: actions/checkout@v3 - name: Install Rust stable @@ -464,10 +461,10 @@ jobs: run: | set -euxo pipefail cargo nextest run -p tokio --all-features --target ${{ matrix.target }} - cargo test --doc -p tokio --all-features --target ${{ matrix.target }} -- --test-threads 1 + cargo test --doc -p tokio --all-features --target ${{ matrix.target }} env: RUST_TEST_THREADS: 1 - RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_ipv6 --cfg tokio_no_tuning_tests ${{ matrix.rustflags }} + RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_tuning_tests ${{ matrix.rustflags }} cross-test-without-parking_lot: needs: basics @@ -481,9 +478,6 @@ jobs: - target: armv7-unknown-linux-gnueabihf - target: aarch64-unknown-linux-gnu rustflags: --cfg tokio_taskdump - - # Run a platform without AtomicU64 and no const Mutex::new - - target: armv5te-unknown-linux-gnueabi steps: - uses: actions/checkout@v3 - name: Install Rust stable @@ -510,10 +504,10 @@ jobs: run: | set -euxo pipefail cargo nextest run -p tokio --features full,test-util --target ${{ matrix.target }} - cargo test --doc -p tokio --features full,test-util --target ${{ matrix.target }} -- --test-threads 1 + cargo test --doc -p tokio --features full,test-util --target ${{ matrix.target }} env: RUST_TEST_THREADS: 1 - RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_ipv6 --cfg tokio_no_parking_lot --cfg tokio_no_tuning_tests ${{ matrix.rustflags }} + RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_parking_lot --cfg tokio_no_tuning_tests ${{ matrix.rustflags }} # See https://github.com/tokio-rs/tokio/issues/5187 no-atomic-u64-test: @@ -541,10 +535,10 @@ jobs: - name: test tokio --all-features run: | cargo nextest run -Zbuild-std --target target-specs/i686-unknown-linux-gnu.json -p tokio --all-features - cargo test --doc -Zbuild-std --target target-specs/i686-unknown-linux-gnu.json -p tokio --all-features -- --test-threads 1 + cargo test --doc -Zbuild-std --target target-specs/i686-unknown-linux-gnu.json -p tokio --all-features env: RUST_TEST_THREADS: 1 - RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings --cfg tokio_no_atomic_u64 --cfg tokio_no_tuning_tests + RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings --cfg tokio_no_tuning_tests no-atomic-u64-check: name: Check tokio --feature-powerset --depth 2 on i686-unknown-linux-gnu without AtomicU64 @@ -566,10 +560,10 @@ jobs: # https://github.com/tokio-rs/tokio/pull/5356 # https://github.com/tokio-rs/tokio/issues/5373 - - name: Check with const_mutex_new - run: cargo hack check -p tokio --feature-powerset --depth 2 --keep-going + - name: Check + run: cargo hack check -Zbuild-std --target target-specs/i686-unknown-linux-gnu.json -p tokio --feature-powerset --depth 2 --keep-going env: - RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings --cfg tokio_no_atomic_u64 + RUSTFLAGS: --cfg tokio_unstable --cfg tokio_taskdump -Dwarnings features: name: features ${{ matrix.name }} @@ -823,7 +817,7 @@ jobs: with: toolchain: ${{ env.rust_stable }} - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh + uses: taiki-e/install-action@wasm-pack - uses: Swatinem/rust-cache@v2 - name: test tokio diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 28824cff6..bb392bdf9 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -4,6 +4,10 @@ on: # See .github/labeler.yml file +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + permissions: contents: read diff --git a/.github/workflows/loom.yml b/.github/workflows/loom.yml index 3952dfe5d..efd0eb326 100644 --- a/.github/workflows/loom.yml +++ b/.github/workflows/loom.yml @@ -7,6 +7,10 @@ on: name: Loom +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + env: RUSTFLAGS: -Dwarnings --cfg loom --cfg tokio_unstable -C debug_assertions LOOM_MAX_PREEMPTIONS: 2 diff --git a/.github/workflows/pr-audit.yml b/.github/workflows/pr-audit.yml index d6f798292..892cb0cfa 100644 --- a/.github/workflows/pr-audit.yml +++ b/.github/workflows/pr-audit.yml @@ -8,6 +8,10 @@ on: paths: - '**/Cargo.toml' +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + permissions: contents: read diff --git a/.github/workflows/stress-test.yml b/.github/workflows/stress-test.yml index 5bd1fcd7d..1c21bc914 100644 --- a/.github/workflows/stress-test.yml +++ b/.github/workflows/stress-test.yml @@ -5,6 +5,10 @@ on: branches: - master +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + env: RUSTFLAGS: -Dwarnings RUST_BACKTRACE: 1 diff --git a/tokio/src/loom/std/parking_lot.rs b/tokio/src/loom/std/parking_lot.rs index e3af258d1..9b9a81d35 100644 --- a/tokio/src/loom/std/parking_lot.rs +++ b/tokio/src/loom/std/parking_lot.rs @@ -52,8 +52,7 @@ impl Mutex { } #[inline] - #[cfg(all(feature = "parking_lot", not(all(loom, test))))] - #[cfg_attr(docsrs, doc(cfg(all(feature = "parking_lot",))))] + #[cfg(not(all(loom, test)))] pub(crate) const fn const_new(t: T) -> Mutex { Mutex(PhantomData, parking_lot::const_mutex(t)) } diff --git a/tokio/src/macros/cfg.rs b/tokio/src/macros/cfg.rs index 2862e1f55..443cc14b3 100644 --- a/tokio/src/macros/cfg.rs +++ b/tokio/src/macros/cfg.rs @@ -523,7 +523,7 @@ macro_rules! cfg_not_coop { macro_rules! cfg_has_atomic_u64 { ($($item:item)*) => { $( - #[cfg(all(target_has_atomic = "64", not(tokio_no_atomic_u64)))] + #[cfg(target_has_atomic = "64")] $item )* } @@ -532,7 +532,7 @@ macro_rules! cfg_has_atomic_u64 { macro_rules! cfg_not_has_atomic_u64 { ($($item:item)*) => { $( - #[cfg(any(not(target_has_atomic = "64"), tokio_no_atomic_u64))] + #[cfg(not(target_has_atomic = "64"))] $item )* } diff --git a/tokio/tests/tcp_connect.rs b/tokio/tests/tcp_connect.rs index 03f7b34ff..269ba8ef6 100644 --- a/tokio/tests/tcp_connect.rs +++ b/tokio/tests/tcp_connect.rs @@ -35,7 +35,6 @@ async fn connect_v4() { } #[tokio::test] -#[cfg(not(tokio_no_ipv6))] async fn connect_v6() { let srv = assert_ok!(TcpListener::bind("[::1]:0").await); let addr = assert_ok!(srv.local_addr()); diff --git a/tokio/tests/tcp_socket.rs b/tokio/tests/tcp_socket.rs index b431196f1..faead95c0 100644 --- a/tokio/tests/tcp_socket.rs +++ b/tokio/tests/tcp_socket.rs @@ -24,7 +24,6 @@ async fn basic_usage_v4() { } #[tokio::test] -#[cfg(not(tokio_no_ipv6))] async fn basic_usage_v6() { // Create server let addr = assert_ok!("[::1]:0".parse());