Re-do: Progress on #9451

Cargo.toml

@@ -47,6 +47,7 @@ num_cpus = "1.0"
 opener = "0.5"
 os_info = "3.0.7"
 percent-encoding = "2.0"
+regex = "1" # Issue 9451
 rustfix = "0.6.0"
 semver = { version = "1.0.3", features = ["serde"] }
 serde = { version = "1.0.123", features = ["derive"] }

ci/validate-man.sh

@@ -2,7 +2,6 @@
 # This script validates that there aren't any changes to the man pages.
 
 set -e
-
 cd src/doc
 
 changes=$(git status --porcelain)

src/cargo/core/compiler/build_config.rs

@@ -57,6 +57,7 @@ impl BuildConfig {
         mode: CompileMode,
     ) -> CargoResult<BuildConfig> {
         let cfg = config.build_config()?;
+
         let requested_kinds = CompileKind::from_requested_targets(config, requested_targets)?;
         if jobs == Some(0) {
             anyhow::bail!("jobs must be at least 1")
@@ -105,6 +106,10 @@ impl BuildConfig {
             _ => bail!("only one `--target` argument is supported"),
         }
     }
+
+    pub fn set_requested_kind_at(&mut self, k: CompileKind, idx: usize) {
+        self.requested_kinds[idx] = k;
+    }
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]

src/cargo/lib.rs

@@ -17,6 +17,9 @@ use std::fmt;
 pub use crate::util::errors::{InternalError, VerboseError};
 pub use crate::util::{indented_lines, CargoResult, CliError, CliResult, Config};
 
+// Tests
+pub use crate::ops::{PerPackageTarget, PerPackageTargetMode};
+
 pub const CARGO_ENV: &str = "CARGO";
 
 #[macro_use]