Skip to content

Commit c8ed382

Browse files
shepmastershepmaster
authored
Merge pull request #924 from rust-lang/maint
2 parents 973a3e5 + b44fa2f commit c8ed382

File tree

10 files changed

+313
-232
lines changed

10 files changed

+313
-232
lines changed

‎compiler/base/Cargo.toml

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ default-features = false
4040

4141
[dependencies.aho_corasick]
4242
package = "aho-corasick"
43+
version = "=1.0.0"
44+
features = ["perf-literal", "std"]
45+
46+
[dependencies.aho_corasick_0_7_20]
47+
package = "aho-corasick"
4348
version = "=0.7.20"
4449
features = ["std"]
4550

@@ -181,13 +186,13 @@ features = ["clock", "iana-time-zone", "js-sys", "oldtime", "serde", "std", "tim
181186

182187
[dependencies.clap]
183188
package = "clap"
184-
version = "=4.2.2"
189+
version = "=4.2.3"
185190
features = ["color", "derive", "error-context", "help", "std", "suggestions", "unstable-doc", "usage"]
186191

187192
[dependencies.clap_builder]
188193
package = "clap_builder"
189-
version = "=4.2.2"
190-
features = ["cargo", "color", "env", "error-context", "help", "std", "string", "suggestions", "unicode", "unstable-doc", "usage", "wrap_help"]
194+
version = "=4.2.3"
195+
features = ["cargo", "color", "env", "error-context", "help", "std", "string", "suggestions", "unicode", "unstable-doc", "unstable-styles", "usage", "wrap_help"]
191196
default-features = false
192197

193198
[dependencies.clap_derive]
@@ -448,7 +453,7 @@ version = "=0.3.1"
448453

449454
[dependencies.h2]
450455
package = "h2"
451-
version = "=0.3.17"
456+
version = "=0.3.18"
452457

453458
[dependencies.half]
454459
package = "half"
@@ -504,7 +509,7 @@ version = "=2.1.0"
504509

505510
[dependencies.hyper]
506511
package = "hyper"
507-
version = "=0.14.25"
512+
version = "=0.14.26"
508513
features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"]
509514

510515
[dependencies.hyper_tls]
@@ -594,7 +599,7 @@ version = "=0.5.6"
594599

595600
[dependencies.linux_raw_sys]
596601
package = "linux-raw-sys"
597-
version = "=0.3.1"
602+
version = "=0.3.2"
598603
features = ["errno", "general", "ioctl", "no_std"]
599604
default-features = false
600605

@@ -967,15 +972,15 @@ features = ["array", "backup", "blob", "bundled", "bundled-full", "chrono", "col
967972

968973
[dependencies.rustc_demangle]
969974
package = "rustc-demangle"
970-
version = "=0.1.22"
975+
version = "=0.1.23"
971976

972977
[dependencies.rustc_version]
973978
package = "rustc_version"
974979
version = "=0.4.0"
975980

976981
[dependencies.rustix]
977982
package = "rustix"
978-
version = "=0.37.11"
983+
version = "=0.37.12"
979984
features = ["fs", "io-lifetimes", "libc", "std", "termios", "use-libc-auxv"]
980985

981986
[dependencies.ryu]
@@ -1415,6 +1420,11 @@ default-features = false
14151420

14161421
[build_dependencies.aho_corasick]
14171422
package = "aho-corasick"
1423+
version = "=1.0.0"
1424+
features = ["perf-literal", "std"]
1425+
1426+
[build_dependencies.aho_corasick_0_7_20]
1427+
package = "aho-corasick"
14181428
version = "=0.7.20"
14191429
features = ["std"]
14201430

@@ -1556,13 +1566,13 @@ features = ["clock", "iana-time-zone", "js-sys", "oldtime", "serde", "std", "tim
15561566

15571567
[build_dependencies.clap]
15581568
package = "clap"
1559-
version = "=4.2.2"
1569+
version = "=4.2.3"
15601570
features = ["color", "derive", "error-context", "help", "std", "suggestions", "unstable-doc", "usage"]
15611571

15621572
[build_dependencies.clap_builder]
15631573
package = "clap_builder"
1564-
version = "=4.2.2"
1565-
features = ["cargo", "color", "env", "error-context", "help", "std", "string", "suggestions", "unicode", "unstable-doc", "usage", "wrap_help"]
1574+
version = "=4.2.3"
1575+
features = ["cargo", "color", "env", "error-context", "help", "std", "string", "suggestions", "unicode", "unstable-doc", "unstable-styles", "usage", "wrap_help"]
15661576
default-features = false
15671577

15681578
[build_dependencies.clap_derive]
@@ -1823,7 +1833,7 @@ version = "=0.3.1"
18231833

18241834
[build_dependencies.h2]
18251835
package = "h2"
1826-
version = "=0.3.17"
1836+
version = "=0.3.18"
18271837

18281838
[build_dependencies.half]
18291839
package = "half"
@@ -1879,7 +1889,7 @@ version = "=2.1.0"
18791889

18801890
[build_dependencies.hyper]
18811891
package = "hyper"
1882-
version = "=0.14.25"
1892+
version = "=0.14.26"
18831893
features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"]
18841894

18851895
[build_dependencies.hyper_tls]
@@ -1969,7 +1979,7 @@ version = "=0.5.6"
19691979

19701980
[build_dependencies.linux_raw_sys]
19711981
package = "linux-raw-sys"
1972-
version = "=0.3.1"
1982+
version = "=0.3.2"
19731983
features = ["errno", "general", "ioctl", "no_std"]
19741984
default-features = false
19751985

@@ -2342,15 +2352,15 @@ features = ["array", "backup", "blob", "bundled", "bundled-full", "chrono", "col
23422352

23432353
[build_dependencies.rustc_demangle]
23442354
package = "rustc-demangle"
2345-
version = "=0.1.22"
2355+
version = "=0.1.23"
23462356

23472357
[build_dependencies.rustc_version]
23482358
package = "rustc_version"
23492359
version = "=0.4.0"
23502360

23512361
[build_dependencies.rustix]
23522362
package = "rustix"
2353-
version = "=0.37.11"
2363+
version = "=0.37.12"
23542364
features = ["fs", "io-lifetimes", "libc", "std", "termios", "use-libc-auxv"]
23552365

23562366
[build_dependencies.ryu]

‎compiler/base/crate-information.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,14 @@
2121
},
2222
{
2323
"name": "aho-corasick",
24-
"version": "0.7.20",
24+
"version": "1.0.0",
2525
"id": "aho_corasick"
2626
},
27+
{
28+
"name": "aho-corasick",
29+
"version": "0.7.20",
30+
"id": "aho_corasick_0_7_20"
31+
},
2732
{
2833
"name": "ansi_term",
2934
"version": "0.12.1",
@@ -176,12 +181,12 @@
176181
},
177182
{
178183
"name": "clap",
179-
"version": "4.2.2",
184+
"version": "4.2.3",
180185
"id": "clap"
181186
},
182187
{
183188
"name": "clap_builder",
184-
"version": "4.2.2",
189+
"version": "4.2.3",
185190
"id": "clap_builder"
186191
},
187192
{
@@ -461,7 +466,7 @@
461466
},
462467
{
463468
"name": "h2",
464-
"version": "0.3.17",
469+
"version": "0.3.18",
465470
"id": "h2"
466471
},
467472
{
@@ -526,7 +531,7 @@
526531
},
527532
{
528533
"name": "hyper",
529-
"version": "0.14.25",
534+
"version": "0.14.26",
530535
"id": "hyper"
531536
},
532537
{
@@ -626,7 +631,7 @@
626631
},
627632
{
628633
"name": "linux-raw-sys",
629-
"version": "0.3.1",
634+
"version": "0.3.2",
630635
"id": "linux_raw_sys"
631636
},
632637
{
@@ -1026,7 +1031,7 @@
10261031
},
10271032
{
10281033
"name": "rustc-demangle",
1029-
"version": "0.1.22",
1034+
"version": "0.1.23",
10301035
"id": "rustc_demangle"
10311036
},
10321037
{
@@ -1036,7 +1041,7 @@
10361041
},
10371042
{
10381043
"name": "rustix",
1039-
"version": "0.37.11",
1044+
"version": "0.37.12",
10401045
"id": "rustix"
10411046
},
10421047
{

‎tests/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ GEM
2929
rack (3.0.7)
3030
rack-test (2.1.0)
3131
rack (>= 1.3)
32-
regexp_parser (2.7.0)
32+
regexp_parser (2.8.0)
3333
rexml (3.2.5)
3434
rspec (3.12.0)
3535
rspec-core (~> 3.12.0)
3636
rspec-expectations (~> 3.12.0)
3737
rspec-mocks (~> 3.12.0)
38-
rspec-core (3.12.1)
38+
rspec-core (3.12.2)
3939
rspec-support (~> 3.12.0)
4040
rspec-expectations (3.12.2)
4141
diff-lcs (>= 1.2.0, < 2.0)

‎top-crates/Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)