Replace sanitize feature with cfg(crossbeam_sanitize)

Feature flag can be accidentally enabled by --all-features, so use cfg instead.
crossbeam-rs · Jan 4, 2021 · dcdf02b · dcdf02b
1 parent d6ab297
commit dcdf02b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/ci/crossbeam-epoch-loom.sh b/ci/crossbeam-epoch-loom.sh
@@ -3,9 +3,9 @@
 cd "$(dirname "$0")"/../crossbeam-epoch
 set -ex
 
-export RUSTFLAGS="-D warnings --cfg=loom_crossbeam"
+export RUSTFLAGS="-D warnings --cfg loom_crossbeam --cfg crossbeam_sanitize"
 
 # With MAX_PREEMPTIONS=2 the loom tests (currently) take around 11m.
 # If we were to run with =3, they would take several times that,
 # which is probably too costly for CI.
-env LOOM_MAX_PREEMPTIONS=2 cargo test --test loom --features sanitize --release -- --nocapture
+env LOOM_MAX_PREEMPTIONS=2 cargo test --test loom --release -- --nocapture
diff --git a/ci/test.sh b/ci/test.sh
@@ -28,20 +28,23 @@ if [[ "$RUST_VERSION" == "nightly"* ]]; then
     cargo check --all --benches
     cd crossbeam-channel/benchmarks
     cargo check --bins
-    cd ..
+    cd ../..
 
     # Run address sanitizer on crossbeam-epoch
     # Note: this will be significantly rewritten by https://github.com/crossbeam-rs/crossbeam/pull/591.
     if [[ "$OSTYPE" == "linux"* ]]; then
         cd crossbeam-epoch
         cargo clean
 
+        # TODO: Once `cfg(sanitize = "..")` is stable, replace
+        # `cfg(crossbeam_sanitize)` with `cfg(sanitize = "..")` and remove
+        # `--cfg crossbeam_sanitize`.
         ASAN_OPTIONS="detect_odr_violation=0 detect_leaks=0" \
-        RUSTFLAGS="-Z sanitizer=address" \
+        RUSTFLAGS="-Z sanitizer=address --cfg crossbeam_sanitize" \
         cargo run \
             --release \
             --target x86_64-unknown-linux-gnu \
-            --features sanitize,nightly \
+            --features nightly \
             --example sanitize
 
         cd ..

diff --git a/crossbeam-epoch/Cargo.toml b/crossbeam-epoch/Cargo.toml
@@ -33,9 +33,6 @@ alloc = []
 # of crossbeam may make breaking changes to them at any time.
 nightly = ["crossbeam-utils/nightly", "const_fn"]
 
-# TODO: docs
-sanitize = [] # Makes it more likely to trigger any potential data races.
-
 [dependencies]
 cfg-if = "1"
 const_fn = { version = "0.4.4", optional = true }

diff --git a/crossbeam-epoch/src/internal.rs b/crossbeam-epoch/src/internal.rs
@@ -55,9 +55,9 @@ use crate::sync::list::{Entry, IsElement, IterError, List};
 use crate::sync::queue::Queue;
 
 /// Maximum number of objects a bag can contain.
-#[cfg(not(feature = "sanitize"))]
+#[cfg(not(crossbeam_sanitize))]
 const MAX_OBJECTS: usize = 62;
-#[cfg(feature = "sanitize")]
+#[cfg(crossbeam_sanitize)]
 const MAX_OBJECTS: usize = 4;
 
 /// A bag of deferred functions.
@@ -109,7 +109,7 @@ impl Default for Bag {
     #[rustfmt::skip]
     fn default() -> Self {
         // TODO: [no_op; MAX_OBJECTS] syntax blocked by https://github.com/rust-lang/rust/issues/49147
-        #[cfg(not(feature = "sanitize"))]
+        #[cfg(not(crossbeam_sanitize))]
         return Bag {
             len: 0,
             deferreds: [
@@ -177,7 +177,7 @@ impl Default for Bag {
                 Deferred::new(no_op_func),
             ],
         };
-        #[cfg(feature = "sanitize")]
+        #[cfg(crossbeam_sanitize)]
         return Bag {
             len: 0,
             deferreds: [
@@ -278,7 +278,7 @@ impl Global {
     pub(crate) fn collect(&self, guard: &Guard) {
         let global_epoch = self.try_advance(guard);
 
-        let steps = if cfg!(feature = "sanitize") {
+        let steps = if cfg!(crossbeam_sanitize) {
             usize::max_value()
         } else {
             Self::COLLECT_STEPS