Skip to content

Commit 089c7e8

Browse files
committed
Auto merge of #1002 - RalfJung:workspace, r=RalfJung
better error when using cargo-miri in a workspace
2 parents b20ea83 + 2967d0d commit 089c7e8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/bin/cargo-miri.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ fn list_targets() -> impl Iterator<Item=cargo_metadata::Target> {
9191
let mut metadata = if let Ok(metadata) = cmd.exec() {
9292
metadata
9393
} else {
94-
show_error(format!("Could not obtain Cargo metadata"));
94+
show_error(format!("Could not obtain Cargo metadata; likely an ill-formed manifest"));
9595
};
9696

9797
let current_dir = std::env::current_dir();
@@ -113,7 +113,7 @@ fn list_targets() -> impl Iterator<Item=cargo_metadata::Target> {
113113
package_manifest_directory == current_dir
114114
}
115115
})
116-
.expect("could not find matching package");
116+
.unwrap_or_else(|| show_error(format!("This seems to be a workspace, which is not supported by cargo-miri")));
117117
let package = metadata.packages.remove(package_index);
118118

119119
// Finally we got the list of targets to build

0 commit comments

Comments
 (0)