From cafb65701e6980aa2b169721bff5dfff404d08a3 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 5 May 2024 11:34:07 +0200 Subject: [PATCH] rustup --- run-test.sh | 5 +++++ rust-version | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/run-test.sh b/run-test.sh index 4f5ba0e..8966a03 100755 --- a/run-test.sh +++ b/run-test.sh @@ -39,6 +39,11 @@ cp "$MIRI_LIB_SRC/../Cargo.lock" Cargo.lock # is just a re-export of the sysroot crate, so we don't get duplicate lang items. export MIRI_REPLACE_LIBRS_IF_NOT_TEST=1 +# core and std contain some modules that are also crates, so the feature flags are a bit all over +# the place and we disable feature flag checking. (This matches what bootstrap does.) +export RUSTFLAGS="--check-cfg=cfg(feature,values(any())) ${RUSTFLAGS:-}" +export RUSTDOCFLAGS="--check-cfg=cfg(feature,values(any())) ${RUSTDOCFLAGS:-}" + # run test export CARGO_TARGET_DIR=$(pwd)/target cargo miri test --manifest-path "library/$CRATE/Cargo.toml" "$@" diff --git a/rust-version b/rust-version index 514aef6..e50f8f6 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -nightly-2024-05-01 +nightly-2024-05-05