From 901065f515b10e784fae76cb19f4ff5718f5b084 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 8 Mar 2018 23:33:52 +0300
Subject: [PATCH] Fix after rebase

---
 src/bin/cargo.rs   | 2 +-
 src/bin/cli/mod.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index 7ab09bd01..59ff6bb91 100644
--- 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 be3dc200e..0b18d0a8b 100644
--- 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);
             }
-- 
2.30.2