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

Update cargo 7 commits in 4fd148c47e733770c537efac5220744945d572ef..ce40690a5e4e315d3dab0aae1eae69d0252c52ac 2022-08-03 15:03:52 +0000 to 2022-08-09 22:32:17 +0000 - Make the `rust-version` error recommend `cargo update --precise -p crate@ver` (rust-lang/cargo#10891) - resolver docs: link to version requirements syntax full explanation (rust-lang/cargo#10946) - Bump os_info to 3.5.0 (rust-lang/cargo#10943) - Mark --timings=html unstable in the document (rust-lang/cargo#10941) - Mention that aliases are recursive (rust-lang/cargo#10935) - Test if reserved filenames are allowed in Windows (rust-lang/cargo#10322) - improve error message for `no such subcommand` (rust-lang/cargo#10924)
GuillaumeGomez · Aug 10, 2022 · f6ce6ab · f6ce6ab
2 parents 3b97de6 + 0a31aa2
commit f6ce6ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -465,6 +465,7 @@ dependencies = [
  "termcolor",
  "toml_edit",
  "url 2.2.2",
+ "winapi",
 ]
 
 [[package]]
@@ -2655,9 +2656,9 @@ checksum = "dd20eec3dbe4376829cb7d80ae6ac45e0a766831dca50202ff2d40db46a8a024"
 
 [[package]]
 name = "os_info"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eca3ecae1481e12c3d9379ec541b238a16f0b75c9a409942daa8ec20dbfdb62"
+checksum = "5209b2162b2c140df493a93689e04f8deab3a67634f5bc7a553c0a98e5b8d399"
 dependencies = [
  "log",
  "serde",

diff --git a/src/tools/cargo b/src/tools/cargo
+1 −1		Cargo.toml
+3 −0		crates/cargo-test-support/Cargo.toml
+58 −0		crates/cargo-test-support/src/paths.rs
+19 −3		src/bin/cargo/main.rs
+23 −1		src/cargo/ops/cargo_compile.rs
+7 −6		src/doc/man/generated_txt/cargo-bench.txt
+7 −6		src/doc/man/generated_txt/cargo-build.txt
+7 −6		src/doc/man/generated_txt/cargo-check.txt
+7 −6		src/doc/man/generated_txt/cargo-doc.txt
+7 −6		src/doc/man/generated_txt/cargo-fix.txt
+7 −6		src/doc/man/generated_txt/cargo-install.txt
+7 −6		src/doc/man/generated_txt/cargo-run.txt
+7 −6		src/doc/man/generated_txt/cargo-rustc.txt
+7 −6		src/doc/man/generated_txt/cargo-rustdoc.txt
+7 −6		src/doc/man/generated_txt/cargo-test.txt
+1 −1		src/doc/man/includes/options-timings.md
+1 −1		src/doc/src/commands/cargo-bench.md
+1 −1		src/doc/src/commands/cargo-build.md
+1 −1		src/doc/src/commands/cargo-check.md
+1 −1		src/doc/src/commands/cargo-doc.md
+1 −1		src/doc/src/commands/cargo-fix.md
+1 −1		src/doc/src/commands/cargo-install.md
+1 −1		src/doc/src/commands/cargo-run.md
+1 −1		src/doc/src/commands/cargo-rustc.md
+1 −1		src/doc/src/commands/cargo-rustdoc.md
+1 −1		src/doc/src/commands/cargo-test.md
+9 −0		src/doc/src/reference/config.md
+2 −1		src/doc/src/reference/resolver.md
+1 −1		src/etc/man/cargo-bench.1
+1 −1		src/etc/man/cargo-build.1
+1 −1		src/etc/man/cargo-check.1
+1 −1		src/etc/man/cargo-doc.1
+1 −1		src/etc/man/cargo-fix.1
+1 −1		src/etc/man/cargo-install.1
+1 −1		src/etc/man/cargo-run.1
+1 −1		src/etc/man/cargo-rustc.1
+1 −1		src/etc/man/cargo-rustdoc.1
+1 −1		src/etc/man/cargo-test.1
+39 −4		tests/testsuite/cargo_command.rs
+6 −0		tests/testsuite/package.rs
+5 −2		tests/testsuite/rust_version.rs