diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-08-10 07:21:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-10 07:21:40 +0200 |
| commit | f6ce6aba6e464644d9bb8cb21e30f9d09078df61 (patch) | |
| tree | 868b2857f7eff95e744f8d250f1fbeed502e138c | |
| parent | 3b97de6b1b43263bcf8917e55be3203c5021f0fc (diff) | |
| parent | 0a31aa29e43c315520a5f0e18ce8045d7d009f31 (diff) | |
| download | rust-f6ce6aba6e464644d9bb8cb21e30f9d09078df61.tar.gz rust-f6ce6aba6e464644d9bb8cb21e30f9d09078df61.zip | |
Rollup merge of #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)
| -rw-r--r-- | Cargo.lock | 5 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index ededa7c2ecf..31f43a24d96 100644 --- 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 -Subproject 4fd148c47e733770c537efac5220744945d572e +Subproject ce40690a5e4e315d3dab0aae1eae69d0252c52a |