refactor: Add UserIntent::Install

Author: madsmtm

src/bin/cargo/commands/install.rs

@@ -216,7 +216,7 @@ pub fn exec(gctx: &mut GlobalContext, args: &ArgMatches) -> CliResult {
 
     let mut compile_opts = args.compile_options(
         gctx,
-        UserIntent::Build,
+        UserIntent::Install,
         workspace.as_ref(),
         ProfileChecking::Custom,
     )?;

src/cargo/core/compiler/build_config.rs

@@ -301,8 +301,10 @@ impl CompileMode {
 pub enum UserIntent {
     /// Build benchmark binaries, e.g., `cargo bench`
     Bench,
-    /// Build binaries and libraries, e.g., `cargo run`, `cargo install`, `cargo build`.
+    /// Build binaries and libraries, e.g., `cargo run`, `cargo build`, `cargo rustc`.
     Build,
+    /// Build binaries and libraries for installing, e.g. `cargo install`.
+    Install,
     /// Perform type-check, e.g., `cargo check`.
     Check { test: bool },
     /// Document packages.

src/cargo/ops/cargo_compile/compile_filter.rs

@@ -219,17 +219,18 @@ impl CompileFilter {
         match intent {
             UserIntent::Test | UserIntent::Doctest | UserIntent::Bench => true,
             UserIntent::Check { test: true } => true,
-            UserIntent::Build | UserIntent::Doc { .. } | UserIntent::Check { test: false } => {
-                match *self {
-                    CompileFilter::Default { .. } => false,
-                    CompileFilter::Only {
-                        ref examples,
-                        ref tests,
-                        ref benches,
-                        ..
-                    } => examples.is_specific() || tests.is_specific() || benches.is_specific(),
-                }
-            }
+            UserIntent::Build
+            | UserIntent::Install
+            | UserIntent::Doc { .. }
+            | UserIntent::Check { test: false } => match *self {
+                CompileFilter::Default { .. } => false,
+                CompileFilter::Only {
+                    ref examples,
+                    ref tests,
+                    ref benches,
+                    ..
+                } => examples.is_specific() || tests.is_specific() || benches.is_specific(),
+            },
         }
     }
 

src/cargo/ops/cargo_compile/mod.rs

@@ -228,7 +228,11 @@ pub fn create_bcx<'a, 'gctx>(
 
     // Perform some pre-flight validation.
     match build_config.intent {
-        UserIntent::Test | UserIntent::Build | UserIntent::Check { .. } | UserIntent::Bench => {
+        UserIntent::Test
+        | UserIntent::Build
+        | UserIntent::Install
+        | UserIntent::Check { .. }
+        | UserIntent::Bench => {
             if ws.gctx().get_env("RUST_FLAGS").is_ok() {
                 gctx.shell().warn(
                     "Cargo does not read `RUST_FLAGS` environment variable. Did you mean `RUSTFLAGS`?",

src/cargo/ops/cargo_compile/unit_generator.rs

@@ -182,7 +182,7 @@ impl<'a> UnitGenerator<'a, '_> {
                 .iter()
                 .filter(|t| t.tested() || t.is_example())
                 .collect(),
-            UserIntent::Build | UserIntent::Check { .. } => targets
+            UserIntent::Build | UserIntent::Install | UserIntent::Check { .. } => targets
                 .iter()
                 .filter(|t| t.is_bin() || t.is_lib())
                 .collect(),
@@ -453,7 +453,7 @@ impl<'a> UnitGenerator<'a, '_> {
                     FilterRule::Just(_) => Target::is_test,
                 };
                 let test_mode = match self.intent {
-                    UserIntent::Build => CompileMode::Test,
+                    UserIntent::Build | UserIntent::Install => CompileMode::Test,
                     UserIntent::Check { .. } => CompileMode::Check { test: true },
                     _ => default_mode,
                 };
@@ -775,7 +775,7 @@ Rustdoc did not scrape the following examples because they require dev-dependenc
 fn to_compile_mode(intent: UserIntent) -> CompileMode {
     match intent {
         UserIntent::Test | UserIntent::Bench => CompileMode::Test,
-        UserIntent::Build => CompileMode::Build,
+        UserIntent::Build | UserIntent::Install => CompileMode::Build,
         UserIntent::Check { test } => CompileMode::Check { test },
         UserIntent::Doc { .. } => CompileMode::Doc,
         UserIntent::Doctest => CompileMode::Doctest,