Skip to content

Commit 69a5d24

Browse files
committed
Auto merge of #96179 - klensy:bump-deps-04-22, r=Mark-Simulacrum
Bump deps Update few deps: First commit: vulnerable or yanked ones: * openssl-src 111.17.0+1.1.1m -> 111.18.0+1.1.1n vuln https://rustsec.org/advisories/RUSTSEC-2022-0014 * crossbeam-channel 0.5.2 -> 0.5.4 yanked: crossbeam-rs/crossbeam#802 (https://github.com/crossbeam-rs/crossbeam/blob/crossbeam-channel-0.5.4/crossbeam-channel/CHANGELOG.md) * crossbeam-utils 0.8.6 -> 0.8.8 yanked: GHSA-qc84-gqf4-9926 (https://github.com/crossbeam-rs/crossbeam/blob/crossbeam-utils-0.8.8/crossbeam-utils/CHANGELOG.md) Second commit: no notable changes, most of them touched only to remove other ones: * Updating ammonia v3.1.3 -> v3.2.0 * Updating html5ever v0.25.1 -> v0.26.0 * Updating markup5ever v0.10.1 -> v0.11.0 * Removing markup5ever_rcdom v0.1.0 * Updating phf v0.8.0 -> v0.10.1 * Updating phf_codegen v0.8.0 -> v0.10.0 * Updating phf_generator v0.8.0 -> v0.10.0 * Updating phf_shared v0.8.0 -> v0.10.0 * Updating rand v0.8.4 -> v0.8.5 * Removing rand_hc v0.3.0 * Removing rand_pcg v0.2.1 * Updating string_cache v0.8.0 -> v0.8.3 * Updating string_cache_codegen v0.5.1 -> v0.5.2 * Removing xml5ever v0.16.1 drops markup5ever_rcdom, rand_hc, rand_pcg, xml5ever versions * rand 0.8.4 -> 0.8.5 (https://github.com/rust-random/rand/blob/0.8.5/CHANGELOG.md#085---2021-08-20) Third one is perf oriented: * proc-macro2 v1.0.30 -> v1.0.37 dtolnay/proc-macro2@1.0.30...1.0.37 (https://github.com/dtolnay/proc-macro2/releases, for example https://github.com/dtolnay/proc-macro2/releases/tag/1.0.36) * quote v1.0.7 -> v1.0.18 dtolnay/quote@1.0.7...1.0.18 (https://github.com/dtolnay/quote/releases) multiple perf improvements: https://github.com/dtolnay/quote/releases/tag/1.0.16, https://github.com/dtolnay/quote/releases/tag/1.0.14, https://github.com/dtolnay/quote/releases/tag/1.0.11 * syn v1.0.80 -> v1.0.91 dtolnay/syn@1.0.80...1.0.91 (https://github.com/dtolnay/syn/releases): didn't find good examples, but given, that there exist private api across `proc-macro2`, `quote` by the same author, *i think* it may take advantage of it.
2 parents ff18038 + 813420b commit 69a5d24

File tree

2 files changed

+42
-88
lines changed

2 files changed

+42
-88
lines changed

Cargo.lock

+42-87
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,13 @@ dependencies = [
5656

5757
[[package]]
5858
name = "ammonia"
59-
version = "3.1.3"
59+
version = "3.2.0"
6060
source = "registry+https://github.com/rust-lang/crates.io-index"
61-
checksum = "b74b175af97d1aecc1add0878b1cbfcbf3bd4c22d7713eeb6d597da23e29bc0d"
61+
checksum = "d5ed2509ee88cc023cccee37a6fab35826830fe8b748b3869790e7720c2c4a74"
6262
dependencies = [
6363
"html5ever",
64-
"lazy_static",
6564
"maplit",
66-
"markup5ever_rcdom",
67-
"matches",
65+
"once_cell",
6866
"tendril",
6967
"url 2.2.2",
7068
]
@@ -883,9 +881,9 @@ dependencies = [
883881

884882
[[package]]
885883
name = "crossbeam-channel"
886-
version = "0.5.2"
884+
version = "0.5.4"
887885
source = "registry+https://github.com/rust-lang/crates.io-index"
888-
checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
886+
checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
889887
dependencies = [
890888
"cfg-if 1.0.0",
891889
"crossbeam-utils",
@@ -917,9 +915,9 @@ dependencies = [
917915

918916
[[package]]
919917
name = "crossbeam-utils"
920-
version = "0.8.6"
918+
version = "0.8.8"
921919
source = "registry+https://github.com/rust-lang/crates.io-index"
922-
checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
920+
checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
923921
dependencies = [
924922
"cfg-if 1.0.0",
925923
"lazy_static",
@@ -1726,9 +1724,9 @@ dependencies = [
17261724

17271725
[[package]]
17281726
name = "html5ever"
1729-
version = "0.25.1"
1727+
version = "0.26.0"
17301728
source = "registry+https://github.com/rust-lang/crates.io-index"
1731-
checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b"
1729+
checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
17321730
dependencies = [
17331731
"log",
17341732
"mac",
@@ -2236,9 +2234,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
22362234

22372235
[[package]]
22382236
name = "markup5ever"
2239-
version = "0.10.1"
2237+
version = "0.11.0"
22402238
source = "registry+https://github.com/rust-lang/crates.io-index"
2241-
checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
2239+
checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
22422240
dependencies = [
22432241
"log",
22442242
"phf",
@@ -2248,18 +2246,6 @@ dependencies = [
22482246
"tendril",
22492247
]
22502248

2251-
[[package]]
2252-
name = "markup5ever_rcdom"
2253-
version = "0.1.0"
2254-
source = "registry+https://github.com/rust-lang/crates.io-index"
2255-
checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b"
2256-
dependencies = [
2257-
"html5ever",
2258-
"markup5ever",
2259-
"tendril",
2260-
"xml5ever",
2261-
]
2262-
22632249
[[package]]
22642250
name = "matchers"
22652251
version = "0.1.0"
@@ -2429,7 +2415,7 @@ dependencies = [
24292415
"libc",
24302416
"log",
24312417
"measureme 9.1.2",
2432-
"rand 0.8.4",
2418+
"rand 0.8.5",
24332419
"rustc-workspace-hack",
24342420
"rustc_version",
24352421
"shell-escape",
@@ -2575,9 +2561,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
25752561

25762562
[[package]]
25772563
name = "openssl-src"
2578-
version = "111.17.0+1.1.1m"
2564+
version = "111.18.0+1.1.1n"
25792565
source = "registry+https://github.com/rust-lang/crates.io-index"
2580-
checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4"
2566+
checksum = "7897a926e1e8d00219127dc020130eca4292e5ca666dd592480d72c3eca2ff6c"
25812567
dependencies = [
25822568
"cc",
25832569
]
@@ -2785,38 +2771,38 @@ dependencies = [
27852771

27862772
[[package]]
27872773
name = "phf"
2788-
version = "0.8.0"
2774+
version = "0.10.1"
27892775
source = "registry+https://github.com/rust-lang/crates.io-index"
2790-
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
2776+
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
27912777
dependencies = [
27922778
"phf_shared",
27932779
]
27942780

27952781
[[package]]
27962782
name = "phf_codegen"
2797-
version = "0.8.0"
2783+
version = "0.10.0"
27982784
source = "registry+https://github.com/rust-lang/crates.io-index"
2799-
checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
2785+
checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
28002786
dependencies = [
28012787
"phf_generator",
28022788
"phf_shared",
28032789
]
28042790

28052791
[[package]]
28062792
name = "phf_generator"
2807-
version = "0.8.0"
2793+
version = "0.10.0"
28082794
source = "registry+https://github.com/rust-lang/crates.io-index"
2809-
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
2795+
checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
28102796
dependencies = [
28112797
"phf_shared",
2812-
"rand 0.7.3",
2798+
"rand 0.8.5",
28132799
]
28142800

28152801
[[package]]
28162802
name = "phf_shared"
2817-
version = "0.8.0"
2803+
version = "0.10.0"
28182804
source = "registry+https://github.com/rust-lang/crates.io-index"
2819-
checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
2805+
checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
28202806
dependencies = [
28212807
"siphasher",
28222808
]
@@ -2925,9 +2911,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
29252911

29262912
[[package]]
29272913
name = "proc-macro2"
2928-
version = "1.0.30"
2914+
version = "1.0.37"
29292915
source = "registry+https://github.com/rust-lang/crates.io-index"
2930-
checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70"
2916+
checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
29312917
dependencies = [
29322918
"unicode-xid",
29332919
]
@@ -2995,9 +2981,9 @@ checksum = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"
29952981

29962982
[[package]]
29972983
name = "quote"
2998-
version = "1.0.7"
2984+
version = "1.0.18"
29992985
source = "registry+https://github.com/rust-lang/crates.io-index"
3000-
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
2986+
checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
30012987
dependencies = [
30022988
"proc-macro2",
30032989
]
@@ -3028,20 +3014,18 @@ dependencies = [
30283014
"libc",
30293015
"rand_chacha 0.2.2",
30303016
"rand_core 0.5.1",
3031-
"rand_hc 0.2.0",
3032-
"rand_pcg",
3017+
"rand_hc",
30333018
]
30343019

30353020
[[package]]
30363021
name = "rand"
3037-
version = "0.8.4"
3022+
version = "0.8.5"
30383023
source = "registry+https://github.com/rust-lang/crates.io-index"
3039-
checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
3024+
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
30403025
dependencies = [
30413026
"libc",
30423027
"rand_chacha 0.3.0",
30433028
"rand_core 0.6.2",
3044-
"rand_hc 0.3.0",
30453029
]
30463030

30473031
[[package]]
@@ -3091,24 +3075,6 @@ dependencies = [
30913075
"rand_core 0.5.1",
30923076
]
30933077

3094-
[[package]]
3095-
name = "rand_hc"
3096-
version = "0.3.0"
3097-
source = "registry+https://github.com/rust-lang/crates.io-index"
3098-
checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
3099-
dependencies = [
3100-
"rand_core 0.6.2",
3101-
]
3102-
3103-
[[package]]
3104-
name = "rand_pcg"
3105-
version = "0.2.1"
3106-
source = "registry+https://github.com/rust-lang/crates.io-index"
3107-
checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
3108-
dependencies = [
3109-
"rand_core 0.5.1",
3110-
]
3111-
31123078
[[package]]
31133079
name = "rand_xorshift"
31143080
version = "0.2.0"
@@ -3247,7 +3213,7 @@ dependencies = [
32473213
"num_cpus",
32483214
"ordslice",
32493215
"racer",
3250-
"rand 0.8.4",
3216+
"rand 0.8.5",
32513217
"rayon",
32523218
"regex",
32533219
"rls-analysis",
@@ -3320,7 +3286,7 @@ dependencies = [
33203286
"env_logger 0.9.0",
33213287
"futures 0.3.19",
33223288
"log",
3323-
"rand 0.8.4",
3289+
"rand 0.8.5",
33243290
"rls-data",
33253291
"rls-ipc",
33263292
"serde",
@@ -3861,7 +3827,7 @@ dependencies = [
38613827
name = "rustc_incremental"
38623828
version = "0.0.0"
38633829
dependencies = [
3864-
"rand 0.8.4",
3830+
"rand 0.8.5",
38653831
"rustc_ast",
38663832
"rustc_data_structures",
38673833
"rustc_errors",
@@ -4063,7 +4029,7 @@ dependencies = [
40634029
"either",
40644030
"gsgdt",
40654031
"polonius-engine",
4066-
"rand 0.8.4",
4032+
"rand 0.8.5",
40674033
"rand_xoshiro 0.6.0",
40684034
"rustc-rayon",
40694035
"rustc-rayon-core",
@@ -4965,22 +4931,23 @@ dependencies = [
49654931

49664932
[[package]]
49674933
name = "string_cache"
4968-
version = "0.8.0"
4934+
version = "0.8.3"
49694935
source = "registry+https://github.com/rust-lang/crates.io-index"
4970-
checksum = "2940c75beb4e3bf3a494cef919a747a2cb81e52571e212bfbd185074add7208a"
4936+
checksum = "33994d0838dc2d152d17a62adf608a869b5e846b65b389af7f3dbc1de45c5b26"
49714937
dependencies = [
49724938
"lazy_static",
49734939
"new_debug_unreachable",
4940+
"parking_lot",
49744941
"phf_shared",
49754942
"precomputed-hash",
49764943
"serde",
49774944
]
49784945

49794946
[[package]]
49804947
name = "string_cache_codegen"
4981-
version = "0.5.1"
4948+
version = "0.5.2"
49824949
source = "registry+https://github.com/rust-lang/crates.io-index"
4983-
checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
4950+
checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
49844951
dependencies = [
49854952
"phf_generator",
49864953
"phf_shared",
@@ -5053,9 +5020,9 @@ dependencies = [
50535020

50545021
[[package]]
50555022
name = "syn"
5056-
version = "1.0.80"
5023+
version = "1.0.91"
50575024
source = "registry+https://github.com/rust-lang/crates.io-index"
5058-
checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194"
5025+
checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
50595026
dependencies = [
50605027
"proc-macro2",
50615028
"quote",
@@ -5093,7 +5060,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
50935060
dependencies = [
50945061
"cfg-if 1.0.0",
50955062
"libc",
5096-
"rand 0.8.4",
5063+
"rand 0.8.5",
50975064
"redox_syscall",
50985065
"remove_dir_all",
50995066
"winapi",
@@ -5807,18 +5774,6 @@ dependencies = [
58075774
"libc",
58085775
]
58095776

5810-
[[package]]
5811-
name = "xml5ever"
5812-
version = "0.16.1"
5813-
source = "registry+https://github.com/rust-lang/crates.io-index"
5814-
checksum = "0b1b52e6e8614d4a58b8e70cf51ec0cc21b256ad8206708bcff8139b5bbd6a59"
5815-
dependencies = [
5816-
"log",
5817-
"mac",
5818-
"markup5ever",
5819-
"time",
5820-
]
5821-
58225777
[[package]]
58235778
name = "xz2"
58245779
version = "0.1.6"

src/tools/tidy/src/deps.rs

-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
177177
"rand_chacha",
178178
"rand_core",
179179
"rand_hc",
180-
"rand_pcg",
181180
"rand_xorshift",
182181
"rand_xoshiro",
183182
"redox_syscall",

0 commit comments

Comments
 (0)