bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #3457 - RalfJung:replace-librs, r=RalfJung

Browse source 
MIRI_REPLACE_LIBRS_IF_NOT_TEST: also apply to crates.io crates

This is needed to make https://github.com/rust-lang/compiler-builtins/pull/586 work.
This commit is contained in:
bors 2024-04-10 11:04:29 +00:00
commit 788a1db8e5
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/tools/miri/cargo-miri/src/phases.rs
View file

@ -454,15 +454,10 @@ pub fn phase_rustc(mut args: impl Iterator<Item = String>, phase: RustcPhase) {
continue;
}
// If the REPLACE_LIBRS hack is enabled and we are building a `lib.rs` file, and a
// `lib.miri.rs` file exists, then build that instead. We only consider relative paths
// as cargo uses those for files in the workspace; dependencies from crates.io get
// absolute paths.
// `lib.miri.rs` file exists, then build that instead.
if replace_librs {
let path = Path::new(&arg);
if path.is_relative()
&& path.file_name().is_some_and(|f| f == "lib.rs")
&& path.is_file()
{
if path.file_name().is_some_and(|f| f == "lib.rs") && path.is_file() {
let miri_rs = Path::new(&arg).with_extension("miri.rs");
if miri_rs.is_file() {
if verbose > 0 {