From 293a2a7fab84a5ee63b8a769a7e8754e3a8814d9 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Sat, 14 Apr 2018 10:47:58 +0200
Subject: [PATCH] Expose CompileMode in command_prelude

---
 src/bin/cargo/command_prelude.rs  | 3 ++-
 src/bin/cargo/commands/bench.rs   | 2 +-
 src/bin/cargo/commands/build.rs   | 2 +-
 src/bin/cargo/commands/check.rs   | 2 +-
 src/bin/cargo/commands/doc.rs     | 2 +-
 src/bin/cargo/commands/install.rs | 2 +-
 src/bin/cargo/commands/run.rs     | 2 +-
 src/bin/cargo/commands/rustc.rs   | 2 +-
 src/bin/cargo/commands/rustdoc.rs | 2 +-
 src/bin/cargo/commands/test.rs    | 4 ++--
 10 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/bin/cargo/command_prelude.rs b/src/bin/cargo/command_prelude.rs
index 8157dcdb4..3f98f9ea4 100644
--- a/src/bin/cargo/command_prelude.rs
+++ b/src/bin/cargo/command_prelude.rs
@@ -5,12 +5,13 @@ use clap::{self, SubCommand};
 use cargo::CargoResult;
 use cargo::core::Workspace;
 use cargo::core::compiler::MessageFormat;
-use cargo::ops::{CompileFilter, CompileMode, CompileOptions, NewOptions, Packages, VersionControl};
+use cargo::ops::{CompileFilter, CompileOptions, NewOptions, Packages, VersionControl};
 use cargo::util::paths;
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
 pub use clap::{AppSettings, Arg, ArgMatches};
 pub use cargo::{CliError, CliResult, Config};
+pub use cargo::ops::CompileMode;
 
 pub type App = clap::App<'static, 'static>;
 
diff --git a/src/bin/cargo/commands/bench.rs b/src/bin/cargo/commands/bench.rs
index 83e3ab5af..69a237629 100644
--- a/src/bin/cargo/commands/bench.rs
+++ b/src/bin/cargo/commands/bench.rs
@@ -1,6 +1,6 @@
 use command_prelude::*;
 
-use cargo::ops::{self, CompileMode, TestOptions};
+use cargo::ops::{self, TestOptions};
 
 pub fn cli() -> App {
     subcommand("bench")
diff --git a/src/bin/cargo/commands/build.rs b/src/bin/cargo/commands/build.rs
index 0ab86aa3a..5dbc3850a 100644
--- a/src/bin/cargo/commands/build.rs
+++ b/src/bin/cargo/commands/build.rs
@@ -1,6 +1,6 @@
 use command_prelude::*;
 
-use cargo::ops::{self, CompileMode};
+use cargo::ops;
 
 pub fn cli() -> App {
     subcommand("build")
diff --git a/src/bin/cargo/commands/check.rs b/src/bin/cargo/commands/check.rs
index e4295c5c3..72cebfda8 100644
--- a/src/bin/cargo/commands/check.rs
+++ b/src/bin/cargo/commands/check.rs
@@ -1,6 +1,6 @@
 use command_prelude::*;
 
-use cargo::ops::{self, CompileMode};
+use cargo::ops;
 
 pub fn cli() -> App {
     subcommand("check")
diff --git a/src/bin/cargo/commands/doc.rs b/src/bin/cargo/commands/doc.rs
index 54ba96797..7bb19fd5e 100644
--- a/src/bin/cargo/commands/doc.rs
+++ b/src/bin/cargo/commands/doc.rs
@@ -1,6 +1,6 @@
 use command_prelude::*;
 
-use cargo::ops::{self, CompileMode, DocOptions};
+use cargo::ops::{self, DocOptions};
 
 pub fn cli() -> App {
     subcommand("doc")
diff --git a/src/bin/cargo/commands/install.rs b/src/bin/cargo/commands/install.rs
index 0acdd0269..4ddd6af12 100644
--- a/src/bin/cargo/commands/install.rs
+++ b/src/bin/cargo/commands/install.rs
@@ -1,7 +1,7 @@
 use command_prelude::*;
 
 use cargo::core::{GitReference, SourceId};
-use cargo::ops::{self, CompileMode};
+use cargo::ops;
 use cargo::util::ToUrl;
 
 pub fn cli() -> App {
diff --git a/src/bin/cargo/commands/run.rs b/src/bin/cargo/commands/run.rs
index 763263d5a..683b47b88 100644
--- a/src/bin/cargo/commands/run.rs
+++ b/src/bin/cargo/commands/run.rs
@@ -1,7 +1,7 @@
 use command_prelude::*;
 
 use cargo::core::Verbosity;
-use cargo::ops::{self, CompileFilter, CompileMode};
+use cargo::ops::{self, CompileFilter};
 
 pub fn cli() -> App {
     subcommand("run")
diff --git a/src/bin/cargo/commands/rustc.rs b/src/bin/cargo/commands/rustc.rs
index 35fb59e8e..a5ca4deff 100644
--- a/src/bin/cargo/commands/rustc.rs
+++ b/src/bin/cargo/commands/rustc.rs
@@ -1,6 +1,6 @@
 use command_prelude::*;
 
-use cargo::ops::{self, CompileMode};
+use cargo::ops;
 
 pub fn cli() -> App {
     subcommand("rustc")
diff --git a/src/bin/cargo/commands/rustdoc.rs b/src/bin/cargo/commands/rustdoc.rs
index 301e65449..194eaaef8 100644
--- a/src/bin/cargo/commands/rustdoc.rs
+++ b/src/bin/cargo/commands/rustdoc.rs
@@ -1,6 +1,6 @@
 use command_prelude::*;
 
-use cargo::ops::{self, CompileMode, DocOptions};
+use cargo::ops::{self, DocOptions};
 
 pub fn cli() -> App {
     subcommand("rustdoc")
diff --git a/src/bin/cargo/commands/test.rs b/src/bin/cargo/commands/test.rs
index a25f62f8e..6d7e1289a 100644
--- a/src/bin/cargo/commands/test.rs
+++ b/src/bin/cargo/commands/test.rs
@@ -1,6 +1,6 @@
 use command_prelude::*;
 
-use cargo::ops::{self, CompileMode};
+use cargo::ops;
 
 pub fn cli() -> App {
     subcommand("test")
@@ -94,7 +94,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     let mut compile_opts = args.compile_options(config, CompileMode::Test)?;
     let doc = args.is_present("doc");
     if doc {
-        compile_opts.mode = ops::CompileMode::Doctest;
+        compile_opts.mode = CompileMode::Doctest;
         compile_opts.filter = ops::CompileFilter::new(
             true,
             Vec::new(),
-- 
2.30.2