Fix after rebase

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index 7ab09bd0114378a48c69a7ef0e38d506bbd407c2..59ff6bb9169008a1218b7daa08c838563118894f 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -14,7 +14,7 @@ use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
 
-use cargo::core::shell::{Shell, Verbosity};
+use cargo::core::shell::Shell;
 use cargo::util::{self, CliResult, lev_distance, Config, CargoResult};
 use cargo::util::{CliError, ProcessError};
 

diff --git a/src/bin/cli/mod.rs b/src/bin/cli/mod.rs
index be3dc200e204fecbe6582bf6437e758025b0d373..0b18d0a8b191bc20c3260ce2c13f6d3a809dfbd6 100644 (file)
--- a/src/bin/cli/mod.rs
+++ b/src/bin/cli/mod.rs
@@ -106,7 +106,7 @@ fn execute_subcommand(config: &mut Config, args: ArgMatches) -> CliResult {
             }
         }
         ("build", Some(args)) => {
-            let ws = workspace_from_args(config, args)?;
+            let mut ws = workspace_from_args(config, args)?;
             if config.cli_unstable().avoid_dev_deps {
                 ws.set_require_optional_deps(false);
             }