Skip to content

Commit ee8382a

Browse files
committed
Auto merge of #150228 - matthiaskrgr:rollup-ymp54q0, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - rust-lang/rust#146377 (Don't strip shebang in expr-ctxt `include!(…)`) - rust-lang/rust#149812 (Add const default for OnceCell and OnceLock) - rust-lang/rust#149882 (miri: add -Zbinary-dep-depinfo to dependency builds) - rust-lang/rust#150009 (Enable llvm-libunwind by default for Hexagon targets) - rust-lang/rust#150035 (fix docustring on fetch_or) - rust-lang/rust#150082 (tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer case) - rust-lang/rust#150160 (Fix ICE (rust-lang/rust#149980) for invalid EII in statement position) - rust-lang/rust#150184 (mir_build: Use the same length type for `TestableCase::Slice` and `TestKind::Len`) - rust-lang/rust#150185 ([rustdoc] Add missing close tags in extern crate reexports) - rust-lang/rust#150191 (change non-canonical clone impl to {*self}, fix some doc comments) - rust-lang/rust#150203 (Drop the From derive macro from the v1 prelude) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3bfe470 + 6972951 commit ee8382a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

tests/ui.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,11 @@ fn miri_config(
133133
program: miri_path()
134134
.with_file_name(format!("cargo-miri{}", env::consts::EXE_SUFFIX)),
135135
// There is no `cargo miri build` so we just use `cargo miri run`.
136-
args: ["miri", "run"].into_iter().map(Into::into).collect(),
136+
// Add `-Zbinary-dep-depinfo` since it is needed for bootstrap builds (and doesn't harm otherwise).
137+
args: ["miri", "run", "--quiet", "-Zbinary-dep-depinfo"]
138+
.into_iter()
139+
.map(Into::into)
140+
.collect(),
137141
// Reset `RUSTFLAGS` to work around <https://github.com/rust-lang/rust/pull/119574#issuecomment-1876878344>.
138142
envs: vec![("RUSTFLAGS".into(), None)],
139143
..CommandBuilder::cargo()

0 commit comments

Comments
 (0)