tokio: fix remaining issues about atomic_u64_static_once_cell.rs (#5374)

Fixes #5373
Closes #5358 

- Add check for no_atomic_u64 & no_const_mutex_new (condition to atomic_u64_static_once_cell.rs is compiled)
- Allow unused_imports in TARGET_ATOMIC_U64_PROBE. I also tested other *_PROBE and found no other errors triggered by -D warning.
- Fix cfg of util::once_cell module
This commit is contained in:
Taiki Endo
2023-01-14 11:11:05 -08:00
committed by GitHub
parent c390a62387
commit 40782efb76
3 changed files with 18 additions and 2 deletions
+10
View File
@@ -300,6 +300,8 @@ jobs:
with: with:
toolchain: ${{ env.rust_nightly }} toolchain: ${{ env.rust_nightly }}
components: rust-src components: rust-src
- name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack
# Install linker and libraries for i686-unknown-linux-gnu # Install linker and libraries for i686-unknown-linux-gnu
- uses: taiki-e/setup-cross-toolchain-action@v1 - uses: taiki-e/setup-cross-toolchain-action@v1
with: with:
@@ -307,6 +309,14 @@ jobs:
- run: cargo test -Zbuild-std --target target-specs/i686-unknown-linux-gnu.json -p tokio --all-features - run: cargo test -Zbuild-std --target target-specs/i686-unknown-linux-gnu.json -p tokio --all-features
env: env:
RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_atomic_u64 RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_atomic_u64
# https://github.com/tokio-rs/tokio/pull/5356
# https://github.com/tokio-rs/tokio/issues/5373
- run: cargo hack build -p tokio --feature-powerset --depth 2 -Z avoid-dev-deps --keep-going
env:
RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_atomic_u64 --cfg tokio_no_const_mutex_new
- run: cargo hack build -p tokio --feature-powerset --depth 2 -Z avoid-dev-deps --keep-going
env:
RUSTFLAGS: --cfg tokio_unstable -Dwarnings --cfg tokio_no_atomic_u64
features: features:
name: features name: features
+1
View File
@@ -33,6 +33,7 @@ const TARGET_HAS_ATOMIC_PROBE: &str = r#"
const TARGET_ATOMIC_U64_PROBE: &str = r#" const TARGET_ATOMIC_U64_PROBE: &str = r#"
{ {
#[allow(unused_imports)]
use std::sync::atomic::AtomicU64 as _; use std::sync::atomic::AtomicU64 as _;
} }
"#; "#;
+6 -1
View File
@@ -6,7 +6,12 @@ cfg_io_driver! {
#[cfg(feature = "rt")] #[cfg(feature = "rt")]
pub(crate) mod atomic_cell; pub(crate) mod atomic_cell;
#[cfg(any(feature = "rt", feature = "signal", feature = "process"))] #[cfg(any(
feature = "rt",
feature = "signal",
feature = "process",
tokio_no_const_mutex_new,
))]
pub(crate) mod once_cell; pub(crate) mod once_cell;
#[cfg(any( #[cfg(any(