From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 12 Mar 2018 20:20:12 +0000 (+0300)
Subject: Use `avoid_dev_deps` for all commands
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~47^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f2f062c29abdcaa4eb294c0c773006e8f3b93dfc;p=cargo.git

Use `avoid_dev_deps` for all commands
---

diff --git a/src/bin/cli.rs b/src/bin/cli.rs
index b9653661e..1b8b1e4ac 100644
--- a/src/bin/cli.rs
+++ b/src/bin/cli.rs
@@ -110,9 +110,6 @@ fn execute_subcommand(config: &mut Config, args: ArgMatches) -> CliResult {
         }
         ("build", Some(args)) => {
             let mut ws = args.workspace(config)?;
-            if config.cli_unstable().avoid_dev_deps {
-                ws.set_require_optional_deps(false);
-            }
             let compile_opts = args.compile_options(config, CompileMode::Build)?;
             ops::compile(&ws, &compile_opts)?;
             Ok(())
diff --git a/src/bin/command_prelude.rs b/src/bin/command_prelude.rs
index 83c6acb47..7f125b151 100644
--- a/src/bin/command_prelude.rs
+++ b/src/bin/command_prelude.rs
@@ -190,7 +190,11 @@ pub trait ArgMatchesExt {
 
     fn workspace<'a>(&self, config: &'a Config) -> CargoResult<Workspace<'a>> {
         let root = self.root_manifest(config)?;
-        Workspace::new(&root, config)
+        let mut ws = Workspace::new(&root, config)?;
+        if config.cli_unstable().avoid_dev_deps {
+            ws.set_require_optional_deps(false);
+        }
+        Ok(ws)
     }
 
     fn jobs(&self) -> CargoResult<Option<u32>> {