diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-06-03 14:35:40 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 14:35:40 +0900 |
| commit | 80c871cf54a566a37e62b6ea9e5f99cfadb14e26 (patch) | |
| tree | b8b21a1e70fe04b47aaa9433452d2049a2f6bca3 | |
| parent | a5466fc5ad3b71d80ee1040e6e7f8985c556b6e7 (diff) | |
| parent | 785293517588ed7539f155b7d77a941b74652ac5 (diff) | |
Rollup merge of #85926 - ehuss:update-cargo, r=ehuss
Update cargo 10 commits in e931e4796b61de593aa1097649445e535c9c7ee0..0cecbd67323ca14a7eb6505900d0d7307b00355b 2021-05-24 16:17:27 +0000 to 2021-06-01 20:09:13 +0000 - Configure hosts separately from targets when --target is specified. (rust-lang/cargo#9322) - Add some validation to rustc-link-arg (rust-lang/cargo#9523) - Implement suggestions for unknown features in workspace (rust-lang/cargo#9420) - Extract common `make_dep_path` to cargo_util (rust-lang/cargo#9529) - Add a note about rustflags compatibility. (rust-lang/cargo#9524) - Consolidate doc collision detection. (rust-lang/cargo#9526) - Add `--depth` option for `cargo-tree` (rust-lang/cargo#9499) - `cargo tree -e no-proc-macro` to hide procedural macro dependencies (rust-lang/cargo#9488) - Update to semver 1.0.0 (rust-lang/cargo#9508) - Update tar dependency to 0.4.35 (rust-lang/cargo#9517)
| -rw-r--r-- | Cargo.lock | 25 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 22 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index df7d8441941..b4f23721c7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -278,6 +278,7 @@ dependencies = [ "humantime 2.0.1", "ignore", "im-rc", + "itertools 0.10.0", "jobserver", "lazy_static", "lazycell", @@ -293,7 +294,7 @@ dependencies = [ "rand 0.8.3", "rustc-workspace-hack", "rustfix", - "semver 0.10.0", + "semver 1.0.1", "serde", "serde_ignored", "serde_json", @@ -1716,6 +1717,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4675,6 +4685,15 @@ dependencies = [ ] [[package]] +name = "semver" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d023dabf011d5dcb5ac64e3685d97d3b0ef412911077a2851455c6098524a723" +dependencies = [ + "serde", +] + +[[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5033,9 +5052,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.33" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228" +checksum = "7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80" dependencies = [ "filetime", "libc", diff --git a/src/tools/cargo b/src/tools/cargo -Subproject e931e4796b61de593aa1097649445e535c9c7ee +Subproject 0cecbd67323ca14a7eb6505900d0d7307b00355 |