Skip to content

Commit 8cec8ec

Browse files
authored
Fix check-cfg-related and rust-lld-related CI failures (#1110)
1 parent 9c59813 commit 8cec8ec

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

Cargo.toml

+6
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,11 @@ members = [
6363
missing_debug_implementations = "warn"
6464
rust_2018_idioms = "warn"
6565
single_use_lifetimes = "warn"
66+
unexpected_cfgs = { level = "warn", check-cfg = [
67+
'cfg(crossbeam_loom)',
68+
'cfg(crossbeam_no_atomic)',
69+
'cfg(crossbeam_sanitize)',
70+
'cfg(crossbeam_sanitize_thread)',
71+
] }
6672
unreachable_pub = "warn"
6773
# 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

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

6-
export RUSTFLAGS="${RUSTFLAGS:-} -Z randomize-layout"
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"
710

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

0 commit comments

Comments
 (0)