From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 8 Apr 2018 11:47:35 +0000 (+0300)
Subject: Properly use unstable options for out-dir
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~87^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=53f8501286d703f033d06f53369adbbebdc403b4;p=cargo.git

Properly use unstable options for out-dir
---

diff --git a/src/bin/commands/build.rs b/src/bin/commands/build.rs
index 1b00ea4fd..70e9d3225 100644
--- a/src/bin/commands/build.rs
+++ b/src/bin/commands/build.rs
@@ -52,9 +52,9 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     let ws = args.workspace(config)?;
     let mut compile_opts = args.compile_options(config, CompileMode::Build)?;
     compile_opts.export_dir = args.value_of_path("out-dir", config);
-    if compile_opts.export_dir.is_some() && !config.cli_unstable().out_dir {
+    if compile_opts.export_dir.is_some() && !config.cli_unstable().unstable_options {
         Err(format_err!(
-            "`--out-dir` flag is unstable, pass `-Z out-dir` to enable it"
+            "`--out-dir` flag is unstable, pass `-Z unstable-options` to enable it"
         ))?;
     };
     ops::compile(&ws, &compile_opts)?;
diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs
index 0b619d804..09eff8545 100644
--- a/src/cargo/core/features.rs
+++ b/src/cargo/core/features.rs
@@ -286,7 +286,6 @@ pub struct CliUnstable {
     pub no_index_update: bool,
     pub avoid_dev_deps: bool,
     pub minimal_versions: bool,
-    pub out_dir: bool,
 }
 
 impl CliUnstable {
@@ -320,7 +319,6 @@ impl CliUnstable {
             "no-index-update" => self.no_index_update = true,
             "avoid-dev-deps" => self.avoid_dev_deps = true,
             "minimal-versions" => self.minimal_versions = true,
-            "out-dir" => self.out_dir = true,
             _ => bail!("unknown `-Z` flag specified: {}", k),
         }
 
diff --git a/tests/testsuite/out_dir.rs b/tests/testsuite/out_dir.rs
index ecb80fe67..a859c65a2 100644
--- a/tests/testsuite/out_dir.rs
+++ b/tests/testsuite/out_dir.rs
@@ -23,7 +23,7 @@ fn binary_with_debug() {
         .build();
 
     assert_that(
-        p.cargo("build -Z out-dir --out-dir out")
+        p.cargo("build -Z unstable-options --out-dir out")
             .masquerade_as_nightly_cargo(),
         execs().with_status(0),
     );
@@ -60,7 +60,7 @@ fn static_library_with_debug() {
         .build();
 
     assert_that(
-        p.cargo("build -Z out-dir --out-dir out")
+        p.cargo("build -Z unstable-options --out-dir out")
             .masquerade_as_nightly_cargo(),
         execs().with_status(0),
     );
@@ -97,7 +97,7 @@ fn dynamic_library_with_debug() {
         .build();
 
     assert_that(
-        p.cargo("build -Z out-dir --out-dir out")
+        p.cargo("build -Z unstable-options --out-dir out")
             .masquerade_as_nightly_cargo(),
         execs().with_status(0),
     );
@@ -133,7 +133,7 @@ fn rlib_with_debug() {
         .build();
 
     assert_that(
-        p.cargo("build -Z out-dir --out-dir out")
+        p.cargo("build -Z unstable-options --out-dir out")
             .masquerade_as_nightly_cargo(),
         execs().with_status(0),
     );
@@ -186,7 +186,7 @@ fn include_only_the_binary_from_the_current_package() {
         .build();
 
     assert_that(
-        p.cargo("build -Z out-dir --bin foo --out-dir out")
+        p.cargo("build -Z unstable-options --bin foo --out-dir out")
             .masquerade_as_nightly_cargo(),
         execs().with_status(0),
     );
@@ -215,7 +215,7 @@ fn out_dir_is_a_file() {
     File::create(p.root().join("out")).unwrap();
 
     assert_that(
-        p.cargo("build -Z out-dir --out-dir out")
+        p.cargo("build -Z unstable-options --out-dir out")
             .masquerade_as_nightly_cargo(),
         execs()
             .with_status(101)
@@ -239,7 +239,7 @@ fn replaces_artifacts() {
         .build();
 
     assert_that(
-        p.cargo("build -Z out-dir --out-dir out")
+        p.cargo("build -Z unstable-options --out-dir out")
             .masquerade_as_nightly_cargo(),
         execs().with_status(0),
     );
@@ -253,7 +253,7 @@ fn replaces_artifacts() {
     p.change_file("src/main.rs", r#"fn main() { println!("bar") }"#);
 
     assert_that(
-        p.cargo("build -Z out-dir --out-dir out")
+        p.cargo("build -Z unstable-options --out-dir out")
             .masquerade_as_nightly_cargo(),
         execs().with_status(0),
     );