drop CompileMode::Install; override target in exec

Author: japaric

src/bin/cargo/commands/install.rs

@@ -74,7 +74,12 @@ continuous integration systems.",
 }
 
 pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
-    let mut compile_opts = args.compile_options(config, CompileMode::Install)?;
+    let mut compile_opts = args.compile_options(config, CompileMode::Build)?;
+
+    // for `cargo-install` we want to use what the user specified via `--target` and ignore what's
+    // in `.cargo/config` and what the environment says
+    compile_opts.build_config.requested_target = args.target();
+
     compile_opts.build_config.release = !args.is_present("debug");
 
     let krates = args.values_of("crate")

src/cargo/core/compiler/build_config.rs

@@ -60,13 +60,8 @@ impl BuildConfig {
                 bail!("target was empty")
             }
         }
-        let target = if mode == CompileMode::Install {
-            // ignore `.cargo/config` when compiling for `cargo install`
-            requested_target
-        } else {
-            let cfg_target = config.get_string("build.target")?.map(|s| s.val);
-            requested_target.clone().or(cfg_target)
-        };
+        let cfg_target = config.get_string("build.target")?.map(|s| s.val);
+        let target = requested_target.clone().or(cfg_target);
 
         if jobs == Some(0) {
             bail!("jobs must be at least 1")
@@ -136,8 +131,6 @@ pub enum CompileMode {
     Doc { deps: bool },
     /// A target that will be tested with `rustdoc`.
     Doctest,
-    // Like `Build` but we are compiling something that will be installed
-    Install,
     /// A marker for Units that represent the execution of a `build.rs`
     /// script.
     RunCustomBuild,
@@ -182,7 +175,7 @@ impl CompileMode {
     /// List of all modes (currently used by `cargo clean -p` for computing
     /// all possible outputs).
     pub fn all_modes() -> &'static [CompileMode] {
-        static ALL: [CompileMode; 10] = [
+        static ALL: [CompileMode; 9] = [
             CompileMode::Test,
             CompileMode::Build,
             CompileMode::Check { test: true },
@@ -191,7 +184,6 @@ impl CompileMode {
             CompileMode::Doc { deps: true },
             CompileMode::Doc { deps: false },
             CompileMode::Doctest,
-            CompileMode::Install,
             CompileMode::RunCustomBuild,
         ];
         &ALL

src/cargo/core/profiles.rs

@@ -84,7 +84,6 @@ impl Profiles {
             CompileMode::Build
             | CompileMode::Check { .. }
             | CompileMode::Doctest
-            | CompileMode::Install
             | CompileMode::RunCustomBuild => {
                 // Note: RunCustomBuild doesn't normally use this code path.
                 // `build_unit_profiles` normally ensures that it selects the

src/cargo/ops/cargo_compile.rs

@@ -386,10 +386,7 @@ impl CompileFilter {
     pub fn need_dev_deps(&self, mode: CompileMode) -> bool {
         match mode {
             CompileMode::Test | CompileMode::Doctest | CompileMode::Bench => true,
-            CompileMode::Build
-            | CompileMode::Doc { .. }
-            | CompileMode::Check { .. }
-            | CompileMode::Install => match *self
+            CompileMode::Build | CompileMode::Doc { .. } | CompileMode::Check { .. } => match *self
             {
                 CompileFilter::Default { .. } => false,
                 CompileFilter::Only {
@@ -710,7 +707,7 @@ fn filter_default_targets(targets: &[Target], mode: CompileMode) -> Vec<&Target>
             .iter()
             .filter(|t| t.tested() || t.is_example())
             .collect(),
-        CompileMode::Build | CompileMode::Check { .. } | CompileMode::Install => targets
+        CompileMode::Build | CompileMode::Check { .. } => targets
             .iter()
             .filter(|t| t.is_bin() || t.is_lib())
             .collect(),