Skip to content

Commit 8011282

Browse files
author
hyd-dev
committed
[cargo-miri] Don't skip rlib crates
1 parent 7ac8be8 commit 8011282

File tree

6 files changed

+25
-9
lines changed

6 files changed

+25
-9
lines changed

cargo-miri/bin.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -596,16 +596,13 @@ fn phase_cargo_rustc(args: env::Args) {
596596
let target_crate = is_target_crate();
597597
let print = get_arg_flag_value("--print").is_some(); // whether this is cargo passing `--print` to get some infos
598598

599-
// rlib and cdylib are just skipped, we cannot interpret them and do not need them
599+
// cdylib is just skipped, we cannot interpret it and do not need it
600600
// for the rest of the build either.
601-
match get_arg_flag_value("--crate-type").as_deref() {
602-
Some("rlib") | Some("cdylib") => {
603-
if verbose {
604-
eprint!("[cargo-miri rustc] (rlib/cdylib skipped)");
605-
}
606-
return;
601+
if get_arg_flag_value("--crate-type").as_deref() == Some("cdylib") {
602+
if verbose {
603+
eprint!("[cargo-miri rustc] (cdylib skipped)");
607604
}
608-
_ => {},
605+
return;
609606
}
610607

611608
let store_json = |info: CrateRunInfo| {

test-cargo-miri/Cargo.lock

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-cargo-miri/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ edition = "2018"
99

1010
[dependencies]
1111
byteorder = "1.0"
12+
rlib-dep.path = "rlib-dep"
1213
issue_1567 = { path ="issue-1567" }
1314

1415
[dev-dependencies]

test-cargo-miri/rlib-dep/Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[package]
2+
name = "rlib-dep"
3+
version = "0.1.0"
4+
authors = ["Miri Team"]
5+
edition = "2018"
6+
7+
[lib]
8+
crate-type = ["rlib"]

test-cargo-miri/rlib-dep/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
pub fn use_me() -> bool {
2+
true
3+
}

test-cargo-miri/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
/// assert!(cargo_miri_test::make_true());
44
/// ```
55
pub fn make_true() -> bool {
6-
true
6+
rlib_dep::use_me()
77
}

0 commit comments

Comments
 (0)