Skip to content

Commit 433287f

Browse files
authored
Rollup merge of rust-lang#86874 - klensy:bump-deps, r=Mark-Simulacrum
Bump deps tidy: updated cargo_metadata to 0.12 (rustfmt only one left, that depends on 0.8 version in tree, waiting when it merges into rustc repo) miow v0.3.6 -> v0.3.7, drops socket2 v0.3.19 curl v0.4.36 -> v0.4.38 curl-sys v0.4.42+curl-7.76.0 -> v0.4.44+curl-7.77.0 fixes CVE's https://curl.se/docs/vuln-7.76.0.html
2 parents 0e4c4cd + d5e8ad4 commit 433287f

File tree

2 files changed

+14
-47
lines changed

2 files changed

+14
-47
lines changed

Cargo.lock

+13-46
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ dependencies = [
398398
"jobserver",
399399
"libc",
400400
"log",
401-
"miow 0.3.6",
401+
"miow 0.3.7",
402402
"same-file",
403403
"shell-escape",
404404
"tempfile",
@@ -418,17 +418,6 @@ dependencies = [
418418
"serde_json",
419419
]
420420

421-
[[package]]
422-
name = "cargo_metadata"
423-
version = "0.11.1"
424-
source = "registry+https://github.com/rust-lang/crates.io-index"
425-
checksum = "89fec17b16f1ac67908af82e47d0a90a7afd0e1827b181cd77504323d3263d35"
426-
dependencies = [
427-
"semver 0.10.0",
428-
"serde",
429-
"serde_json",
430-
]
431-
432421
[[package]]
433422
name = "cargo_metadata"
434423
version = "0.12.0"
@@ -675,7 +664,7 @@ dependencies = [
675664
"glob",
676665
"lazy_static",
677666
"libc",
678-
"miow 0.3.6",
667+
"miow 0.3.7",
679668
"regex",
680669
"rustfix 0.6.0",
681670
"serde",
@@ -699,7 +688,7 @@ dependencies = [
699688
"lazy_static",
700689
"libc",
701690
"log",
702-
"miow 0.3.6",
691+
"miow 0.3.7",
703692
"regex",
704693
"rustfix 0.5.1",
705694
"serde",
@@ -867,24 +856,24 @@ dependencies = [
867856

868857
[[package]]
869858
name = "curl"
870-
version = "0.4.36"
859+
version = "0.4.38"
871860
source = "registry+https://github.com/rust-lang/crates.io-index"
872-
checksum = "d0bac9f84ca0977c4d9b8db998689de55b9e976656a6bc87fada2ca710d504c7"
861+
checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515"
873862
dependencies = [
874863
"curl-sys",
875864
"libc",
876865
"openssl-probe",
877866
"openssl-sys",
878867
"schannel",
879-
"socket2 0.4.0",
868+
"socket2",
880869
"winapi 0.3.9",
881870
]
882871

883872
[[package]]
884873
name = "curl-sys"
885-
version = "0.4.42+curl-7.76.0"
874+
version = "0.4.44+curl-7.77.0"
886875
source = "registry+https://github.com/rust-lang/crates.io-index"
887-
checksum = "4636d8d6109c842707018a104051436bffb8991ea20b2d1293db70b6e0ee4c7c"
876+
checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1"
888877
dependencies = [
889878
"cc",
890879
"libc",
@@ -2263,7 +2252,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
22632252
dependencies = [
22642253
"log",
22652254
"mio",
2266-
"miow 0.3.6",
2255+
"miow 0.3.7",
22672256
"winapi 0.3.9",
22682257
]
22692258

@@ -2292,11 +2281,10 @@ dependencies = [
22922281

22932282
[[package]]
22942283
name = "miow"
2295-
version = "0.3.6"
2284+
version = "0.3.7"
22962285
source = "registry+https://github.com/rust-lang/crates.io-index"
2297-
checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
2286+
checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
22982287
dependencies = [
2299-
"socket2 0.3.19",
23002288
"winapi 0.3.9",
23012289
]
23022290

@@ -2525,7 +2513,7 @@ dependencies = [
25252513
"libc",
25262514
"log",
25272515
"mio-named-pipes",
2528-
"miow 0.3.6",
2516+
"miow 0.3.7",
25292517
"rand 0.7.3",
25302518
"tokio",
25312519
"winapi 0.3.9",
@@ -4681,16 +4669,6 @@ dependencies = [
46814669
"serde",
46824670
]
46834671

4684-
[[package]]
4685-
name = "semver"
4686-
version = "0.10.0"
4687-
source = "registry+https://github.com/rust-lang/crates.io-index"
4688-
checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190"
4689-
dependencies = [
4690-
"semver-parser 0.7.0",
4691-
"serde",
4692-
]
4693-
46944672
[[package]]
46954673
name = "semver"
46964674
version = "0.11.0"
@@ -4879,17 +4857,6 @@ version = "1.0.1"
48794857
source = "registry+https://github.com/rust-lang/crates.io-index"
48804858
checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e"
48814859

4882-
[[package]]
4883-
name = "socket2"
4884-
version = "0.3.19"
4885-
source = "registry+https://github.com/rust-lang/crates.io-index"
4886-
checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
4887-
dependencies = [
4888-
"cfg-if 1.0.0",
4889-
"libc",
4890-
"winapi 0.3.9",
4891-
]
4892-
48934860
[[package]]
48944861
name = "socket2"
48954862
version = "0.4.0"
@@ -5230,7 +5197,7 @@ dependencies = [
52305197
name = "tidy"
52315198
version = "0.1.0"
52325199
dependencies = [
5233-
"cargo_metadata 0.11.1",
5200+
"cargo_metadata 0.12.0",
52345201
"crossbeam-utils 0.8.3",
52355202
"lazy_static",
52365203
"regex",

src/tools/tidy/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2018"
66
autobins = false
77

88
[dependencies]
9-
cargo_metadata = "0.11"
9+
cargo_metadata = "0.12"
1010
regex = "1"
1111
lazy_static = "1"
1212
walkdir = "2"

0 commit comments

Comments
 (0)