Skip to content

Commit 5717e52

Browse files
committed
Auto merge of rust-lang#3335 - rust-lang:rustup-2024-02-29, r=saethlin
Automatic Rustup
2 parents d79a5ed + 1b41d79 commit 5717e52

File tree

1,361 files changed

+16912
-13316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,361 files changed

+16912
-13316
lines changed

Cargo.lock

+87-51
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,6 @@ dependencies = [
129129
"winapi",
130130
]
131131

132-
[[package]]
133-
name = "anstream"
134-
version = "0.5.0"
135-
source = "registry+https://github.com/rust-lang/crates.io-index"
136-
checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
137-
dependencies = [
138-
"anstyle",
139-
"anstyle-parse",
140-
"anstyle-query",
141-
"anstyle-wincon 2.1.0",
142-
"colorchoice",
143-
"utf8parse",
144-
]
145-
146132
[[package]]
147133
name = "anstream"
148134
version = "0.6.11"
@@ -152,7 +138,7 @@ dependencies = [
152138
"anstyle",
153139
"anstyle-parse",
154140
"anstyle-query",
155-
"anstyle-wincon 3.0.2",
141+
"anstyle-wincon",
156142
"colorchoice",
157143
"utf8parse",
158144
]
@@ -181,16 +167,6 @@ dependencies = [
181167
"windows-sys 0.52.0",
182168
]
183169

184-
[[package]]
185-
name = "anstyle-wincon"
186-
version = "2.1.0"
187-
source = "registry+https://github.com/rust-lang/crates.io-index"
188-
checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
189-
dependencies = [
190-
"anstyle",
191-
"windows-sys 0.48.0",
192-
]
193-
194170
[[package]]
195171
name = "anstyle-wincon"
196172
version = "3.0.2"
@@ -534,7 +510,7 @@ version = "4.5.0"
534510
source = "registry+https://github.com/rust-lang/crates.io-index"
535511
checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
536512
dependencies = [
537-
"anstream 0.6.11",
513+
"anstream",
538514
"anstyle",
539515
"clap_lex",
540516
"strsim 0.11.0",
@@ -572,15 +548,15 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
572548
name = "clippy"
573549
version = "0.1.78"
574550
dependencies = [
575-
"anstream 0.5.0",
551+
"anstream",
576552
"clippy_config",
577553
"clippy_lints",
578554
"clippy_utils",
579555
"color-print",
580556
"filetime",
581557
"futures",
582558
"if_chain",
583-
"itertools",
559+
"itertools 0.12.1",
584560
"parking_lot",
585561
"quote",
586562
"regex",
@@ -592,7 +568,7 @@ dependencies = [
592568
"tester",
593569
"tokio",
594570
"toml 0.7.8",
595-
"ui_test",
571+
"ui_test 0.22.2",
596572
"walkdir",
597573
]
598574

@@ -613,7 +589,7 @@ dependencies = [
613589
"aho-corasick",
614590
"clap",
615591
"indoc",
616-
"itertools",
592+
"itertools 0.12.1",
617593
"opener",
618594
"shell-escape",
619595
"walkdir",
@@ -628,7 +604,7 @@ dependencies = [
628604
"clippy_config",
629605
"clippy_utils",
630606
"declare_clippy_lint",
631-
"itertools",
607+
"itertools 0.12.1",
632608
"quine-mc_cluskey",
633609
"regex",
634610
"regex-syntax 0.8.2",
@@ -650,7 +626,7 @@ version = "0.1.78"
650626
dependencies = [
651627
"arrayvec",
652628
"clippy_config",
653-
"itertools",
629+
"itertools 0.12.1",
654630
"rustc-semver",
655631
]
656632

@@ -974,7 +950,7 @@ checksum = "a0afaad2b26fa326569eb264b1363e8ae3357618c43982b3f285f0774ce76b69"
974950
name = "declare_clippy_lint"
975951
version = "0.1.78"
976952
dependencies = [
977-
"itertools",
953+
"itertools 0.12.1",
978954
"quote",
979955
"syn 2.0.48",
980956
]
@@ -1230,7 +1206,7 @@ version = "0.11.2"
12301206
source = "registry+https://github.com/rust-lang/crates.io-index"
12311207
checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d"
12321208
dependencies = [
1233-
"anstream 0.6.11",
1209+
"anstream",
12341210
"anstyle",
12351211
"env_filter",
12361212
"humantime",
@@ -2054,6 +2030,15 @@ dependencies = [
20542030
"either",
20552031
]
20562032

2033+
[[package]]
2034+
name = "itertools"
2035+
version = "0.12.1"
2036+
source = "registry+https://github.com/rust-lang/crates.io-index"
2037+
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
2038+
dependencies = [
2039+
"either",
2040+
]
2041+
20572042
[[package]]
20582043
name = "itoa"
20592044
version = "1.0.10"
@@ -2476,7 +2461,7 @@ dependencies = [
24762461
"regex",
24772462
"rustc_version",
24782463
"smallvec",
2479-
"ui_test",
2464+
"ui_test 0.21.2",
24802465
]
24812466

24822467
[[package]]
@@ -3432,18 +3417,29 @@ version = "0.0.0"
34323417
dependencies = [
34333418
"bitflags 2.4.2",
34343419
"memchr",
3420+
"rustc_ast_ir",
34353421
"rustc_data_structures",
34363422
"rustc_index",
34373423
"rustc_lexer",
34383424
"rustc_macros",
34393425
"rustc_serialize",
34403426
"rustc_span",
3441-
"rustc_type_ir",
34423427
"smallvec",
34433428
"thin-vec",
34443429
"tracing",
34453430
]
34463431

3432+
[[package]]
3433+
name = "rustc_ast_ir"
3434+
version = "0.0.0"
3435+
dependencies = [
3436+
"rustc_data_structures",
3437+
"rustc_macros",
3438+
"rustc_serialize",
3439+
"rustc_span",
3440+
"smallvec",
3441+
]
3442+
34473443
[[package]]
34483444
name = "rustc_ast_lowering"
34493445
version = "0.0.0"
@@ -3469,7 +3465,7 @@ dependencies = [
34693465
name = "rustc_ast_passes"
34703466
version = "0.0.0"
34713467
dependencies = [
3472-
"itertools",
3468+
"itertools 0.11.0",
34733469
"rustc_ast",
34743470
"rustc_ast_pretty",
34753471
"rustc_attr",
@@ -3489,7 +3485,7 @@ dependencies = [
34893485
name = "rustc_ast_pretty"
34903486
version = "0.0.0"
34913487
dependencies = [
3492-
"itertools",
3488+
"itertools 0.11.0",
34933489
"rustc_ast",
34943490
"rustc_span",
34953491
"thin-vec",
@@ -3529,7 +3525,7 @@ name = "rustc_borrowck"
35293525
version = "0.0.0"
35303526
dependencies = [
35313527
"either",
3532-
"itertools",
3528+
"itertools 0.11.0",
35333529
"polonius-engine",
35343530
"rustc_data_structures",
35353531
"rustc_errors",
@@ -3582,7 +3578,7 @@ name = "rustc_codegen_llvm"
35823578
version = "0.0.0"
35833579
dependencies = [
35843580
"bitflags 2.4.2",
3585-
"itertools",
3581+
"itertools 0.11.0",
35863582
"libc",
35873583
"measureme",
35883584
"object",
@@ -3618,7 +3614,7 @@ dependencies = [
36183614
"ar_archive_writer",
36193615
"bitflags 2.4.2",
36203616
"cc",
3621-
"itertools",
3617+
"itertools 0.11.0",
36223618
"jobserver",
36233619
"libc",
36243620
"object",
@@ -3899,7 +3895,7 @@ dependencies = [
38993895
name = "rustc_hir_analysis"
39003896
version = "0.0.0"
39013897
dependencies = [
3902-
"itertools",
3898+
"itertools 0.11.0",
39033899
"rustc_arena",
39043900
"rustc_ast",
39053901
"rustc_attr",
@@ -3938,7 +3934,7 @@ dependencies = [
39383934
name = "rustc_hir_typeck"
39393935
version = "0.0.0"
39403936
dependencies = [
3941-
"itertools",
3937+
"itertools 0.11.0",
39423938
"rustc_ast",
39433939
"rustc_attr",
39443940
"rustc_data_structures",
@@ -4196,6 +4192,7 @@ dependencies = [
41964192
"rustc_apfloat",
41974193
"rustc_arena",
41984194
"rustc_ast",
4195+
"rustc_ast_ir",
41994196
"rustc_attr",
42004197
"rustc_data_structures",
42014198
"rustc_error_messages",
@@ -4222,7 +4219,7 @@ name = "rustc_mir_build"
42224219
version = "0.0.0"
42234220
dependencies = [
42244221
"either",
4225-
"itertools",
4222+
"itertools 0.11.0",
42264223
"rustc_apfloat",
42274224
"rustc_arena",
42284225
"rustc_ast",
@@ -4269,7 +4266,7 @@ name = "rustc_mir_transform"
42694266
version = "0.0.0"
42704267
dependencies = [
42714268
"either",
4272-
"itertools",
4269+
"itertools 0.11.0",
42734270
"rustc_arena",
42744271
"rustc_ast",
42754272
"rustc_attr",
@@ -4349,7 +4346,7 @@ dependencies = [
43494346
name = "rustc_passes"
43504347
version = "0.0.0"
43514348
dependencies = [
4352-
"itertools",
4349+
"itertools 0.11.0",
43534350
"rustc_ast",
43544351
"rustc_ast_pretty",
43554352
"rustc_attr",
@@ -4599,7 +4596,7 @@ name = "rustc_trait_selection"
45994596
version = "0.0.0"
46004597
dependencies = [
46014598
"bitflags 2.4.2",
4602-
"itertools",
4599+
"itertools 0.11.0",
46034600
"rustc_ast",
46044601
"rustc_attr",
46054602
"rustc_data_structures",
@@ -4638,7 +4635,7 @@ dependencies = [
46384635
name = "rustc_transmute"
46394636
version = "0.0.0"
46404637
dependencies = [
4641-
"itertools",
4638+
"itertools 0.11.0",
46424639
"rustc_data_structures",
46434640
"rustc_hir",
46444641
"rustc_infer",
@@ -4653,7 +4650,7 @@ dependencies = [
46534650
name = "rustc_ty_utils"
46544651
version = "0.0.0"
46554652
dependencies = [
4656-
"itertools",
4653+
"itertools 0.11.0",
46574654
"rustc_data_structures",
46584655
"rustc_errors",
46594656
"rustc_fluent_macro",
@@ -4676,6 +4673,7 @@ version = "0.0.0"
46764673
dependencies = [
46774674
"bitflags 2.4.2",
46784675
"derivative",
4676+
"rustc_ast_ir",
46794677
"rustc_data_structures",
46804678
"rustc_index",
46814679
"rustc_macros",
@@ -4701,7 +4699,7 @@ dependencies = [
47014699
"askama",
47024700
"expect-test",
47034701
"indexmap",
4704-
"itertools",
4702+
"itertools 0.11.0",
47054703
"minifier",
47064704
"once_cell",
47074705
"regex",
@@ -4783,7 +4781,7 @@ dependencies = [
47834781
"dirs",
47844782
"getopts",
47854783
"ignore",
4786-
"itertools",
4784+
"itertools 0.11.0",
47874785
"lazy_static",
47884786
"regex",
47894787
"rustfmt-config_proc_macro",
@@ -5045,6 +5043,16 @@ dependencies = [
50455043
"windows-sys 0.48.0",
50465044
]
50475045

5046+
[[package]]
5047+
name = "spanned"
5048+
version = "0.1.6"
5049+
source = "registry+https://github.com/rust-lang/crates.io-index"
5050+
checksum = "ad48ded9f0734eca7058107cc170767b8758e41e4088fb0020e7ff7ec6b0d92d"
5051+
dependencies = [
5052+
"bstr",
5053+
"color-eyre",
5054+
]
5055+
50485056
[[package]]
50495057
name = "spdx-expression"
50505058
version = "0.5.2"
@@ -5796,6 +5804,34 @@ dependencies = [
57965804
"tempfile",
57975805
]
57985806

5807+
[[package]]
5808+
name = "ui_test"
5809+
version = "0.22.2"
5810+
source = "registry+https://github.com/rust-lang/crates.io-index"
5811+
checksum = "0b1ded30ff8c9d83e8d85d7e8e8aabbaf2c282a2b0ea09ef3f1accd4906134c7"
5812+
dependencies = [
5813+
"annotate-snippets 0.10.1",
5814+
"anyhow",
5815+
"bstr",
5816+
"cargo-platform",
5817+
"cargo_metadata 0.18.1",
5818+
"color-eyre",
5819+
"colored",
5820+
"comma",
5821+
"crossbeam-channel",
5822+
"indicatif",
5823+
"lazy_static",
5824+
"levenshtein",
5825+
"prettydiff",
5826+
"regex",
5827+
"rustc_version",
5828+
"rustfix",
5829+
"serde",
5830+
"serde_json",
5831+
"spanned",
5832+
"tempfile",
5833+
]
5834+
57995835
[[package]]
58005836
name = "unic-langid"
58015837
version = "0.9.4"

0 commit comments

Comments
 (0)