Auto merge of #10766 - weihanglo:stabilize-multitarget, r=ehuss

Stabilize `-Zmultitarget`

Author: bors

src/cargo/core/compiler/compile_kind.rs

@@ -2,7 +2,7 @@ use crate::core::Target;
 use crate::util::errors::CargoResult;
 use crate::util::interning::InternedString;
 use crate::util::{Config, StableHasher};
-use anyhow::{bail, Context as _};
+use anyhow::Context as _;
 use serde::Serialize;
 use std::collections::BTreeSet;
 use std::fs;
@@ -65,9 +65,6 @@ impl CompileKind {
         };
 
         if !targets.is_empty() {
-            if targets.len() > 1 && !config.cli_unstable().multitarget {
-                bail!("specifying multiple `--target` flags requires `-Zmultitarget`")
-            }
             return dedup(targets);
         }
 

src/cargo/core/features.rs

@@ -722,6 +722,8 @@ const STABILISED_NAMESPACED_FEATURES: &str = "Namespaced features are now always
 
 const STABILIZED_TIMINGS: &str = "The -Ztimings option has been stabilized as --timings.";
 
+const STABILISED_MULTITARGET: &str = "Multiple `--target` options are now always available.";
+
 fn deserialize_build_std<'de, D>(deserializer: D) -> Result<Option<Vec<String>>, D::Error>
 where
     D: serde::Deserializer<'de>,
@@ -922,7 +924,7 @@ impl CliUnstable {
                 self.features = Some(feats);
             }
             "separate-nightlies" => self.separate_nightlies = parse_empty(k, v)?,
-            "multitarget" => self.multitarget = parse_empty(k, v)?,
+            "multitarget" => stabilized_warn(k, "1.64", STABILISED_MULTITARGET),
             "rustdoc-map" => self.rustdoc_map = parse_empty(k, v)?,
             "terminal-width" => self.terminal_width = Some(parse_usize_opt(v)?),
             "sparse-registry" => self.sparse_registry = parse_empty(k, v)?,

src/cargo/util/config/mod.rs

@@ -2248,13 +2248,7 @@ impl BuildTargetConfig {
         };
         let values = match &self.inner.val {
             BuildTargetConfigInner::One(s) => vec![map(s)],
-            BuildTargetConfigInner::Many(v) => {
-                if !config.cli_unstable().multitarget {
-                    bail!("specifying an array in `build.target` config value requires `-Zmultitarget`")
-                } else {
-                    v.iter().map(map).collect()
-                }
-            }
+            BuildTargetConfigInner::Many(v) => v.iter().map(map).collect(),
         };
         Ok(values)
     }

src/doc/man/cargo-bench.md

@@ -1,6 +1,7 @@
 # cargo-bench(1)
 {{*set actionverb="Benchmark"}}
 {{*set nouns="benchmarks"}}
+{{*set multitarget=true}}
 
 ## NAME
 

src/doc/man/cargo-build.md

@@ -1,5 +1,6 @@
 # cargo-build(1)
 {{*set actionverb="Build"}}
+{{*set multitarget=true}}
 
 ## NAME
 

src/doc/man/cargo-check.md

@@ -1,5 +1,6 @@
 # cargo-check(1)
 {{*set actionverb="Check"}}
+{{*set multitarget=true}}
 
 ## NAME
 

src/doc/man/cargo-clean.md

@@ -1,5 +1,6 @@
 # cargo-clean(1)
 {{*set actionverb="Clean"}}
+{{*set multitarget=true}}
 
 ## NAME
 

src/doc/man/cargo-doc.md

@@ -1,5 +1,6 @@
 # cargo-doc(1)
 {{*set actionverb="Document"}}
+{{*set multitarget=true}}
 
 ## NAME
 

src/doc/man/cargo-fetch.md

@@ -1,6 +1,7 @@
 # cargo-fetch(1)
 {{*set actionverb="Fetch"}}
 {{*set target-default-to-all-arch=true}}
+{{*set multitarget=true}}
 
 ## NAME
 

src/doc/man/cargo-fix.md

@@ -1,5 +1,6 @@
 # cargo-fix(1)
 {{*set actionverb="Fix"}}
+{{*set multitarget=true}}
 
 ## NAME