Rollup merge of rust-lang#91619 - ehuss:update-cargo, r=ehuss

Update cargo 8 commits in 294967c53f0c70d598fc54ca189313c86c576ea7..40dc281755137ee804bc9b3b08e782773b726e44 2021-11-29 19:04:22 +0000 to 2021-12-06 21:54:44 +0000 - Unify the description of quiet flag (rust-lang/cargo#10168) - Stabilize future-incompat-report (rust-lang/cargo#10165) - Support abbreviating `--release` as `-r` (rust-lang/cargo#10133) - doc: nudge towards simple version requirements (rust-lang/cargo#10158) - Upgrade clap to 2.34.0 (rust-lang/cargo#10164) - Treat EOPNOTSUPP the same as ENOTSUP when ignoring failed flock calls. (rust-lang/cargo#10157) - Add note about RUSTFLAGS removal from build scripts. (rust-lang/cargo#10141) - Make clippy happy (rust-lang/cargo#10139)
matthiaskrgr · Dec 8, 2021 · 514260c · 514260c
2 parents c68248c + 4aceaed
commit 514260c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -558,11 +558,11 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "2.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
- "ansi_term 0.11.0",
+ "ansi_term 0.12.1",
  "atty",
  "bitflags",
  "strsim",

diff --git a/src/tools/cargo b/src/tools/cargo
+8 −1		CHANGELOG.md
+1 −1		Cargo.toml
+1 −1		src/bin/cargo/cli.rs
+1 −1		src/bin/cargo/commands/bench.rs
+1 −1		src/bin/cargo/commands/build.rs
+1 −1		src/bin/cargo/commands/check.rs
+1 −1		src/bin/cargo/commands/clean.rs
+1 −1		src/bin/cargo/commands/doc.rs
+1 −1		src/bin/cargo/commands/fetch.rs
+1 −1		src/bin/cargo/commands/fix.rs
+1 −1		src/bin/cargo/commands/generate_lockfile.rs
+1 −1		src/bin/cargo/commands/init.rs
+1 −1		src/bin/cargo/commands/install.rs
+1 −1		src/bin/cargo/commands/locate_project.rs
+1 −1		src/bin/cargo/commands/login.rs
+1 −1		src/bin/cargo/commands/logout.rs
+1 −1		src/bin/cargo/commands/metadata.rs
+1 −1		src/bin/cargo/commands/new.rs
+1 −1		src/bin/cargo/commands/owner.rs
+1 −1		src/bin/cargo/commands/package.rs
+1 −1		src/bin/cargo/commands/pkgid.rs
+1 −1		src/bin/cargo/commands/publish.rs
+1 −1		src/bin/cargo/commands/read_manifest.rs
+0 −4		src/bin/cargo/commands/report.rs
+1 −1		src/bin/cargo/commands/run.rs
+1 −1		src/bin/cargo/commands/rustc.rs
+1 −1		src/bin/cargo/commands/rustdoc.rs
+1 −1		src/bin/cargo/commands/search.rs
+1 −1		src/bin/cargo/commands/tree.rs
+1 −1		src/bin/cargo/commands/uninstall.rs
+1 −1		src/bin/cargo/commands/update.rs
+1 −1		src/bin/cargo/commands/vendor.rs
+1 −1		src/bin/cargo/commands/verify_project.rs
+1 −1		src/bin/cargo/commands/version.rs
+1 −1		src/bin/cargo/commands/yank.rs
+12 −0		src/cargo/core/compiler/build_context/target_info.rs
+0 −3		src/cargo/core/compiler/future_incompat.rs
+18 −7		src/cargo/core/compiler/mod.rs
+6 −2		src/cargo/core/features.rs
+1 −1		src/cargo/ops/resolve.rs
+6 −13		src/cargo/util/command_prelude.rs
+4 −1		src/cargo/util/flock.rs
+1 −0		src/doc/man/cargo-build.md
+1 −0		src/doc/man/cargo-check.md
+42 −0		src/doc/man/cargo-report.md
+1 −0		src/doc/man/cargo-rustc.md
+1 −0		src/doc/man/cargo-test.md
+7 −1		src/doc/man/generated_txt/cargo-build.txt
+7 −1		src/doc/man/generated_txt/cargo-check.txt
+1 −1		src/doc/man/generated_txt/cargo-doc.txt
+1 −1		src/doc/man/generated_txt/cargo-fix.txt
+34 −0		src/doc/man/generated_txt/cargo-report.txt
+1 −1		src/doc/man/generated_txt/cargo-run.txt
+7 −1		src/doc/man/generated_txt/cargo-rustc.txt
+1 −1		src/doc/man/generated_txt/cargo-rustdoc.txt
+7 −1		src/doc/man/generated_txt/cargo-test.txt
+6 −0		src/doc/man/includes/options-future-incompat.md
+1 −1		src/doc/man/includes/options-release.md
+2 −0		src/doc/src/SUMMARY.md
+1 −0		src/doc/src/commands/build-commands.md
+7 −0		src/doc/src/commands/cargo-build.md
+7 −0		src/doc/src/commands/cargo-check.md
+1 −0		src/doc/src/commands/cargo-doc.md
+1 −0		src/doc/src/commands/cargo-fix.md
+43 −0		src/doc/src/commands/cargo-report.md
+1 −0		src/doc/src/commands/cargo-run.md
+7 −0		src/doc/src/commands/cargo-rustc.md
+1 −0		src/doc/src/commands/cargo-rustdoc.md
+7 −0		src/doc/src/commands/cargo-test.md
+2 −2		src/doc/src/guide/dependencies.md
+17 −0		src/doc/src/reference/config.md
+6 −4		src/doc/src/reference/environment-variables.md
+24 −0		src/doc/src/reference/future-incompat-report.md
+1 −0		src/doc/src/reference/index.md
+2 −2		src/doc/src/reference/registries.md
+29 −26		src/doc/src/reference/specifying-dependencies.md
+5 −30		src/doc/src/reference/unstable.md
+9 −0		src/etc/man/cargo-build.1
+9 −0		src/etc/man/cargo-check.1
+1 −0		src/etc/man/cargo-doc.1
+1 −0		src/etc/man/cargo-fix.1
+48 −0		src/etc/man/cargo-report.1
+1 −0		src/etc/man/cargo-run.1
+9 −0		src/etc/man/cargo-rustc.1
+1 −0		src/etc/man/cargo-rustdoc.1
+9 −0		src/etc/man/cargo-test.1
+19 −0		tests/testsuite/build.rs
+25 −54		tests/testsuite/future_incompat_report.rs
+23 −0		tests/testsuite/run.rs