mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

also forward --manifest-path to 'cargo metadata'

Browse Source
This commit is contained in:
Ralf Jung 2022-08-06 19:31:20 -04:00
parent f0cd09814b
commit e12df0f404
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cargo-miri/src/phases.rs
View File

@ -117,6 +117,7 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
cmd.arg(cargo_cmd);
// Forward all arguments before `--` other than `--target-dir` and its value to Cargo.
// (We want to *change* the target-dir value, so we must not forward it.)
let mut target_dir = None;
for arg in ArgSplitFlagValue::new(&mut args, "--target-dir") {
match arg {

38
cargo-miri/src/util.rs
View File

@ -287,29 +287,33 @@ pub fn write_to_file(filename: &Path, content: &str) {
fs::rename(temp_filename, filename).unwrap();
}
pub fn get_cargo_metadata() -> Metadata {
// The `build.target-dir` config can be passed by `--config` flags, so forward them to
// `cargo metadata`.
let mut additional_options = Vec::new();
// Computes the extra flags that need to be passed to cargo to make it behave like the current
// cargo invocation.
fn cargo_extra_flags() -> Vec<String> {
let mut flags = Vec::new();
// `-Zunstable-options` is required by `--config`.
additional_options.push("-Zunstable-options".to_string());
flags.push("-Zunstable-options".to_string());
// Forward `--config` flags.
let config_flag = "--config";
for arg in ArgSplitFlagValue::new(
env::args().skip(3), // skip the program name, "miri" and "run" / "test"
config_flag,
)
// Only look at `Ok`
.flatten()
{
additional_options.push(config_flag.to_string());
additional_options.push(arg);
for arg in ArgFlagValueIter::new(config_flag) {
flags.push(config_flag.to_string());
flags.push(arg);
}
let metadata =
MetadataCommand::new().no_deps().other_options(additional_options).exec().unwrap();
// Forward `--manifest-path`.
let manifest_flag = "--manifest-path";
if let Some(manifest) = get_arg_flag_value(manifest_flag) {
flags.push(manifest_flag.to_string());
flags.push(manifest);
}
metadata
flags
}
pub fn get_cargo_metadata() -> Metadata {
// This will honor the `CARGO` env var the same way our `cargo()` does.
MetadataCommand::new().no_deps().other_options(cargo_extra_flags()).exec().unwrap()
}
/// Pulls all the crates in this workspace from the cargo metadata.