Merge branch 'master' of github.com:rust-lang/cargo into unknown-feature-resolver-1

Author: In-line

.github/workflows/main.yml

@@ -54,6 +54,10 @@ jobs:
           other: i686-pc-windows-gnu
     steps:
     - uses: actions/checkout@v2
+    - name: Update Rustup (temporary workaround)
+      run: rustup self update
+      shell: bash
+      if: startsWith(matrix.os, 'windows')
     - run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
     - run: rustup target add ${{ matrix.other }}
     - run: rustup component add rustc-dev llvm-tools-preview rust-docs

CHANGELOG.md

@@ -1,17 +1,47 @@
 # Changelog
 
-## Cargo 1.53 (2021-06-17)
-[90691f2b...HEAD](https://github.com/rust-lang/cargo/compare/90691f2b...HEAD)
+## Cargo 1.54 (2021-07-29)
+[4369396c...HEAD](https://github.com/rust-lang/cargo/compare/4369396c...HEAD)
 
 ### Added
 
+- Fetching from a git repository (such as the crates.io index) now displays
+  the network transfer rate.
+  [#9395](https://github.com/rust-lang/cargo/pull/9395)
+
 ### Changed
 
+### Fixed
+
+- Fixed `package.exclude` in `Cargo.toml` using inverted exclusions
+  (`!somefile`) when not in a git repository or when vendoring a dependency.
+  [#9186](https://github.com/rust-lang/cargo/pull/9186)
+- Dep-info files now adjust build script `rerun-if-changed` paths to be
+  absolute paths.
+  [#9421](https://github.com/rust-lang/cargo/pull/9421)
+
+### Nightly only
+
+- Added `report` subcommand, and changed `cargo
+  describe-future-incompatibilitie` to `cargo report
+  future-incompatibilities`.
+  [#9438](https://github.com/rust-lang/cargo/pull/9438)
+
+
+## Cargo 1.53 (2021-06-17)
+[90691f2b...rust-1.53.0](https://github.com/rust-lang/cargo/compare/90691f2b...rust-1.53.0)
+
+### Added
+
+### Changed
 - 🔥 Cargo now supports git repositories where the default `HEAD` branch is not
   "master". This also includes a switch to the version 3 `Cargo.lock` format
   which can handle default branches correctly.
   [#9133](https://github.com/rust-lang/cargo/pull/9133)
-- 🔥 macOS targets now default to `unpacked` debuginfo.
+  [#9397](https://github.com/rust-lang/cargo/pull/9397)
+  [#9384](https://github.com/rust-lang/cargo/pull/9384)
+  [#9392](https://github.com/rust-lang/cargo/pull/9392)
+- 🔥 macOS targets now default to `unpacked` split-debuginfo.
   [#9298](https://github.com/rust-lang/cargo/pull/9298)
 - ❗ The `authors` field is no longer included in `Cargo.toml` for new
   projects.
@@ -22,17 +52,49 @@
   different toolchain versions. There are shared, unversioned files (such as
   the search index) that can become broken when using different versions.
   [#8640](https://github.com/rust-lang/cargo/pull/8640)
+  [#9404](https://github.com/rust-lang/cargo/pull/9404)
+- Improved error messages when path dependency/workspace member is missing.
+  [#9368](https://github.com/rust-lang/cargo/pull/9368)
 
 ### Fixed
+- Fixed `cargo doc` detecting if the documentation needs to be rebuilt when
+  changing some settings such as features.
+  [#9419](https://github.com/rust-lang/cargo/pull/9419)
+- `cargo doc` now deletes the output directory for the package before running
+  rustdoc to clear out any stale files.
+  [#9419](https://github.com/rust-lang/cargo/pull/9419)
+- Fixed the `-C metadata` value to always include all information for all
+  builds. Previously, in some situations, the hash only included the package
+  name and version. This fixes some issues, such as incremental builds with
+  split-debuginfo on macOS corrupting the incremental cache in some cases.
+  [#9418](https://github.com/rust-lang/cargo/pull/9418)
+- Fixed man pages not working on Windows if `man` is in `PATH`.
+  [#9378](https://github.com/rust-lang/cargo/pull/9378)
+- The `rustc` cache is now aware of `RUSTC_WRAPPER` and `RUSTC_WORKSPACE_WRAPPER`.
+  [#9348](https://github.com/rust-lang/cargo/pull/9348)
+- Track the `CARGO` environment variable in the rebuild fingerprint if the
+  code uses `env!("CARGO")`.
+  [#9363](https://github.com/rust-lang/cargo/pull/9363)
 
 ### Nightly only
 - Fixed config includes not working.
   [#9299](https://github.com/rust-lang/cargo/pull/9299)
 - Emit note when `--future-incompat-report` had nothing to report.
   [#9263](https://github.com/rust-lang/cargo/pull/9263)
 - Error messages for nightly features flags (like `-Z` and `cargo-features`)
-  should now provide more information.
+  now provides more information.
   [#9290](https://github.com/rust-lang/cargo/pull/9290)
+- Added the ability to set the target for an individual package in `Cargo.toml`.
+  [docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#per-package-target)
+  [#9030](https://github.com/rust-lang/cargo/pull/9030)
+- Fixed build-std updating the index on every build.
+  [#9393](https://github.com/rust-lang/cargo/pull/9393)
+- `-Z help` now displays all the `-Z` options.
+  [#9369](https://github.com/rust-lang/cargo/pull/9369)
+- Added `-Zallow-features` to specify which nightly features are allowed to be used.
+  [#9283](https://github.com/rust-lang/cargo/pull/9283)
+- Added `cargo config` subcommand.
+  [#9302](https://github.com/rust-lang/cargo/pull/9302)
 
 ## Cargo 1.52 (2021-05-06)
 [34170fcd...rust-1.52.0](https://github.com/rust-lang/cargo/compare/34170fcd...rust-1.52.0)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo"
-version = "0.54.0"
+version = "0.55.0"
 edition = "2018"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
@@ -61,7 +61,7 @@ tempfile = "3.0"
 termcolor = "1.1"
 toml = "0.5.7"
 unicode-xid = "0.2.0"
-url = "2.0"
+url = "2.2.2"
 walkdir = "2.2"
 clap = "2.31.2"
 unicode-width = "0.1.5"

crates/cargo-test-macro/src/lib.rs

@@ -31,8 +31,12 @@ pub fn cargo_test(attr: TokenStream, item: TokenStream) -> TokenStream {
             }
         };
 
-        let mut new_body =
-            to_token_stream("let _test_guard = cargo_test_support::paths::init_root();");
+        let mut new_body = to_token_stream(
+            r#"let _test_guard = {
+                let tmp_dir = option_env!("CARGO_TARGET_TMPDIR");
+                cargo_test_support::paths::init_root(tmp_dir)
+            };"#,
+        );
 
         // If this is a `build_std` test (aka `tests/build-std/*.rs`) then they
         // only run on nightly and they only run when specifically instructed to

crates/cargo-test-support/Cargo.toml

@@ -21,4 +21,4 @@ remove_dir_all = "0.5"
 serde_json = "1.0"
 tar = { version = "0.4.18", default-features = false }
 toml = "0.5.7"
-url = "2.0"
+url = "2.2.2"

crates/cargo-test-support/src/git.rs

@@ -132,11 +132,12 @@ pub fn init(path: &Path) -> git2::Repository {
 }
 
 fn default_search_path() {
-    use crate::paths::GLOBAL_ROOT;
+    use crate::paths::global_root;
     use git2::{opts::set_search_path, ConfigLevel};
+
     static INIT: Once = Once::new();
     INIT.call_once(|| unsafe {
-        let path = GLOBAL_ROOT.join("blank_git_search_path");
+        let path = global_root().join("blank_git_search_path");
         t!(set_search_path(ConfigLevel::System, &path));
         t!(set_search_path(ConfigLevel::Global, &path));
         t!(set_search_path(ConfigLevel::XDG, &path));

crates/cargo-test-support/src/paths.rs

@@ -14,28 +14,44 @@ use std::sync::Mutex;
 static CARGO_INTEGRATION_TEST_DIR: &str = "cit";
 
 lazy_static! {
-    pub static ref GLOBAL_ROOT: PathBuf = {
-        let mut path = t!(env::current_exe());
-        path.pop(); // chop off exe name
-        path.pop(); // chop off 'debug'
-
-        // If `cargo test` is run manually then our path looks like
-        // `target/debug/foo`, in which case our `path` is already pointing at
-        // `target`. If, however, `cargo test --target $target` is used then the
-        // output is `target/$target/debug/foo`, so our path is pointing at
-        // `target/$target`. Here we conditionally pop the `$target` name.
-        if path.file_name().and_then(|s| s.to_str()) != Some("target") {
-            path.pop();
-        }
-
-        path.push(CARGO_INTEGRATION_TEST_DIR);
-        path.mkdir_p();
-        path
-    };
+    // TODO: Use `SyncOnceCell` when stable
+    static ref GLOBAL_ROOT: Mutex<Option<PathBuf>> = Mutex::new(None);
 
     static ref TEST_ROOTS: Mutex<HashMap<String, PathBuf>> = Default::default();
 }
 
+/// This is used when running cargo is pre-CARGO_TARGET_TMPDIR
+/// TODO: Remove when CARGO_TARGET_TMPDIR grows old enough.
+fn global_root_legacy() -> PathBuf {
+    let mut path = t!(env::current_exe());
+    path.pop(); // chop off exe name
+    path.pop(); // chop off "deps"
+    path.push("tmp");
+    path.mkdir_p();
+    path
+}
+
+fn set_global_root(tmp_dir: Option<&'static str>) {
+    let mut lock = GLOBAL_ROOT.lock().unwrap();
+    if lock.is_none() {
+        let mut root = match tmp_dir {
+            Some(tmp_dir) => PathBuf::from(tmp_dir),
+            None => global_root_legacy(),
+        };
+
+        root.push(CARGO_INTEGRATION_TEST_DIR);
+        *lock = Some(root);
+    }
+}
+
+pub fn global_root() -> PathBuf {
+    let lock = GLOBAL_ROOT.lock().unwrap();
+    match lock.as_ref() {
+        Some(p) => p.clone(),
+        None => unreachable!("GLOBAL_ROOT not set yet"),
+    }
+}
+
 // We need to give each test a unique id. The test name could serve this
 // purpose, but the `test` crate doesn't have a way to obtain the current test
 // name.[*] Instead, we used the `cargo-test-macro` crate to automatically
@@ -52,14 +68,15 @@ pub struct TestIdGuard {
     _private: (),
 }
 
-pub fn init_root() -> TestIdGuard {
+pub fn init_root(tmp_dir: Option<&'static str>) -> TestIdGuard {
     static NEXT_ID: AtomicUsize = AtomicUsize::new(0);
 
-    let id = NEXT_ID.fetch_add(1, Ordering::Relaxed);
+    let id = NEXT_ID.fetch_add(1, Ordering::SeqCst);
     TEST_ID.with(|n| *n.borrow_mut() = Some(id));
 
     let guard = TestIdGuard { _private: () };
 
+    set_global_root(tmp_dir);
     let r = root();
     r.rm_rf();
     r.mkdir_p();
@@ -80,7 +97,10 @@ pub fn root() -> PathBuf {
              order to be able to use the crate root.",
         )
     });
-    GLOBAL_ROOT.join(&format!("t{}", id))
+
+    let mut root = global_root();
+    root.push(&format!("t{}", id));
+    root
 }
 
 pub fn home() -> PathBuf {

crates/cargo-test-support/src/registry.rs

@@ -178,12 +178,7 @@ impl RegistryBuilder {
         }
 
         if self.replace_crates_io {
-            init_registry(
-                registry_path(),
-                dl_url().into_string(),
-                api_url(),
-                api_path(),
-            );
+            init_registry(registry_path(), dl_url().into(), api_url(), api_path());
         }
 
         if self.alternative {

crates/cargo-util/src/paths.rs

@@ -161,7 +161,7 @@ pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> Result<()>
         .with_context(|| format!("failed to write `{}`", path.display()))
 }
 
-/// Equivalent to [`write`], but does not write anything if the file contents
+/// Equivalent to [`write()`], but does not write anything if the file contents
 /// are identical to the given contents.
 pub fn write_if_changed<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> Result<()> {
     (|| -> Result<()> {
@@ -184,7 +184,7 @@ pub fn write_if_changed<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) ->
     Ok(())
 }
 
-/// Equivalent to [`write`], but appends to the end instead of replacing the
+/// Equivalent to [`write()`], but appends to the end instead of replacing the
 /// contents.
 pub fn append(path: &Path, contents: &[u8]) -> Result<()> {
     (|| -> Result<()> {