Merge branch 'master' into issue-10477

Author: weihanglo

.github/workflows/contrib.yml

@@ -4,11 +4,16 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read
+
 jobs:
   deploy:
+    permissions:
+      contents: write  # for Git to git push
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Install mdbook

.github/workflows/main.yml

@@ -9,12 +9,15 @@ defaults:
   run:
     shell: bash
 
+permissions:
+  contents: read
+
 jobs:
   # Check Code style quickly by running `rustfmt` over all code
   rustfmt:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: rustup update stable && rustup default stable
     - run: rustup component add rustfmt
     - run: cargo fmt --all --check
@@ -53,7 +56,9 @@ jobs:
           rust: nightly-gnu
           other: i686-pc-windows-gnu
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - name: Dump Environment
+      run: ci/dump-environment.sh
     - name: Update Rustup (temporary workaround)
       run: rustup self update
       shell: bash
@@ -68,6 +73,13 @@ jobs:
 
     # Deny warnings on CI to avoid warnings getting into the codebase.
     - run: cargo test --features 'deny-warnings'
+    - name: Check operability of rustc invocation with argfile
+      env:
+        __CARGO_TEST_FORCE_ARGFILE: 1
+      run: |
+        # This only tests `cargo fix` because fix-proxy-mode is one of the most
+        # complicated subprocess management in Cargo.
+        cargo test --test testsuite --features 'deny-warnings' -- fix::
     - run: cargo test --features 'deny-warnings' --manifest-path crates/cargo-test-support/Cargo.toml
       env:
         CARGO_TARGET_DIR: target
@@ -90,20 +102,27 @@ jobs:
         # download all workspaces.
         cargo test --manifest-path benches/benchsuite/Cargo.toml --all-targets -- cargo
         cargo check --manifest-path benches/capture/Cargo.toml
+    # The testsuite generates a huge amount of data, and fetch-smoke-test was
+    # running out of disk space.
+    - name: Clear test output
+      run: |
+        df -h
+        rm -rf target/tmp
+        df -h
     - name: Fetch smoke test
       run: ci/fetch-smoke-test.sh
 
   resolver:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: rustup update stable && rustup default stable
     - run: cargo test --manifest-path crates/resolver-tests/Cargo.toml
 
   build_std:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: rustup update nightly && rustup default nightly
     - run: rustup component add rust-src
     - run: cargo build
@@ -113,7 +132,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: rustup update nightly && rustup default nightly
     - run: rustup update stable
     - run: rustup component add rust-docs
@@ -133,13 +152,17 @@ jobs:
         sh linkcheck.sh --all cargo
 
   success:
+    permissions:
+      contents: none
     name: bors build finished
     needs: [docs, rustfmt, test, resolver, build_std]
     runs-on: ubuntu-latest
     if: "success() && github.event_name == 'push' && github.ref == 'refs/heads/auto-cargo'"
     steps:
     - run: echo ok
   failure:
+    permissions:
+      contents: none
     name: bors build finished
     needs: [docs, rustfmt, test, resolver, build_std]
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,23 +1,241 @@
 # Changelog
 
-## Cargo 1.61 (2022-04-07)
-[ea2a21c9...HEAD](https://github.com/rust-lang/cargo/compare/ea2a21c9...HEAD)
+## Cargo 1.64 (2022-09-22)
+[a5e08c47...HEAD](https://github.com/rust-lang/cargo/compare/a5e08c47...HEAD)
+
+### Added
+
+### Changed
+- Bash completion of `cargo install --path` now supports path completion.
+  [#10798](https://github.com/rust-lang/cargo/pull/10798)
+- Significantly improved the performance fetching git dependencies from GitHub
+  when using a hash in the `rev` field.
+  [#10079](https://github.com/rust-lang/cargo/pull/10079)
+
+### Fixed
+- The `os` output in `cargo --version --verbose` now supports more platforms.
+  [#10802](https://github.com/rust-lang/cargo/pull/10802)
+
+
+### Nightly only
+- Fixed deserialization of unstable `check-cfg` in `config.toml`.
+  [#10799](https://github.com/rust-lang/cargo/pull/10799)
+
+
+## Cargo 1.63 (2022-08-11)
+[3f052d8e...rust-1.63.0](https://github.com/rust-lang/cargo/compare/3f052d8e...rust-1.63.0)
+
+### Added
+
+- 🎉 Added the `--config` CLI option to pass config options directly on the CLI.
+  [#10755](https://github.com/rust-lang/cargo/pull/10755)
+- The `CARGO_PKG_RUST_VERSION` environment variable is now set when compiling
+  a crate if the manifest has the `rust-version` field set.
+  [#10713](https://github.com/rust-lang/cargo/pull/10713)
+
+
+### Changed
+- A warning is emitted when encountering multiple packages with the same name
+  in a git dependency. This will ignore packages with `publish=false`.
+  [#10701](https://github.com/rust-lang/cargo/pull/10701)
+  [#10767](https://github.com/rust-lang/cargo/pull/10767)
+- Change tracking now uses the contents of a `.json` target spec file instead
+  of its path. This should help avoid rebuilds if the path changes.
+  [#10746](https://github.com/rust-lang/cargo/pull/10746)
+- Git dependencies with a submodule configured with the `update=none` strategy
+  in `.gitmodules` is now honored, and the submodule will not be fetched.
+  [#10717](https://github.com/rust-lang/cargo/pull/10717)
+- Crate files now use a more recent date (Jul 23, 2006 instead of Nov 29, 1973)
+  for deterministic behavior.
+  [#10720](https://github.com/rust-lang/cargo/pull/10720)
+- The initial template used for `cargo new` now includes a slightly more
+  realistic test structure that has `use super::*;` in the test module.
+  [#10706](https://github.com/rust-lang/cargo/pull/10706)
+- Updated the internal HTTP library libcurl with various small fixes and updates.
+  [#10696](https://github.com/rust-lang/cargo/pull/10696)
+
+### Fixed
+- Fix zsh completions for `cargo add` and `cargo locate-project`
+  [#10810](https://github.com/rust-lang/cargo/pull/10810)
+  [#10811](https://github.com/rust-lang/cargo/pull/10811)
+- Fixed `-p` being ignored with `cargo publish` in the root of a virtual
+  workspace. Some additional checks were also added to generate an error if
+  multiple packages were selected (previously it would pick the first one).
+  [#10677](https://github.com/rust-lang/cargo/pull/10677)
+- The human-readable executable name is no longer displayed for `cargo test`
+  when using JSON output.
+  [#10691](https://github.com/rust-lang/cargo/pull/10691)
+
+### Nightly only
+
+- Added `-Zcheck-cfg=output` to support build-scripts declaring their
+  supported set of `cfg` values with `cargo:rustc-check-cfg`.
+  [#10539](https://github.com/rust-lang/cargo/pull/10539)
+- `-Z http-registry` now uses https://index.crates.io/ when accessing crates-io.
+  [#10725](https://github.com/rust-lang/cargo/pull/10725)
+- Fixed formatting of `.workspace` key in `cargo add` for workspace inheritance.
+  [#10705](https://github.com/rust-lang/cargo/pull/10705)
+- Sparse HTTP registry URLs must now end with a `/`.
+  [#10698](https://github.com/rust-lang/cargo/pull/10698)
+- Fixed issue with `cargo add` and workspace inheritance of the `default-features` key.
+  [#10685](https://github.com/rust-lang/cargo/pull/10685)
+
+
+
+## Cargo 1.62 (2022-06-30)
+[1ef1e0a1...rust-1.62.0](https://github.com/rust-lang/cargo/compare/1ef1e0a1...rust-1.62.0)
+
+### Added
+
+- 🎉 Added the `cargo add` command for adding dependencies to `Cargo.toml` from
+  the command-line.
+  [docs](https://doc.rust-lang.org/nightly/cargo/commands/cargo-add.html)
+  [#10472](https://github.com/rust-lang/cargo/pull/10472)
+  [#10577](https://github.com/rust-lang/cargo/pull/10577)
+  [#10578](https://github.com/rust-lang/cargo/pull/10578)
+- Package ID specs now support `name@version` syntax in addition to the
+  previous `name:version` to align with the behavior in `cargo add` and other
+  tools. `cargo install` and `cargo yank` also now support this syntax so the
+  version does not need to passed as a separate flag.
+  [#10582](https://github.com/rust-lang/cargo/pull/10582)
+  [#10650](https://github.com/rust-lang/cargo/pull/10650)
+  [#10597](https://github.com/rust-lang/cargo/pull/10597)
+- Added the CLI option `-F` as an alias of `--features`.
+  [#10576](https://github.com/rust-lang/cargo/pull/10576)
+- The `git` and `registry` directories in Cargo's home directory (usually
+  `~/.cargo`) are now marked as cache directories so that they are not
+  included in backups or content indexing (on Windows).
+  [#10553](https://github.com/rust-lang/cargo/pull/10553)
+- Added the `--version` flag to `cargo yank` to replace the `--vers` flag to
+  be consistent with `cargo install`.
+  [#10575](https://github.com/rust-lang/cargo/pull/10575)
+- Added automatic `@` argfile support, which will use "response files" if the
+  command-line to `rustc` exceeds the operating system's limit.
+  [#10546](https://github.com/rust-lang/cargo/pull/10546)
+- `cargo clean` now has a progress bar (if it takes longer than half a second).
+  [#10236](https://github.com/rust-lang/cargo/pull/10236)
+
+### Changed
+
+- `cargo install` no longer generates an error if no binaries were found
+  to install (such as missing required features).
+  [#10508](https://github.com/rust-lang/cargo/pull/10508)
+- `cargo test` now passes `--target` to `rustdoc` if the specified target is
+  the same as the host target.
+  [#10594](https://github.com/rust-lang/cargo/pull/10594)
+- `cargo doc` now automatically passes `-Arustdoc::private-intra-doc-links`
+  when documenting a binary (which automatically includes
+  `--document-private-items`). The
+  [`private-intra-doc-links`](https://doc.rust-lang.org/rustdoc/lints.html#private_intra_doc_links)
+  lint is only relevant when *not* documenting private items, which doesn't
+  apply to binaries.
+  [#10142](https://github.com/rust-lang/cargo/pull/10142)
+- The length of the short git hash in the `cargo --version` output is now
+  fixed to 9 characters. Previously the length was inconsistent between
+  different platforms.
+  [#10579](https://github.com/rust-lang/cargo/pull/10579)
+- Attempting to publish a package with a `Cargo.toml.orig` file will now
+  result in an error. The filename would otherwise conflict with the
+  automatically-generated file.
+  [#10551](https://github.com/rust-lang/cargo/pull/10551)
+
+### Fixed
+
+- The `build.dep-info-basedir` configuration setting now properly supports the
+  use of `..` in the path to refer to a parent directory.
+  [#10281](https://github.com/rust-lang/cargo/pull/10281)
+- Fixed regression in automatic detection of the default number of CPUs to use
+  on systems using cgroups v1.
+  [#10737](https://github.com/rust-lang/cargo/pull/10737)
+  [#10739](https://github.com/rust-lang/cargo/pull/10739)
+
+
+### Nightly only
+
+- `cargo fetch` now works with `-Zbuild-std` to fetch the standard library's dependencies.
+  [#10129](https://github.com/rust-lang/cargo/pull/10129)
+- Added support for workspace inheritance.
+  [docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#workspace-inheritance)
+  [#10584](https://github.com/rust-lang/cargo/pull/10584)
+  [#10568](https://github.com/rust-lang/cargo/pull/10568)
+  [#10565](https://github.com/rust-lang/cargo/pull/10565)
+  [#10564](https://github.com/rust-lang/cargo/pull/10564)
+  [#10563](https://github.com/rust-lang/cargo/pull/10563)
+  [#10606](https://github.com/rust-lang/cargo/pull/10606)
+  [#10548](https://github.com/rust-lang/cargo/pull/10548)
+  [#10538](https://github.com/rust-lang/cargo/pull/10538)
+- Added `-Zcheck-cfg` which adds various forms of validating `cfg` expressions
+  for unknown names and values.
+  [docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg)
+  [#10486](https://github.com/rust-lang/cargo/pull/10486)
+  [#10566](https://github.com/rust-lang/cargo/pull/10566)
+- The `--config` CLI option no longer allows setting a registry token.
+  [#10580](https://github.com/rust-lang/cargo/pull/10580)
+- Fixed issues with proc-macros and `-Z rustdoc-scrape-examples`.
+  [#10549](https://github.com/rust-lang/cargo/pull/10549)
+  [#10533](https://github.com/rust-lang/cargo/pull/10533)
+
+
+## Cargo 1.61 (2022-05-19)
+[ea2a21c9...rust-1.61.0](https://github.com/rust-lang/cargo/compare/ea2a21c9...rust-1.61.0)
 
 ### Added
 
 ### Changed
 
 - `cargo test --no-run` will now display the path to the test executables.
   [#10346](https://github.com/rust-lang/cargo/pull/10346)
+- `cargo tree --duplicates` no longer reports dependencies that are shared
+  between the host and the target as duplicates.
+  [#10466](https://github.com/rust-lang/cargo/pull/10466)
+- Updated to the 1.4.2 release of libgit2 which brings in several fixes
+  [#10442](https://github.com/rust-lang/cargo/pull/10442)
+  [#10479](https://github.com/rust-lang/cargo/pull/10479)
+- `cargo vendor` no longer allows multiple values for `--sync`, you must pass
+  multiple `--sync` flags instead.
+  [#10448](https://github.com/rust-lang/cargo/pull/10448)
+- Warnings are now issued for manifest keys that have mixed both underscore
+  and dash variants (such as specifying both `proc_macro` and `proc-macro`)
+  [#10316](https://github.com/rust-lang/cargo/pull/10316)
+- Cargo now uses the standard library's `available_parallelism` instead of the
+  `num_cpus` crate for determining the default parallelism.
+  [#10427](https://github.com/rust-lang/cargo/pull/10427)
+- `cargo search` terms are now highlighted.
+  [#10425](https://github.com/rust-lang/cargo/pull/10425)
 
 ### Fixed
 
+- Paths passed to VCS tools like `hg` are now added after `--` to avoid
+  conflict with VCS flags.
+  [#10483](https://github.com/rust-lang/cargo/pull/10483)
+- Fixed the `http.timeout` configuration value to actually work.
+  [#10456](https://github.com/rust-lang/cargo/pull/10456)
+- Fixed issues with `cargo rustc --crate-type` not working in some situations.
+  [#10388](https://github.com/rust-lang/cargo/pull/10388)
+
 ### Nightly only
 
 - Added `-Z check-cfg-features` to enable compile-time checking of features
   [#10408](https://github.com/rust-lang/cargo/pull/10408)
 - Added `-Z bindeps` to support binary artifact dependencies (RFC-3028)
   [#9992](https://github.com/rust-lang/cargo/pull/9992)
+- `-Z multitarget` is now supported in the `build.target` config value with an array.
+  [#10473](https://github.com/rust-lang/cargo/pull/10473)
+- Added `--keep-going` flag which will continue compilation even if one crate
+  fails to compile.
+  [#10383](https://github.com/rust-lang/cargo/pull/10383)
+- Start work on inheriting manifest values in a workspace.
+  [#10497](https://github.com/rust-lang/cargo/pull/10497)
+  [#10517](https://github.com/rust-lang/cargo/pull/10517)
+- Added support for sparse HTTP registries.
+  [#10470](https://github.com/rust-lang/cargo/pull/10470)
+  [#10064](https://github.com/rust-lang/cargo/pull/10064)
+- Fixed panic when artifact target is used for `[target.'cfg(<target>)'.dependencies]`
+  [#10433](https://github.com/rust-lang/cargo/pull/10433)
+- Fixed host flags to pass to build scripts (`-Z target-applies-to-host`)
+  [#10395](https://github.com/rust-lang/cargo/pull/10395)
+- Added `-Z check-cfg-features` support for rustdoc
+  [#10428](https://github.com/rust-lang/cargo/pull/10428)
 
 
 ## Cargo 1.60 (2022-04-07)
@@ -89,13 +307,19 @@
 - `cargo test TEST_FILTER` should no longer build binaries that are explicitly
   disabled with `test = false`.
   [#10305](https://github.com/rust-lang/cargo/pull/10305)
+- Fixed regression with `term.verbose` without `term.quiet`, and vice versa.
+  [#10429](https://github.com/rust-lang/cargo/pull/10429)
+  [#10436](https://github.com/rust-lang/cargo/pull/10436)
 
 ### Nightly only
 
 - Added `rustflags` option to a profile definition.
   [#10217](https://github.com/rust-lang/cargo/pull/10217)
 - Changed `--config` to only support dotted keys.
   [#10176](https://github.com/rust-lang/cargo/pull/10176)
+- Fixed profile `rustflags` not being gated in profile overrides.
+  [#10411](https://github.com/rust-lang/cargo/pull/10411)
+  [#10413](https://github.com/rust-lang/cargo/pull/10413)
 
 ## Cargo 1.59 (2022-02-24)
 [7f08ace4...rust-1.59.0](https://github.com/rust-lang/cargo/compare/7f08ace4...rust-1.59.0)