Skip to content

Commit 1b54f6e

Browse files
committed
Touch up PR 1110
- cargo-careful bug has been fixed in 0.4.2 - move cfgs set by build scripts to cargo:rustc-check-cfg to be able to catch misuse
1 parent c9c5b9c commit 1b54f6e

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ rust_2018_idioms = "warn"
6565
single_use_lifetimes = "warn"
6666
unexpected_cfgs = { level = "warn", check-cfg = [
6767
'cfg(crossbeam_loom)',
68-
'cfg(crossbeam_no_atomic)',
6968
'cfg(crossbeam_sanitize)',
70-
'cfg(crossbeam_sanitize_thread)',
7169
] }
7270
unreachable_pub = "warn"
7371
# unsafe_op_in_unsafe_fn = "warn" # Set at crate-level instead since https://github.com/rust-lang/rust/pull/100081 is not available on MSRV

ci/careful.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ set -euxo pipefail
33
IFS=$'\n\t'
44
cd "$(dirname "$0")"/..
55

6-
# TODO: Once cargo-careful's bug (https://github.com/RalfJung/cargo-careful/issues/31) is fixed,
7-
# stop reverting back to the system's default linker, instead of rust-lld, which became the new
8-
# default on linux recently (nightly-2024-05-18 and onwards).
9-
export RUSTFLAGS="${RUSTFLAGS:-} -Z randomize-layout -Z linker-features=-lld"
6+
export RUSTFLAGS="${RUSTFLAGS:-} -Z randomize-layout"
107

118
cargo careful test --all --all-features --exclude benchmarks -- --test-threads=1

crossbeam-utils/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ include!("build-common.rs");
1717

1818
fn main() {
1919
println!("cargo:rerun-if-changed=no_atomic.rs");
20+
println!("cargo:rustc-check-cfg=cfg(crossbeam_no_atomic,crossbeam_sanitize_thread)");
2021

2122
let target = match env::var("TARGET") {
2223
Ok(target) => convert_custom_linux_target(target),

0 commit comments

Comments
 (0)