Skip to content

Commit 80c871c

Browse files
authored
Rollup merge of rust-lang#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)
2 parents a5466fc + 7852935 commit 80c871c

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

Cargo.lock

+22-3
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ dependencies = [
278278
"humantime 2.0.1",
279279
"ignore",
280280
"im-rc",
281+
"itertools 0.10.0",
281282
"jobserver",
282283
"lazy_static",
283284
"lazycell",
@@ -293,7 +294,7 @@ dependencies = [
293294
"rand 0.8.3",
294295
"rustc-workspace-hack",
295296
"rustfix",
296-
"semver 0.10.0",
297+
"semver 1.0.1",
297298
"serde",
298299
"serde_ignored",
299300
"serde_json",
@@ -1715,6 +1716,15 @@ dependencies = [
17151716
"either",
17161717
]
17171718

1719+
[[package]]
1720+
name = "itertools"
1721+
version = "0.10.0"
1722+
source = "registry+https://github.com/rust-lang/crates.io-index"
1723+
checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
1724+
dependencies = [
1725+
"either",
1726+
]
1727+
17181728
[[package]]
17191729
name = "itoa"
17201730
version = "0.4.6"
@@ -4674,6 +4684,15 @@ dependencies = [
46744684
"serde",
46754685
]
46764686

4687+
[[package]]
4688+
name = "semver"
4689+
version = "1.0.1"
4690+
source = "registry+https://github.com/rust-lang/crates.io-index"
4691+
checksum = "d023dabf011d5dcb5ac64e3685d97d3b0ef412911077a2851455c6098524a723"
4692+
dependencies = [
4693+
"serde",
4694+
]
4695+
46774696
[[package]]
46784697
name = "semver-parser"
46794698
version = "0.7.0"
@@ -5033,9 +5052,9 @@ dependencies = [
50335052

50345053
[[package]]
50355054
name = "tar"
5036-
version = "0.4.33"
5055+
version = "0.4.35"
50375056
source = "registry+https://github.com/rust-lang/crates.io-index"
5038-
checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228"
5057+
checksum = "7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80"
50395058
dependencies = [
50405059
"filetime",
50415060
"libc",

src/tools/cargo

Submodule cargo updated 45 files

0 commit comments

Comments
 (0)