Skip to content

Commit

Permalink
Auto merge of rust-lang#3213 - weihanglo:remove-cargo-unstable-option…
Browse files Browse the repository at this point in the history
…s, r=RalfJung

remove unnecesary `-Zunstable-options`

AFAIK `-Zunstable-options` is for `cargo --config` CLI, which was stabilized in 1.63

https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#config-cli
  • Loading branch information
bors committed Dec 6, 2023
2 parents aa006a3 + b76c571 commit f7af14b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions src/tools/miri/cargo-miri/src/util.rs
Expand Up @@ -200,9 +200,6 @@ pub fn ask_to_run(mut cmd: Command, ask: bool, text: &str) {
// cargo invocation.
fn cargo_extra_flags() -> Vec<String> {
let mut flags = Vec::new();
// `-Zunstable-options` is required by `--config`.
flags.push("-Zunstable-options".to_string());

// Forward `--config` flags.
let config_flag = "--config";
for arg in get_arg_flag_values(config_flag) {
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/test-cargo-miri/run-test.py
Expand Up @@ -181,7 +181,7 @@ def test_cargo_miri_test():
)
del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
test("`cargo miri test` (config-cli)",
cargo_miri("test") + ["--config=build.target-dir=\"config-cli\"", "-Zunstable-options"],
cargo_miri("test") + ["--config=build.target-dir=\"config-cli\""],
default_ref, "test.stderr-empty.ref",
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
)
Expand Down

0 comments on commit f7af14b

Please sign in to comment.