diff --git a/crossbeam-epoch/Cargo.toml b/crossbeam-epoch/Cargo.toml index 2a70e05f0..4065564bf 100644 --- a/crossbeam-epoch/Cargo.toml +++ b/crossbeam-epoch/Cargo.toml @@ -46,7 +46,7 @@ scopeguard = { version = "1.1", default-features = false } # NOTE: This feature is outside of the normal semver guarantees and minor or # patch versions of crossbeam may make breaking changes to them at any time. [target.'cfg(crossbeam_loom)'.dependencies] -loom-crate = { package = "loom", version = "0.6", optional = true } +loom-crate = { package = "loom", version = "0.7", optional = true } [dependencies.crossbeam-utils] version = "0.8.5" diff --git a/crossbeam-epoch/src/lib.rs b/crossbeam-epoch/src/lib.rs index 5202c98fb..b7258f0e5 100644 --- a/crossbeam-epoch/src/lib.rs +++ b/crossbeam-epoch/src/lib.rs @@ -76,7 +76,6 @@ mod primitive { } pub(crate) mod sync { pub(crate) mod atomic { - use core::sync::atomic::Ordering; pub(crate) use loom::sync::atomic::{fence, AtomicPtr, AtomicUsize}; // FIXME: loom does not support compiler_fence at the moment. @@ -94,7 +93,6 @@ mod primitive { #[cfg(not(crossbeam_loom))] #[allow(unused_imports, dead_code)] mod primitive { - #[cfg(feature = "alloc")] pub(crate) mod cell { #[derive(Debug)] #[repr(transparent)] @@ -122,13 +120,11 @@ mod primitive { } } } - #[cfg(feature = "alloc")] pub(crate) mod sync { pub(crate) mod atomic { - pub(crate) use core::sync::atomic::compiler_fence; - pub(crate) use core::sync::atomic::fence; - pub(crate) use core::sync::atomic::{AtomicPtr, AtomicUsize}; + pub(crate) use core::sync::atomic::{compiler_fence, fence, AtomicPtr, AtomicUsize}; } + #[cfg(feature = "alloc")] pub(crate) use alloc::sync::Arc; } diff --git a/crossbeam-utils/Cargo.toml b/crossbeam-utils/Cargo.toml index 3d437a1bb..a110da24e 100644 --- a/crossbeam-utils/Cargo.toml +++ b/crossbeam-utils/Cargo.toml @@ -29,7 +29,7 @@ cfg-if = "1" # NOTE: This feature is outside of the normal semver guarantees and minor or # patch versions of crossbeam may make breaking changes to them at any time. [target.'cfg(crossbeam_loom)'.dependencies] -loom = { version = "0.6", optional = true } +loom = { version = "0.7", optional = true } [dev-dependencies] rand = "0.8"