Skip to content

Commit 34aff74

Browse files
committed
Auto merge of rust-lang#18183 - lnicola:sync-from-rust, r=lnicola
internal: Sync from downstream
2 parents 938c7b1 + 8be1946 commit 34aff74

File tree

4,923 files changed

+73659
-50675
lines changed

Some content is hidden

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

4,923 files changed

+73659
-50675
lines changed

.git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ ec2cc761bc7067712ecc7734502f703fe3b024c8
2727
84ac80f1921afc243d71fd0caaa4f2838c294102
2828
# bless mir-opt tests to add `copy`
2929
99cb0c6bc399fb94a0ddde7e9b38e9c00d523bad
30+
# reformat with rustfmt edition 2024
31+
c682aa162b0d41e21cc6748f4fecfe01efb69d1f

.gitmodules

+9-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
3535
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/19.1-2024-07-30
36+
branch = rustc/19.1-2024-09-17
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book
@@ -47,3 +47,11 @@
4747
path = src/tools/rustc-perf
4848
url = https://github.com/rust-lang/rustc-perf.git
4949
shallow = true
50+
[submodule "src/tools/enzyme"]
51+
path = src/tools/enzyme
52+
url = https://github.com/EnzymeAD/Enzyme.git
53+
shallow = true
54+
[submodule "src/gcc"]
55+
path = src/gcc
56+
url = https://github.com/rust-lang/gcc.git
57+
shallow = true

.mailmap

+2
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ boolean_coercion <[email protected]>
8181
8282
bors <[email protected]> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
8383
bors <[email protected]> bors[bot] <bors[bot]@users.noreply.github.com>
84+
8485
Braden Nelson <[email protected]>
8586
Brandon Sanderson <[email protected]> Brandon Sanderson <[email protected]>
8687
Brett Cannon <[email protected]> Brett Cannon <[email protected]>
@@ -146,6 +147,7 @@ David Klein <[email protected]>
146147
147148
David Ross <[email protected]>
148149
150+
149151
150152
151153
dependabot[bot] <dependabot[bot]@users.noreply.github.com> <27856297+dependabot-preview[bot]@users.noreply.github.com>

Cargo.lock

+46-76
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,6 @@ dependencies = [
104104
"unicode-width",
105105
]
106106

107-
[[package]]
108-
name = "ansi_term"
109-
version = "0.12.1"
110-
source = "registry+https://github.com/rust-lang/crates.io-index"
111-
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
112-
dependencies = [
113-
"winapi",
114-
]
115-
116107
[[package]]
117108
name = "anstream"
118109
version = "0.6.15"
@@ -199,7 +190,7 @@ version = "0.4.2"
199190
source = "registry+https://github.com/rust-lang/crates.io-index"
200191
checksum = "01667f6f40216b9a0b2945e05fed5f1ad0ab6470e69cb9378001e37b1c0668e4"
201192
dependencies = [
202-
"object 0.36.3",
193+
"object 0.36.4",
203194
]
204195

205196
[[package]]
@@ -714,7 +705,7 @@ dependencies = [
714705
"miow",
715706
"miropt-test-tools",
716707
"regex",
717-
"rustfix 0.8.1",
708+
"rustfix",
718709
"serde",
719710
"serde_json",
720711
"tracing",
@@ -2186,9 +2177,9 @@ dependencies = [
21862177

21872178
[[package]]
21882179
name = "memchr"
2189-
version = "2.5.0"
2180+
version = "2.7.4"
21902181
source = "registry+https://github.com/rust-lang/crates.io-index"
2191-
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
2182+
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
21922183

21932184
[[package]]
21942185
name = "memmap2"
@@ -2278,7 +2269,7 @@ dependencies = [
22782269
"rustc_version",
22792270
"smallvec",
22802271
"tempfile",
2281-
"ui_test 0.21.2",
2272+
"ui_test 0.26.5",
22822273
"windows-sys 0.52.0",
22832274
]
22842275

@@ -2453,9 +2444,9 @@ dependencies = [
24532444

24542445
[[package]]
24552446
name = "object"
2456-
version = "0.36.3"
2447+
version = "0.36.4"
24572448
source = "registry+https://github.com/rust-lang/crates.io-index"
2458-
checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
2449+
checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
24592450
dependencies = [
24602451
"crc32fast",
24612452
"flate2",
@@ -2807,16 +2798,6 @@ version = "0.1.1"
28072798
source = "registry+https://github.com/rust-lang/crates.io-index"
28082799
checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
28092800

2810-
[[package]]
2811-
name = "prettydiff"
2812-
version = "0.6.4"
2813-
source = "registry+https://github.com/rust-lang/crates.io-index"
2814-
checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11"
2815-
dependencies = [
2816-
"ansi_term",
2817-
"pad",
2818-
]
2819-
28202801
[[package]]
28212802
name = "prettydiff"
28222803
version = "0.7.0"
@@ -3129,7 +3110,7 @@ dependencies = [
31293110
"build_helper",
31303111
"gimli 0.31.0",
31313112
"libc",
3132-
"object 0.36.3",
3113+
"object 0.36.4",
31333114
"regex",
31343115
"serde_json",
31353116
"similar",
@@ -3408,7 +3389,7 @@ dependencies = [
34083389
"itertools",
34093390
"libc",
34103391
"measureme",
3411-
"object 0.36.3",
3392+
"object 0.36.4",
34123393
"rustc-demangle",
34133394
"rustc_ast",
34143395
"rustc_attr",
@@ -3447,7 +3428,7 @@ dependencies = [
34473428
"itertools",
34483429
"jobserver",
34493430
"libc",
3450-
"object 0.36.3",
3431+
"object 0.36.4",
34513432
"pathdiff",
34523433
"regex",
34533434
"rustc_arena",
@@ -3569,6 +3550,7 @@ dependencies = [
35693550
"rustc_hir_pretty",
35703551
"rustc_hir_typeck",
35713552
"rustc_incremental",
3553+
"rustc_index",
35723554
"rustc_infer",
35733555
"rustc_interface",
35743556
"rustc_lint",
@@ -4166,6 +4148,7 @@ dependencies = [
41664148
"rustc_errors",
41674149
"rustc_feature",
41684150
"rustc_fluent_macro",
4151+
"rustc_index",
41694152
"rustc_lexer",
41704153
"rustc_macros",
41714154
"rustc_session",
@@ -4431,7 +4414,7 @@ name = "rustc_target"
44314414
version = "0.0.0"
44324415
dependencies = [
44334416
"bitflags 2.6.0",
4434-
"object 0.36.3",
4417+
"object 0.36.4",
44354418
"rustc_abi",
44364419
"rustc_data_structures",
44374420
"rustc_feature",
@@ -4623,18 +4606,6 @@ dependencies = [
46234606
"rustdoc",
46244607
]
46254608

4626-
[[package]]
4627-
name = "rustfix"
4628-
version = "0.6.1"
4629-
source = "registry+https://github.com/rust-lang/crates.io-index"
4630-
checksum = "ecd2853d9e26988467753bd9912c3a126f642d05d229a4b53f5752ee36c56481"
4631-
dependencies = [
4632-
"anyhow",
4633-
"log",
4634-
"serde",
4635-
"serde_json",
4636-
]
4637-
46384609
[[package]]
46394610
name = "rustfix"
46404611
version = "0.8.1"
@@ -4659,7 +4630,7 @@ dependencies = [
46594630

46604631
[[package]]
46614632
name = "rustfmt-nightly"
4662-
version = "1.7.1"
4633+
version = "1.8.0"
46634634
dependencies = [
46644635
"annotate-snippets 0.9.2",
46654636
"anyhow",
@@ -4978,15 +4949,15 @@ dependencies = [
49784949

49794950
[[package]]
49804951
name = "stacker"
4981-
version = "0.1.15"
4952+
version = "0.1.17"
49824953
source = "registry+https://github.com/rust-lang/crates.io-index"
4983-
checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
4954+
checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
49844955
dependencies = [
49854956
"cc",
49864957
"cfg-if",
49874958
"libc",
49884959
"psm",
4989-
"winapi",
4960+
"windows-sys 0.59.0",
49904961
]
49914962

49924963
[[package]]
@@ -5516,36 +5487,36 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
55165487

55175488
[[package]]
55185489
name = "ui_test"
5519-
version = "0.21.2"
5490+
version = "0.25.0"
55205491
source = "registry+https://github.com/rust-lang/crates.io-index"
5521-
checksum = "aaf4bf7c184b8dfc7a4d3b90df789b1eb992ee42811cd115f32a7a1eb781058d"
5492+
checksum = "f7e4f339f62edc873975c47115f9e71c5454ddaa37c1142b42fc0b2672c8dacb"
55225493
dependencies = [
5523-
"annotate-snippets 0.9.2",
5494+
"annotate-snippets 0.11.4",
55245495
"anyhow",
55255496
"bstr",
55265497
"cargo-platform",
5527-
"cargo_metadata 0.15.4",
5498+
"cargo_metadata 0.18.1",
55285499
"color-eyre",
55295500
"colored",
55305501
"comma",
55315502
"crossbeam-channel",
55325503
"indicatif",
55335504
"lazy_static",
55345505
"levenshtein",
5535-
"prettydiff 0.6.4",
5506+
"prettydiff",
55365507
"regex",
55375508
"rustc_version",
5538-
"rustfix 0.6.1",
5509+
"rustfix",
55395510
"serde",
55405511
"serde_json",
5541-
"tempfile",
5512+
"spanned",
55425513
]
55435514

55445515
[[package]]
55455516
name = "ui_test"
5546-
version = "0.25.0"
5517+
version = "0.26.5"
55475518
source = "registry+https://github.com/rust-lang/crates.io-index"
5548-
checksum = "f7e4f339f62edc873975c47115f9e71c5454ddaa37c1142b42fc0b2672c8dacb"
5519+
checksum = "32ee4c40e5a5f9fa6864ff976473e5d6a6e9884b6ce68b40690d9f87e1994c83"
55495520
dependencies = [
55505521
"annotate-snippets 0.11.4",
55515522
"anyhow",
@@ -5557,12 +5528,11 @@ dependencies = [
55575528
"comma",
55585529
"crossbeam-channel",
55595530
"indicatif",
5560-
"lazy_static",
55615531
"levenshtein",
5562-
"prettydiff 0.7.0",
5532+
"prettydiff",
55635533
"regex",
55645534
"rustc_version",
5565-
"rustfix 0.8.1",
5535+
"rustfix",
55665536
"serde",
55675537
"serde_json",
55685538
"spanned",
@@ -5779,9 +5749,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
57795749

57805750
[[package]]
57815751
name = "wasi-preview1-component-adapter-provider"
5782-
version = "23.0.2"
5752+
version = "24.0.0"
57835753
source = "registry+https://github.com/rust-lang/crates.io-index"
5784-
checksum = "f91d3d13afef569b9fc80cfbb807c87c16ef49bd3ac1a93285ea6a264b600d2d"
5754+
checksum = "36e6cadfa74538edd5409b6f8c79628436529138e9618b7373bec7aae7805835"
57855755

57865756
[[package]]
57875757
name = "wasm-bindgen"
@@ -5840,9 +5810,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
58405810

58415811
[[package]]
58425812
name = "wasm-component-ld"
5843-
version = "0.5.6"
5813+
version = "0.5.7"
58445814
source = "registry+https://github.com/rust-lang/crates.io-index"
5845-
checksum = "51449c63d1ce69f92b8465a084ed5b91f1a7eb583fa95796650a6bfcffc4f9cb"
5815+
checksum = "13261270d3ac58ffae0219ae34f297a7e24f9ee3b13b29be579132c588a83519"
58465816
dependencies = [
58475817
"anyhow",
58485818
"clap",
@@ -5864,19 +5834,19 @@ dependencies = [
58645834

58655835
[[package]]
58665836
name = "wasm-encoder"
5867-
version = "0.215.0"
5837+
version = "0.216.0"
58685838
source = "registry+https://github.com/rust-lang/crates.io-index"
5869-
checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847"
5839+
checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88"
58705840
dependencies = [
58715841
"leb128",
58725842
"wasmparser",
58735843
]
58745844

58755845
[[package]]
58765846
name = "wasm-metadata"
5877-
version = "0.215.0"
5847+
version = "0.216.0"
58785848
source = "registry+https://github.com/rust-lang/crates.io-index"
5879-
checksum = "0c6bb07c5576b608f7a2a9baa2294c1a3584a249965d695a9814a496cb6d232f"
5849+
checksum = "47c8154d703a6b0e45acf6bd172fa002fc3c7058a9f7615e517220aeca27c638"
58805850
dependencies = [
58815851
"anyhow",
58825852
"indexmap",
@@ -5890,9 +5860,9 @@ dependencies = [
58905860

58915861
[[package]]
58925862
name = "wasmparser"
5893-
version = "0.215.0"
5863+
version = "0.216.0"
58945864
source = "registry+https://github.com/rust-lang/crates.io-index"
5895-
checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e"
5865+
checksum = "bcdee6bea3619d311fb4b299721e89a986c3470f804b6d534340e412589028e3"
58965866
dependencies = [
58975867
"ahash",
58985868
"bitflags 2.6.0",
@@ -5904,9 +5874,9 @@ dependencies = [
59045874

59055875
[[package]]
59065876
name = "wast"
5907-
version = "215.0.0"
5877+
version = "216.0.0"
59085878
source = "registry+https://github.com/rust-lang/crates.io-index"
5909-
checksum = "1ff1d00d893593249e60720be04a7c1f42f1c4dc3806a2869f4e66ab61eb54cb"
5879+
checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08"
59105880
dependencies = [
59115881
"bumpalo",
59125882
"leb128",
@@ -5917,9 +5887,9 @@ dependencies = [
59175887

59185888
[[package]]
59195889
name = "wat"
5920-
version = "1.215.0"
5890+
version = "1.216.0"
59215891
source = "registry+https://github.com/rust-lang/crates.io-index"
5922-
checksum = "670bf4d9c8cf76ae242d70ded47c546525b6dafaa6871f9bcb065344bf2b4e3d"
5892+
checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a"
59235893
dependencies = [
59245894
"wast",
59255895
]
@@ -6206,9 +6176,9 @@ dependencies = [
62066176

62076177
[[package]]
62086178
name = "wit-component"
6209-
version = "0.215.0"
6179+
version = "0.216.0"
62106180
source = "registry+https://github.com/rust-lang/crates.io-index"
6211-
checksum = "f725e3885fc5890648be5c5cbc1353b755dc932aa5f1aa7de968b912a3280743"
6181+
checksum = "7e2ca3ece38ea2447a9069b43074ba73d96dde1944cba276c54e41371745f9dc"
62126182
dependencies = [
62136183
"anyhow",
62146184
"bitflags 2.6.0",
@@ -6225,9 +6195,9 @@ dependencies = [
62256195

62266196
[[package]]
62276197
name = "wit-parser"
6228-
version = "0.215.0"
6198+
version = "0.216.0"
62296199
source = "registry+https://github.com/rust-lang/crates.io-index"
6230-
checksum = "935a97eaffd57c3b413aa510f8f0b550a4a9fe7d59e79cd8b89a83dcb860321f"
6200+
checksum = "a4d108165c1167a4ccc8a803dcf5c28e0a51d6739fd228cc7adce768632c764c"
62316201
dependencies = [
62326202
"anyhow",
62336203
"id-arena",

0 commit comments

Comments
 (0)