Merge branch 'master' into stabilize-crate-type

Author: ehuss

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/ops/vendor.rs

@@ -60,7 +60,7 @@ struct VendorConfig {
 #[serde(rename_all = "lowercase", untagged)]
 enum VendorSource {
     Directory {
-        directory: PathBuf,
+        directory: String,
     },
     Registry {
         registry: Option<String>,
@@ -298,7 +298,10 @@ fn sync(
         config.insert(
             merged_source_name.to_string(),
             VendorSource::Directory {
-                directory: opts.destination.to_path_buf(),
+                // Windows-flavour paths are valid here on Windows but Unix.
+                // This backslash normalization is for making output paths more
+                // cross-platform compatible.
+                directory: opts.destination.to_string_lossy().replace("\\", "/"),
             },
         );
     } else if !dest_dir_already_exists {

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
 

src/doc/man/cargo-package.md

@@ -1,6 +1,7 @@
 # cargo-package(1)
 {{*set actionverb="Package"}}
 {{*set noall=true}}
+{{*set multitarget=true}}
 
 ## NAME
 

src/doc/man/cargo-publish.md

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

src/doc/man/cargo-rustc.md

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

src/doc/man/cargo-rustdoc.md

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

src/doc/man/cargo-test.md

@@ -1,6 +1,7 @@
 # cargo-test(1)
 {{*set actionverb="Test"}}
 {{*set nouns="tests"}}
+{{*set multitarget=true}}
 
 ## NAME
 

src/doc/man/generated_txt/cargo-bench.txt

@@ -208,7 +208,8 @@ OPTIONS
            Benchmark for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-build.txt

@@ -140,7 +140,8 @@ OPTIONS
            Build for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-check.txt

@@ -137,7 +137,8 @@ OPTIONS
            Check for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-clean.txt

@@ -43,7 +43,8 @@ OPTIONS
            Clean for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-doc.txt

@@ -115,7 +115,8 @@ OPTIONS
            Document for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-fetch.txt

@@ -28,7 +28,8 @@ OPTIONS
            Fetch for the given architecture. The default is all architectures.
            The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-fix.txt

@@ -210,7 +210,8 @@ OPTIONS
            Fix for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-package.txt

@@ -112,7 +112,8 @@ OPTIONS
            Package for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-publish.txt

@@ -79,7 +79,8 @@ OPTIONS
            Publish for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-rustc.txt

@@ -131,7 +131,8 @@ OPTIONS
            Build for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-rustdoc.txt

@@ -131,7 +131,8 @@ OPTIONS
            Document for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/generated_txt/cargo-test.txt

@@ -222,7 +222,8 @@ OPTIONS
            Test for the given architecture. The default is the host
            architecture. The general format of the triple is
            <arch><sub>-<vendor>-<sys>-<abi>. Run rustc --print target-list for
-           a list of supported targets.
+           a list of supported targets. This flag may be specified multiple
+           times.
 
            This may also be specified with the build.target config value
            <https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/includes/options-target-triple.md

@@ -5,6 +5,7 @@
 {{~/if}} The general format of the triple is
 `<arch><sub>-<vendor>-<sys>-<abi>`. Run `rustc --print target-list` for a
 list of supported targets.
+{{~#if multitarget }} This flag may be specified multiple times. {{~/if}}
 
 This may also be specified with the `build.target`
 [config value](../reference/config.html).

src/doc/src/commands/cargo-bench.md

@@ -2,6 +2,7 @@
 
 
 
+
 ## NAME
 
 cargo-bench - Execute benchmarks of a package
@@ -255,7 +256,7 @@ be specified multiple times, which enables all specified features.</dd>
 <dt class="option-term" id="option-cargo-bench---target"><a class="option-anchor" href="#option-cargo-bench---target"></a><code>--target</code> <em>triple</em></dt>
 <dd class="option-desc">Benchmark for the given architecture. The default is the host architecture. The general format of the triple is
 <code>&lt;arch&gt;&lt;sub&gt;-&lt;vendor&gt;-&lt;sys&gt;-&lt;abi&gt;</code>. Run <code>rustc --print target-list</code> for a
-list of supported targets.</p>
+list of supported targets. This flag may be specified multiple times.</p>
 <p>This may also be specified with the <code>build.target</code>
 <a href="../reference/config.html">config value</a>.</p>
 <p>Note that specifying this flag makes Cargo run in a different mode where the

src/doc/src/commands/cargo-build.md

@@ -1,6 +1,7 @@
 # cargo-build(1)
 
 
+
 ## NAME
 
 cargo-build - Compile the current package
@@ -182,7 +183,7 @@ be specified multiple times, which enables all specified features.</dd>
 <dt class="option-term" id="option-cargo-build---target"><a class="option-anchor" href="#option-cargo-build---target"></a><code>--target</code> <em>triple</em></dt>
 <dd class="option-desc">Build for the given architecture. The default is the host architecture. The general format of the triple is
 <code>&lt;arch&gt;&lt;sub&gt;-&lt;vendor&gt;-&lt;sys&gt;-&lt;abi&gt;</code>. Run <code>rustc --print target-list</code> for a
-list of supported targets.</p>
+list of supported targets. This flag may be specified multiple times.</p>
 <p>This may also be specified with the <code>build.target</code>
 <a href="../reference/config.html">config value</a>.</p>
 <p>Note that specifying this flag makes Cargo run in a different mode where the

src/doc/src/commands/cargo-check.md

@@ -1,6 +1,7 @@
 # cargo-check(1)
 
 
+
 ## NAME
 
 cargo-check - Check the current package
@@ -177,7 +178,7 @@ be specified multiple times, which enables all specified features.</dd>
 <dt class="option-term" id="option-cargo-check---target"><a class="option-anchor" href="#option-cargo-check---target"></a><code>--target</code> <em>triple</em></dt>
 <dd class="option-desc">Check for the given architecture. The default is the host architecture. The general format of the triple is
 <code>&lt;arch&gt;&lt;sub&gt;-&lt;vendor&gt;-&lt;sys&gt;-&lt;abi&gt;</code>. Run <code>rustc --print target-list</code> for a
-list of supported targets.</p>
+list of supported targets. This flag may be specified multiple times.</p>
 <p>This may also be specified with the <code>build.target</code>
 <a href="../reference/config.html">config value</a>.</p>
 <p>Note that specifying this flag makes Cargo run in a different mode where the

src/doc/src/commands/cargo-clean.md

@@ -1,6 +1,7 @@
 # cargo-clean(1)
 
 
+
 ## NAME
 
 cargo-clean - Remove generated artifacts
@@ -59,7 +60,7 @@ Defaults to <code>target</code> in the root of the workspace.</dd>
 <dt class="option-term" id="option-cargo-clean---target"><a class="option-anchor" href="#option-cargo-clean---target"></a><code>--target</code> <em>triple</em></dt>
 <dd class="option-desc">Clean for the given architecture. The default is the host architecture. The general format of the triple is
 <code>&lt;arch&gt;&lt;sub&gt;-&lt;vendor&gt;-&lt;sys&gt;-&lt;abi&gt;</code>. Run <code>rustc --print target-list</code> for a
-list of supported targets.</p>
+list of supported targets. This flag may be specified multiple times.</p>
 <p>This may also be specified with the <code>build.target</code>
 <a href="../reference/config.html">config value</a>.</p>
 <p>Note that specifying this flag makes Cargo run in a different mode where the

src/doc/src/commands/cargo-doc.md

@@ -1,6 +1,7 @@
 # cargo-doc(1)
 
 
+
 ## NAME
 
 cargo-doc - Build a package's documentation
@@ -155,7 +156,7 @@ be specified multiple times, which enables all specified features.</dd>
 <dt class="option-term" id="option-cargo-doc---target"><a class="option-anchor" href="#option-cargo-doc---target"></a><code>--target</code> <em>triple</em></dt>
 <dd class="option-desc">Document for the given architecture. The default is the host architecture. The general format of the triple is
 <code>&lt;arch&gt;&lt;sub&gt;-&lt;vendor&gt;-&lt;sys&gt;-&lt;abi&gt;</code>. Run <code>rustc --print target-list</code> for a
-list of supported targets.</p>
+list of supported targets. This flag may be specified multiple times.</p>
 <p>This may also be specified with the <code>build.target</code>
 <a href="../reference/config.html">config value</a>.</p>
 <p>Note that specifying this flag makes Cargo run in a different mode where the

src/doc/src/commands/cargo-fetch.md

@@ -2,6 +2,7 @@
 
 
 
+
 ## NAME
 
 cargo-fetch - Fetch dependencies of a package from the network
@@ -34,7 +35,7 @@ you plan to use Cargo without a network with the `--offline` flag.
 <dt class="option-term" id="option-cargo-fetch---target"><a class="option-anchor" href="#option-cargo-fetch---target"></a><code>--target</code> <em>triple</em></dt>
 <dd class="option-desc">Fetch for the given architecture. The default is all architectures. The general format of the triple is
 <code>&lt;arch&gt;&lt;sub&gt;-&lt;vendor&gt;-&lt;sys&gt;-&lt;abi&gt;</code>. Run <code>rustc --print target-list</code> for a
-list of supported targets.</p>
+list of supported targets. This flag may be specified multiple times.</p>
 <p>This may also be specified with the <code>build.target</code>
 <a href="../reference/config.html">config value</a>.</p>
 <p>Note that specifying this flag makes Cargo run in a different mode where the