Skip to content

Commit e6db669

Browse files
committedFeb 12, 2020
Auto merge of #68823 - matthiaskrgr:submodule_upd, r=ehuss
submodules: update cargo
2 parents fc23a81 + 451d492 commit e6db669

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed
 

‎Cargo.lock

+21-11
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ dependencies = [
281281

282282
[[package]]
283283
name = "cargo"
284-
version = "0.43.0"
284+
version = "0.44.0"
285285
dependencies = [
286286
"anyhow",
287287
"atty",
@@ -292,6 +292,7 @@ dependencies = [
292292
"clap",
293293
"core-foundation 0.7.0",
294294
"crates-io",
295+
"crossbeam-channel 0.4.0",
295296
"crossbeam-utils 0.7.0",
296297
"crypto-hash",
297298
"curl",
@@ -729,6 +730,15 @@ dependencies = [
729730
"smallvec 0.6.10",
730731
]
731732

733+
[[package]]
734+
name = "crossbeam-channel"
735+
version = "0.4.0"
736+
source = "registry+https://github.com/rust-lang/crates.io-index"
737+
checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
738+
dependencies = [
739+
"crossbeam-utils 0.7.0",
740+
]
741+
732742
[[package]]
733743
name = "crossbeam-deque"
734744
version = "0.7.1"
@@ -1077,13 +1087,14 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
10771087

10781088
[[package]]
10791089
name = "filetime"
1080-
version = "0.2.4"
1090+
version = "0.2.8"
10811091
source = "registry+https://github.com/rust-lang/crates.io-index"
1082-
checksum = "a2df5c1a8c4be27e7707789dc42ae65976e60b394afd293d1419ab915833e646"
1092+
checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
10831093
dependencies = [
10841094
"cfg-if",
10851095
"libc",
10861096
"redox_syscall",
1097+
"winapi 0.3.8",
10871098
]
10881099

10891100
[[package]]
@@ -1541,7 +1552,7 @@ version = "0.4.10"
15411552
source = "registry+https://github.com/rust-lang/crates.io-index"
15421553
checksum = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7"
15431554
dependencies = [
1544-
"crossbeam-channel",
1555+
"crossbeam-channel 0.3.8",
15451556
"globset",
15461557
"lazy_static 1.4.0",
15471558
"log",
@@ -2504,12 +2515,11 @@ dependencies = [
25042515

25052516
[[package]]
25062517
name = "pretty_env_logger"
2507-
version = "0.3.0"
2518+
version = "0.4.0"
25082519
source = "registry+https://github.com/rust-lang/crates.io-index"
2509-
checksum = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61"
2520+
checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
25102521
dependencies = [
2511-
"chrono",
2512-
"env_logger 0.6.2",
2522+
"env_logger 0.7.1",
25132523
"log",
25142524
]
25152525

@@ -2948,7 +2958,7 @@ dependencies = [
29482958
"cargo",
29492959
"cargo_metadata 0.8.0",
29502960
"clippy_lints",
2951-
"crossbeam-channel",
2961+
"crossbeam-channel 0.3.8",
29522962
"difference",
29532963
"env_logger 0.7.1",
29542964
"futures",
@@ -4547,9 +4557,9 @@ dependencies = [
45474557

45484558
[[package]]
45494559
name = "tar"
4550-
version = "0.4.20"
4560+
version = "0.4.26"
45514561
source = "registry+https://github.com/rust-lang/crates.io-index"
4552-
checksum = "a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2"
4562+
checksum = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3"
45534563
dependencies = [
45544564
"filetime",
45554565
"libc",

‎src/tools/cargo

Submodule cargo updated 42 files

‎src/tools/tidy/src/deps.rs

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ const EXCEPTIONS: &[&str] = &[
5959
"dunce", // CC0-1.0 mdbook-linkcheck
6060
"codespan-reporting", // Apache-2.0 mdbook-linkcheck
6161
"codespan", // Apache-2.0 mdbook-linkcheck
62+
"crossbeam-channel", // MIT/Apache-2.0 AND BSD-2-Clause, cargo
6263
];
6364

6465
/// Which crates to check against the whitelist?

0 commit comments

Comments
 (0)
Please sign in to comment.