Use `avoid_dev_deps` for all commands

diff --git a/src/bin/cli.rs b/src/bin/cli.rs
index b9653661efaca96301a2a0d58c54e3b756892866..1b8b1e4ac018f3493dbf0093c4d418fabffcb355 100644 (file)
--- 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 83c6acb470679899b9027e84975748091d0dee75..7f125b1516d8df9fa517fe06539c1b99be58e4f8 100644 (file)
--- 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>> {