Skip to content

Commit 973a3e5

Browse files
shepmastershepmaster
authored
Merge pull request #922 from rust-lang/maint
Maintenance
2 parents 0fafceb + ceb0583 commit 973a3e5

File tree

7 files changed

+428
-425
lines changed

7 files changed

+428
-425
lines changed

‎compiler/base/Cargo.toml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,23 @@ version = "=0.12.1"
4949

5050
[dependencies.anstream]
5151
package = "anstream"
52-
version = "=0.2.6"
52+
version = "=0.3.0"
5353
features = ["auto", "wincon"]
5454

5555
[dependencies.anstyle]
5656
package = "anstyle"
57-
version = "=0.3.5"
57+
version = "=1.0.0"
5858
features = ["std"]
5959

6060
[dependencies.anstyle_parse]
6161
package = "anstyle-parse"
62-
version = "=0.1.1"
62+
version = "=0.2.0"
6363
features = ["utf8"]
6464

65+
[dependencies.anstyle_query]
66+
package = "anstyle-query"
67+
version = "=1.0.0"
68+
6569
[dependencies.anyhow]
6670
package = "anyhow"
6771
version = "=1.0.70"
@@ -177,12 +181,12 @@ features = ["clock", "iana-time-zone", "js-sys", "oldtime", "serde", "std", "tim
177181

178182
[dependencies.clap]
179183
package = "clap"
180-
version = "=4.2.1"
184+
version = "=4.2.2"
181185
features = ["color", "derive", "error-context", "help", "std", "suggestions", "unstable-doc", "usage"]
182186

183187
[dependencies.clap_builder]
184188
package = "clap_builder"
185-
version = "=4.2.1"
189+
version = "=4.2.2"
186190
features = ["cargo", "color", "env", "error-context", "help", "std", "string", "suggestions", "unicode", "unstable-doc", "usage", "wrap_help"]
187191
default-features = false
188192

@@ -198,14 +202,10 @@ version = "=0.4.1"
198202
package = "color_quant"
199203
version = "=1.1.0"
200204

201-
[dependencies.concolor_override]
202-
package = "concolor-override"
205+
[dependencies.colorchoice]
206+
package = "colorchoice"
203207
version = "=1.0.0"
204208

205-
[dependencies.concolor_query]
206-
package = "concolor-query"
207-
version = "=0.3.3"
208-
209209
[dependencies.cookie]
210210
package = "cookie"
211211
version = "=0.16.2"
@@ -448,7 +448,7 @@ version = "=0.3.1"
448448

449449
[dependencies.h2]
450450
package = "h2"
451-
version = "=0.3.16"
451+
version = "=0.3.17"
452452

453453
[dependencies.half]
454454
package = "half"
@@ -1016,7 +1016,7 @@ version = "=1.0.160"
10161016

10171017
[dependencies.serde_json]
10181018
package = "serde_json"
1019-
version = "=1.0.95"
1019+
version = "=1.0.96"
10201020
features = ["raw_value", "std"]
10211021

10221022
[dependencies.serde_spanned]
@@ -1121,7 +1121,7 @@ default-features = false
11211121

11221122
[dependencies.syn]
11231123
package = "syn"
1124-
version = "=2.0.14"
1124+
version = "=2.0.15"
11251125
features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"]
11261126

11271127
[dependencies.syn_1_0_109]
@@ -1424,19 +1424,23 @@ version = "=0.12.1"
14241424

14251425
[build_dependencies.anstream]
14261426
package = "anstream"
1427-
version = "=0.2.6"
1427+
version = "=0.3.0"
14281428
features = ["auto", "wincon"]
14291429

14301430
[build_dependencies.anstyle]
14311431
package = "anstyle"
1432-
version = "=0.3.5"
1432+
version = "=1.0.0"
14331433
features = ["std"]
14341434

14351435
[build_dependencies.anstyle_parse]
14361436
package = "anstyle-parse"
1437-
version = "=0.1.1"
1437+
version = "=0.2.0"
14381438
features = ["utf8"]
14391439

1440+
[build_dependencies.anstyle_query]
1441+
package = "anstyle-query"
1442+
version = "=1.0.0"
1443+
14401444
[build_dependencies.anyhow]
14411445
package = "anyhow"
14421446
version = "=1.0.70"
@@ -1552,12 +1556,12 @@ features = ["clock", "iana-time-zone", "js-sys", "oldtime", "serde", "std", "tim
15521556

15531557
[build_dependencies.clap]
15541558
package = "clap"
1555-
version = "=4.2.1"
1559+
version = "=4.2.2"
15561560
features = ["color", "derive", "error-context", "help", "std", "suggestions", "unstable-doc", "usage"]
15571561

15581562
[build_dependencies.clap_builder]
15591563
package = "clap_builder"
1560-
version = "=4.2.1"
1564+
version = "=4.2.2"
15611565
features = ["cargo", "color", "env", "error-context", "help", "std", "string", "suggestions", "unicode", "unstable-doc", "usage", "wrap_help"]
15621566
default-features = false
15631567

@@ -1573,14 +1577,10 @@ version = "=0.4.1"
15731577
package = "color_quant"
15741578
version = "=1.1.0"
15751579

1576-
[build_dependencies.concolor_override]
1577-
package = "concolor-override"
1580+
[build_dependencies.colorchoice]
1581+
package = "colorchoice"
15781582
version = "=1.0.0"
15791583

1580-
[build_dependencies.concolor_query]
1581-
package = "concolor-query"
1582-
version = "=0.3.3"
1583-
15841584
[build_dependencies.cookie]
15851585
package = "cookie"
15861586
version = "=0.16.2"
@@ -1823,7 +1823,7 @@ version = "=0.3.1"
18231823

18241824
[build_dependencies.h2]
18251825
package = "h2"
1826-
version = "=0.3.16"
1826+
version = "=0.3.17"
18271827

18281828
[build_dependencies.half]
18291829
package = "half"
@@ -2391,7 +2391,7 @@ version = "=1.0.160"
23912391

23922392
[build_dependencies.serde_json]
23932393
package = "serde_json"
2394-
version = "=1.0.95"
2394+
version = "=1.0.96"
23952395
features = ["raw_value", "std"]
23962396

23972397
[build_dependencies.serde_spanned]
@@ -2496,7 +2496,7 @@ default-features = false
24962496

24972497
[build_dependencies.syn]
24982498
package = "syn"
2499-
version = "=2.0.14"
2499+
version = "=2.0.15"
25002500
features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"]
25012501

25022502
[build_dependencies.syn_1_0_109]

‎compiler/base/crate-information.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,24 @@
3131
},
3232
{
3333
"name": "anstream",
34-
"version": "0.2.6",
34+
"version": "0.3.0",
3535
"id": "anstream"
3636
},
3737
{
3838
"name": "anstyle",
39-
"version": "0.3.5",
39+
"version": "1.0.0",
4040
"id": "anstyle"
4141
},
4242
{
4343
"name": "anstyle-parse",
44-
"version": "0.1.1",
44+
"version": "0.2.0",
4545
"id": "anstyle_parse"
4646
},
47+
{
48+
"name": "anstyle-query",
49+
"version": "1.0.0",
50+
"id": "anstyle_query"
51+
},
4752
{
4853
"name": "anyhow",
4954
"version": "1.0.70",
@@ -171,12 +176,12 @@
171176
},
172177
{
173178
"name": "clap",
174-
"version": "4.2.1",
179+
"version": "4.2.2",
175180
"id": "clap"
176181
},
177182
{
178183
"name": "clap_builder",
179-
"version": "4.2.1",
184+
"version": "4.2.2",
180185
"id": "clap_builder"
181186
},
182187
{
@@ -195,14 +200,9 @@
195200
"id": "color_quant"
196201
},
197202
{
198-
"name": "concolor-override",
203+
"name": "colorchoice",
199204
"version": "1.0.0",
200-
"id": "concolor_override"
201-
},
202-
{
203-
"name": "concolor-query",
204-
"version": "0.3.3",
205-
"id": "concolor_query"
205+
"id": "colorchoice"
206206
},
207207
{
208208
"name": "cookie",
@@ -461,7 +461,7 @@
461461
},
462462
{
463463
"name": "h2",
464-
"version": "0.3.16",
464+
"version": "0.3.17",
465465
"id": "h2"
466466
},
467467
{
@@ -1081,7 +1081,7 @@
10811081
},
10821082
{
10831083
"name": "serde_json",
1084-
"version": "1.0.95",
1084+
"version": "1.0.96",
10851085
"id": "serde_json"
10861086
},
10871087
{
@@ -1196,7 +1196,7 @@
11961196
},
11971197
{
11981198
"name": "syn",
1199-
"version": "2.0.14",
1199+
"version": "2.0.15",
12001200
"id": "syn"
12011201
},
12021202
{

‎compiler/base/modify-cargo-toml/Cargo.lock

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

‎tests/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.1)
4+
addressable (2.8.4)
55
public_suffix (>= 2.0.2, < 6.0)
6-
capybara (3.38.0)
6+
capybara (3.39.0)
77
addressable
88
matrix
99
mini_mime (>= 0.1.3)
@@ -21,7 +21,7 @@ GEM
2121
matrix (0.4.2)
2222
mini_mime (1.1.2)
2323
mini_portile2 (2.8.1)
24-
nokogiri (1.14.2)
24+
nokogiri (1.14.3)
2525
mini_portile2 (~> 2.8.0)
2626
racc (~> 1.4)
2727
public_suffix (5.0.1)
@@ -40,7 +40,7 @@ GEM
4040
rspec-expectations (3.12.2)
4141
diff-lcs (>= 1.2.0, < 2.0)
4242
rspec-support (~> 3.12.0)
43-
rspec-mocks (3.12.4)
43+
rspec-mocks (3.12.5)
4444
diff-lcs (>= 1.2.0, < 2.0)
4545
rspec-support (~> 3.12.0)
4646
rspec-support (3.12.0)

0 commit comments

Comments
 (0)