Expose CompileMode in command_prelude

diff --git a/src/bin/cargo/command_prelude.rs b/src/bin/cargo/command_prelude.rs
index 8157dcdb4ee730e12c2bde56a4dc2ddf17884062..3f98f9ea482971b4debdfda40abc3f127b7daea7 100644 (file)
--- 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 83e3ab5af5383cc02a38fb6cfe61c1bbba1d987f..69a23762991e05f4cf36557d61f777f00a6ecb28 100644 (file)
--- 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 0ab86aa3a3a8721ffd0ed1765294954db721da60..5dbc3850a4e638439389194f889182791c7191c3 100644 (file)
--- 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 e4295c5c32be3337caf7284729b2a93db9c058f1..72cebfda8f4bc0c702559508208e9b36f17695d7 100644 (file)
--- 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 54ba9679794b3dd93117340997fbc24f41e933cf..7bb19fd5ed9b126ba65a00b8fda3eff93100451f 100644 (file)
--- 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 0acdd0269f90486a142a9205da6c97f1752c7e6a..4ddd6af12f906e87f22dafc12ec0cfb44b1125b0 100644 (file)
--- 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 763263d5a4b63167d0cfff7311c417a0649a608b..683b47b885c3fd828eda62c726097f4c06c89cea 100644 (file)
--- 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 35fb59e8e12e4017531f1ef409367ee4144b0f7a..a5ca4deff0299f4923d67666bf13a8bd281caa29 100644 (file)
--- 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 301e65449b85c6d12bb6be785b5b7f60770f7e8c..194eaaef82a30eb21603d2940053c293ccd59230 100644 (file)
--- 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 a25f62f8ec30f6eb99604d2d296968efb3901c90..6d7e1289ae89a2fd17b0bf1489d6d7b9b33ae9f0 100644 (file)
--- 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(),