Skip to content

Commit edfadbf

Browse files
authored
Rollup merge of #126524 - klensy:bump-15-06-24, r=onur-ozkan
bump few deps This bump deps to cut dupes: Updating html5ever 0.27 Updating derive_more 0.99.18 Updating crossbeam-deque v0.8.5 Updating crossbeam-epoch v0.9.18 Updating crossbeam-utils v0.8.20 Updating junction v1.1.0 No interesting changes in changelogs.
2 parents 1af0e6e + d69f088 commit edfadbf

File tree

4 files changed

+20
-79
lines changed

4 files changed

+20
-79
lines changed

Cargo.lock

+9-56
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ version = "4.0.0"
8787
source = "registry+https://github.com/rust-lang/crates.io-index"
8888
checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459"
8989
dependencies = [
90-
"html5ever 0.27.0",
90+
"html5ever",
9191
"maplit",
9292
"once_cell",
9393
"tendril",
@@ -542,7 +542,7 @@ checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
542542
dependencies = [
543543
"chrono",
544544
"chrono-tz-build",
545-
"phf 0.11.2",
545+
"phf",
546546
]
547547

548548
[[package]]
@@ -552,8 +552,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
552552
checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
553553
dependencies = [
554554
"parse-zoneinfo",
555-
"phf 0.11.2",
556-
"phf_codegen 0.11.2",
555+
"phf",
556+
"phf_codegen",
557557
]
558558

559559
[[package]]
@@ -1738,20 +1738,6 @@ dependencies = [
17381738
"utf8-width",
17391739
]
17401740

1741-
[[package]]
1742-
name = "html5ever"
1743-
version = "0.26.0"
1744-
source = "registry+https://github.com/rust-lang/crates.io-index"
1745-
checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
1746-
dependencies = [
1747-
"log",
1748-
"mac",
1749-
"markup5ever 0.11.0",
1750-
"proc-macro2",
1751-
"quote",
1752-
"syn 1.0.109",
1753-
]
1754-
17551741
[[package]]
17561742
name = "html5ever"
17571743
version = "0.27.0"
@@ -1760,7 +1746,7 @@ checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
17601746
dependencies = [
17611747
"log",
17621748
"mac",
1763-
"markup5ever 0.12.1",
1749+
"markup5ever",
17641750
"proc-macro2",
17651751
"quote",
17661752
"syn 2.0.66",
@@ -2240,7 +2226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
22402226
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
22412227
dependencies = [
22422228
"cfg-if",
2243-
"windows-targets 0.52.5",
2229+
"windows-targets 0.48.5",
22442230
]
22452231

22462232
[[package]]
@@ -2290,7 +2276,7 @@ dependencies = [
22902276
name = "linkchecker"
22912277
version = "0.1.0"
22922278
dependencies = [
2293-
"html5ever 0.26.0",
2279+
"html5ever",
22942280
"regex",
22952281
]
22962282

@@ -2375,29 +2361,15 @@ version = "1.0.2"
23752361
source = "registry+https://github.com/rust-lang/crates.io-index"
23762362
checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
23772363

2378-
[[package]]
2379-
name = "markup5ever"
2380-
version = "0.11.0"
2381-
source = "registry+https://github.com/rust-lang/crates.io-index"
2382-
checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
2383-
dependencies = [
2384-
"log",
2385-
"phf 0.10.1",
2386-
"phf_codegen 0.10.0",
2387-
"string_cache",
2388-
"string_cache_codegen",
2389-
"tendril",
2390-
]
2391-
23922364
[[package]]
23932365
name = "markup5ever"
23942366
version = "0.12.1"
23952367
source = "registry+https://github.com/rust-lang/crates.io-index"
23962368
checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
23972369
dependencies = [
23982370
"log",
2399-
"phf 0.11.2",
2400-
"phf_codegen 0.11.2",
2371+
"phf",
2372+
"phf_codegen",
24012373
"string_cache",
24022374
"string_cache_codegen",
24032375
"tendril",
@@ -3010,15 +2982,6 @@ dependencies = [
30102982
"sha2",
30112983
]
30122984

3013-
[[package]]
3014-
name = "phf"
3015-
version = "0.10.1"
3016-
source = "registry+https://github.com/rust-lang/crates.io-index"
3017-
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
3018-
dependencies = [
3019-
"phf_shared 0.10.0",
3020-
]
3021-
30222985
[[package]]
30232986
name = "phf"
30242987
version = "0.11.2"
@@ -3028,16 +2991,6 @@ dependencies = [
30282991
"phf_shared 0.11.2",
30292992
]
30302993

3031-
[[package]]
3032-
name = "phf_codegen"
3033-
version = "0.10.0"
3034-
source = "registry+https://github.com/rust-lang/crates.io-index"
3035-
checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
3036-
dependencies = [
3037-
"phf_generator 0.10.0",
3038-
"phf_shared 0.10.0",
3039-
]
3040-
30412994
[[package]]
30422995
name = "phf_codegen"
30432996
version = "0.11.2"

src/bootstrap/Cargo.lock

+9-21
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ version = "1.0.4"
1717
source = "registry+https://github.com/rust-lang/crates.io-index"
1818
checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
1919

20-
[[package]]
21-
name = "autocfg"
22-
version = "1.1.0"
23-
source = "registry+https://github.com/rust-lang/crates.io-index"
24-
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
25-
2620
[[package]]
2721
name = "bitflags"
2822
version = "1.3.2"
@@ -181,34 +175,28 @@ dependencies = [
181175

182176
[[package]]
183177
name = "crossbeam-deque"
184-
version = "0.8.4"
178+
version = "0.8.5"
185179
source = "registry+https://github.com/rust-lang/crates.io-index"
186-
checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
180+
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
187181
dependencies = [
188-
"cfg-if",
189182
"crossbeam-epoch",
190183
"crossbeam-utils",
191184
]
192185

193186
[[package]]
194187
name = "crossbeam-epoch"
195-
version = "0.9.17"
188+
version = "0.9.18"
196189
source = "registry+https://github.com/rust-lang/crates.io-index"
197-
checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
190+
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
198191
dependencies = [
199-
"autocfg",
200-
"cfg-if",
201192
"crossbeam-utils",
202193
]
203194

204195
[[package]]
205196
name = "crossbeam-utils"
206-
version = "0.8.18"
197+
version = "0.8.20"
207198
source = "registry+https://github.com/rust-lang/crates.io-index"
208-
checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
209-
dependencies = [
210-
"cfg-if",
211-
]
199+
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
212200

213201
[[package]]
214202
name = "crypto-common"
@@ -331,12 +319,12 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
331319

332320
[[package]]
333321
name = "junction"
334-
version = "1.0.0"
322+
version = "1.1.0"
335323
source = "registry+https://github.com/rust-lang/crates.io-index"
336-
checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb"
324+
checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa"
337325
dependencies = [
338326
"scopeguard",
339-
"winapi",
327+
"windows-sys",
340328
]
341329

342330
[[package]]

src/tools/linkchecker/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ path = "main.rs"
99

1010
[dependencies]
1111
regex = "1"
12-
html5ever = "0.26.0"
12+
html5ever = "0.27.0"

src/tools/linkchecker/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ fn maybe_redirect(source: &str) -> Option<String> {
503503

504504
fn parse_html<Sink: TokenSink>(source: &str, sink: Sink) -> Sink {
505505
let tendril: ByteTendril = source.as_bytes().into();
506-
let mut input = BufferQueue::new();
506+
let mut input = BufferQueue::default();
507507
input.push_back(tendril.try_reinterpret().unwrap());
508508

509509
let mut tok = Tokenizer::new(sink, TokenizerOpts::default());

0 commit comments

Comments
 (0)