about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-12-06 06:25:11 +0000
committerbors <bors@rust-lang.org>2023-12-06 06:25:11 +0000
commitf7af14b6c4766674f1dfbef814e58b1d3c8f64e4 (patch)
tree9ab10f006e841614646d14c4bd256225640fe635
parentaa006a312a76279b1089fcbb344094f4c3ead85b (diff)
parentb76c57124f4f5f8e72dae0ce3fed6856c4e8d4a0 (diff)
downloadrust-f7af14b6c4766674f1dfbef814e58b1d3c8f64e4.tar.gz
rust-f7af14b6c4766674f1dfbef814e58b1d3c8f64e4.zip
Auto merge of #3213 - weihanglo:remove-cargo-unstable-options, 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
-rw-r--r--src/tools/miri/cargo-miri/src/util.rs3
-rwxr-xr-xsrc/tools/miri/test-cargo-miri/run-test.py2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/tools/miri/cargo-miri/src/util.rs b/src/tools/miri/cargo-miri/src/util.rs
index 6381a4db861..3c591268455 100644
--- a/src/tools/miri/cargo-miri/src/util.rs
+++ b/src/tools/miri/cargo-miri/src/util.rs
@@ -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) {
diff --git a/src/tools/miri/test-cargo-miri/run-test.py b/src/tools/miri/test-cargo-miri/run-test.py
index db4341169ea..21479bc4d58 100755
--- a/src/tools/miri/test-cargo-miri/run-test.py
+++ b/src/tools/miri/test-cargo-miri/run-test.py
@@ -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"},
     )