Bug 1769633: Update vendored autocfg to 1.1.0, and re-apply local fixes. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D146488

Cargo.lock

@@ -332,7 +332,7 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 
 [[package]]
 name = "baldrdash"

third_party/rust/autocfg/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.lock":"d658acfaa27a2b30de98cf004d4d3f4ec0f1757b136610289cbbd1c847ae2e6c","Cargo.toml":"e2176be78c2989884eba4a20a58a672277b3a8a99a72b0ba7347f48eb827ae0e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"27995d58ad5c1145c1a8cd86244ce844886958a35eb2b78c6b772748669999ac","README.md":"2d8b6f07819ad7adfab1d153216bfdcde154ffd4a870d98794125c910b0f4593","examples/integers.rs":"589ff4271566dfa322becddf3e2c7b592e6e0bc97b02892ce75619b7e452e930","examples/paths.rs":"1b30e466b824ce8df7ad0a55334424131d9d2573d6cf9f7d5d50c09c8901d526","examples/traits.rs":"cbee6a3e1f7db60b02ae25b714926517144a77cb492021f492774cf0e1865a9e","examples/versions.rs":"38535e6d9f5bfae0de474a3db79a40e8f5da8ba9334c5ff4c363de9bc99d4d12","src/error.rs":"12de7dafea4a35d1dc2f0fa79bfa038386bbbea72bf083979f4ddf227999eeda","src/lib.rs":"9b450d90730624807979045ea7ff48374355314cd894345e1b9651485ba1b2ff","src/tests.rs":"a902fbd42b0f0b81a2830f2368fab733041b02fcb902c8e2520d07b3bff10713","src/version.rs":"175727d5f02f2fe2271ddc9b041db2a5b9c6fe0f95afd17c73a4d982612764a3","tests/rustflags.rs":"441fb0c6606e243c31d3817a5ae2240b65fcae0ea8ab583f80f8f6d6c267e614"},"package":"cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"}
+{"files":{"Cargo.lock":"3d91565ed13de572a9ebde408a0c98e33f931d6ab52f212b0830a60b4ab26b77","Cargo.toml":"39f627122dceaad42146634719fde802fca3baa1b3908753af723074ae2a6d69","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"27995d58ad5c1145c1a8cd86244ce844886958a35eb2b78c6b772748669999ac","README.md":"4c8f9b5016f2a0c3dbeca5bc41241f57db5568f803e58c1fa480ae2b3638d0a9","examples/integers.rs":"589ff4271566dfa322becddf3e2c7b592e6e0bc97b02892ce75619b7e452e930","examples/paths.rs":"1b30e466b824ce8df7ad0a55334424131d9d2573d6cf9f7d5d50c09c8901d526","examples/traits.rs":"cbee6a3e1f7db60b02ae25b714926517144a77cb492021f492774cf0e1865a9e","examples/versions.rs":"38535e6d9f5bfae0de474a3db79a40e8f5da8ba9334c5ff4c363de9bc99d4d12","src/error.rs":"12de7dafea4a35d1dc2f0fa79bfa038386bbbea72bf083979f4ddf227999eeda","src/lib.rs":"6fa01458e8f9258d84f83ead24fdb0cdf9aec10838b0262f1dfbdf79c530c537","src/tests.rs":"f0e6dc1ad9223c0336c02e215ea3940acb2af6c3bc8fd791e16cd4e786e6a608","src/version.rs":"175727d5f02f2fe2271ddc9b041db2a5b9c6fe0f95afd17c73a4d982612764a3","tests/rustflags.rs":"5c8169b88216055019db61b5d7baf4abdf675e3b14b54f5037bb1e3acd0a5d3f"},"package":"d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"}

third_party/rust/autocfg/Cargo.lock

@@ -1,6 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "autocfg"
-version = "1.0.1"
-
+version = "1.1.0"

third_party/rust/autocfg/Cargo.toml

@@ -3,16 +3,15 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
 
 [package]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 authors = ["Josh Stone <cuviper@gmail.com>"]
 exclude = ["/.github/**", "/bors.toml"]
 description = "Automatic cfg for Rust compiler features"

third_party/rust/autocfg/README.md

@@ -43,6 +43,9 @@ should only be used when the compiler supports it.
 
 ## Release Notes
 
+- 1.1.0 (2022-02-07)
+  - Use `CARGO_ENCODED_RUSTFLAGS` when it is set.
+
 - 1.0.1 (2020-08-20)
   - Apply `RUSTFLAGS` for more `--target` scenarios, by @adamreichold.
 

third_party/rust/autocfg/src/lib.rs

@@ -63,7 +63,7 @@ use std::env;
 use std::ffi::OsString;
 use std::fs;
 use std::io::{stderr, Write};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 #[allow(deprecated)]
 use std::sync::atomic::ATOMIC_USIZE_INIT;
@@ -86,7 +86,7 @@ pub struct AutoCfg {
     rustc_version: Version,
     target: Option<OsString>,
     no_std: bool,
-    rustflags: Option<Vec<String>>,
+    rustflags: Vec<String>,
 }
 
 /// Writes a config flag for rustc on standard out.
@@ -166,37 +166,13 @@ impl AutoCfg {
             return Err(error::from_str("output path is not a writable directory"));
         }
 
-        // Cargo only applies RUSTFLAGS for building TARGET artifact in
-        // cross-compilation environment. Sadly, we don't have a way to detect
-        // when we're building HOST artifact in a cross-compilation environment,
-        // so for now we only apply RUSTFLAGS when cross-compiling an artifact.
-        //
-        // See https://github.com/cuviper/autocfg/pull/10#issuecomment-527575030.
-        let rustflags = if target != env::var_os("HOST")
-            || dir_contains_target(&target, &dir, env::var_os("CARGO_TARGET_DIR"))
-        {
-            env::var("RUSTFLAGS").ok().map(|rustflags| {
-                // This is meant to match how cargo handles the RUSTFLAG environment
-                // variable.
-                // See https://github.com/rust-lang/cargo/blob/69aea5b6f69add7c51cca939a79644080c0b0ba0/src/cargo/core/compiler/build_context/target_info.rs#L434-L441
-                rustflags
-                    .split(' ')
-                    .map(str::trim)
-                    .filter(|s| !s.is_empty())
-                    .map(str::to_string)
-                    .collect::<Vec<String>>()
-            })
-        } else {
-            None
-        };
-
         let mut ac = AutoCfg {
+            rustflags: rustflags(&target, &dir),
             out_dir: dir,
             rustc: rustc,
             rustc_version: rustc_version,
             target: target,
             no_std: false,
-            rustflags: rustflags,
         };
 
         // Sanity check with and without `std`.
@@ -240,14 +216,23 @@ impl AutoCfg {
             .arg(&self.out_dir)
             .arg("--emit=llvm-ir");
 
-        if let &Some(ref rustflags) = &self.rustflags {
-            command.args(rustflags);
-        }
-
         if let Some(target) = self.target.as_ref() {
             command.arg("--target").arg(target);
         }
 
+        command.args(&self.rustflags);
+
+        // Mozilla-local change: throw away stderr output.
+        //
+        // Mozilla's build system runs cargo with `-v -v` to help diagnose rustc
+        // selection problems. Without the change below, that causes error
+        // messages from autocfg compiler invocations (which simply indicate
+        // that the feature autocfg was checking for isn't available, and are
+        // not actual build errors) to show up in the build output stream, where
+        // they confuse other parts of Mozilla's build system that try to
+        // highlight and track errors.
+        //
+        // See: https://github.com/cuviper/autocfg/issues/30
         command.arg("-").stdin(Stdio::piped()).stderr(Stdio::null());
         let mut child = try!(command.spawn().map_err(error::from_io));
         let mut stdin = child.stdin.take().expect("rustc stdin");
@@ -417,7 +402,7 @@ fn mangle(s: &str) -> String {
 
 fn dir_contains_target(
     target: &Option<OsString>,
-    dir: &PathBuf,
+    dir: &Path,
     cargo_target_dir: Option<OsString>,
 ) -> bool {
     target
@@ -436,3 +421,44 @@ fn dir_contains_target(
         })
         .unwrap_or(false)
 }
+
+fn rustflags(target: &Option<OsString>, dir: &Path) -> Vec<String> {
+    // Starting with rust-lang/cargo#9601, shipped in Rust 1.55, Cargo always sets
+    // CARGO_ENCODED_RUSTFLAGS for any host/target build script invocation. This
+    // includes any source of flags, whether from the environment, toml config, or
+    // whatever may come in the future. The value is either an empty string, or a
+    // list of arguments separated by the ASCII unit separator (US), 0x1f.
+    if let Ok(a) = env::var("CARGO_ENCODED_RUSTFLAGS") {
+        return if a.is_empty() {
+            Vec::new()
+        } else {
+            a.split('\x1f').map(str::to_string).collect()
+        };
+    }
+
+    // Otherwise, we have to take a more heuristic approach, and we don't
+    // support values from toml config at all.
+    //
+    // Cargo only applies RUSTFLAGS for building TARGET artifact in
+    // cross-compilation environment. Sadly, we don't have a way to detect
+    // when we're building HOST artifact in a cross-compilation environment,
+    // so for now we only apply RUSTFLAGS when cross-compiling an artifact.
+    //
+    // See https://github.com/cuviper/autocfg/pull/10#issuecomment-527575030.
+    if *target != env::var_os("HOST")
+        || dir_contains_target(target, dir, env::var_os("CARGO_TARGET_DIR"))
+    {
+        if let Ok(rustflags) = env::var("RUSTFLAGS") {
+            // This is meant to match how cargo handles the RUSTFLAGS environment variable.
+            // See https://github.com/rust-lang/cargo/blob/69aea5b6f69add7c51cca939a79644080c0b0ba0/src/cargo/core/compiler/build_context/target_info.rs#L434-L441
+            return rustflags
+                .split(' ')
+                .map(str::trim)
+                .filter(|s| !s.is_empty())
+                .map(str::to_string)
+                .collect();
+        }
+    }
+
+    Vec::new()
+}

third_party/rust/autocfg/src/tests.rs

@@ -1,5 +1,6 @@
 use super::AutoCfg;
 use std::env;
+use std::path::Path;
 
 impl AutoCfg {
     fn core_std(&self, path: &str) -> String {
@@ -136,7 +137,7 @@ fn probe_constant() {
 fn dir_does_not_contain_target() {
     assert!(!super::dir_contains_target(
         &Some("x86_64-unknown-linux-gnu".into()),
-        &"/project/target/debug/build/project-ea75983148559682/out".into(),
+        Path::new("/project/target/debug/build/project-ea75983148559682/out"),
         None,
     ));
 }
@@ -145,7 +146,9 @@ fn dir_does_not_contain_target() {
 fn dir_does_contain_target() {
     assert!(super::dir_contains_target(
         &Some("x86_64-unknown-linux-gnu".into()),
-        &"/project/target/x86_64-unknown-linux-gnu/debug/build/project-0147aca016480b9d/out".into(),
+        Path::new(
+            "/project/target/x86_64-unknown-linux-gnu/debug/build/project-0147aca016480b9d/out"
+        ),
         None,
     ));
 }
@@ -154,7 +157,7 @@ fn dir_does_contain_target() {
 fn dir_does_not_contain_target_with_custom_target_dir() {
     assert!(!super::dir_contains_target(
         &Some("x86_64-unknown-linux-gnu".into()),
-        &"/project/custom/debug/build/project-ea75983148559682/out".into(),
+        Path::new("/project/custom/debug/build/project-ea75983148559682/out"),
         Some("custom".into()),
     ));
 }
@@ -163,7 +166,9 @@ fn dir_does_not_contain_target_with_custom_target_dir() {
 fn dir_does_contain_target_with_custom_target_dir() {
     assert!(super::dir_contains_target(
         &Some("x86_64-unknown-linux-gnu".into()),
-        &"/project/custom/x86_64-unknown-linux-gnu/debug/build/project-0147aca016480b9d/out".into(),
+        Path::new(
+            "/project/custom/x86_64-unknown-linux-gnu/debug/build/project-0147aca016480b9d/out"
+        ),
         Some("custom".into()),
     ));
 }

third_party/rust/autocfg/tests/rustflags.rs

@@ -2,18 +2,32 @@ extern crate autocfg;
 
 use std::env;
 
-/// Tests that autocfg uses the RUSTFLAGS environment variable when running
-/// rustc.
+/// Tests that autocfg uses the RUSTFLAGS or CARGO_ENCODED_RUSTFLAGS
+/// environment variables when running rustc.
 #[test]
 fn test_with_sysroot() {
     // Use the same path as this test binary.
     let dir = env::current_exe().unwrap().parent().unwrap().to_path_buf();
-    env::set_var("RUSTFLAGS", &format!("-L {}", dir.display()));
     env::set_var("OUT_DIR", &format!("{}", dir.display()));
 
-    // Ensure HOST != TARGET.
-    env::set_var("HOST", "lol");
+    // If we have encoded rustflags, they take precedence, even if empty.
+    env::set_var("CARGO_ENCODED_RUSTFLAGS", "");
+    env::set_var("RUSTFLAGS", &format!("-L {}", dir.display()));
+    let ac = autocfg::AutoCfg::new().unwrap();
+    assert!(ac.probe_sysroot_crate("std"));
+    assert!(!ac.probe_sysroot_crate("autocfg"));
 
+    // Now try again with useful encoded args.
+    env::set_var(
+        "CARGO_ENCODED_RUSTFLAGS",
+        &format!("-L\x1f{}", dir.display()),
+    );
+    let ac = autocfg::AutoCfg::new().unwrap();
+    assert!(ac.probe_sysroot_crate("autocfg"));
+
+    // Try the old-style RUSTFLAGS, ensuring HOST != TARGET.
+    env::remove_var("CARGO_ENCODED_RUSTFLAGS");
+    env::set_var("HOST", "lol");
     let ac = autocfg::AutoCfg::new().unwrap();
     assert!(ac.probe_sysroot_crate("autocfg"));
 }