Skip to content

Commit 352f5ab

Browse files
marcoienimarcoieni
committed
Merge remote-tracking branch 'origin' into x86_64-msvc-ext-windows-25
2 parents e9925ae + 672e3aa commit 352f5ab

File tree

3,124 files changed

+48031
-28900
lines changed

Some content is hidden

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

3,124 files changed

+48031
-28900
lines changed

‎.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ end_of_line = lf
99
charset = utf-8
1010
trim_trailing_whitespace = true
1111
insert_final_newline = true
12+
13+
[!src/llvm-project]
1214
indent_style = space
1315
indent_size = 4
1416

‎.git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ ec2cc761bc7067712ecc7734502f703fe3b024c8
2929
99cb0c6bc399fb94a0ddde7e9b38e9c00d523bad
3030
# reformat with rustfmt edition 2024
3131
c682aa162b0d41e21cc6748f4fecfe01efb69d1f
32+
# reformat with updated edition 2024
33+
1fcae03369abb4c2cc180cd5a49e1f4440a81300

‎.github/workflows/ci.yml

-19
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ jobs:
6262
name: ${{ matrix.full_name }}
6363
needs: [ calculate_matrix ]
6464
runs-on: "${{ matrix.os }}"
65-
defaults:
66-
run:
67-
shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
6865
timeout-minutes: 360
6966
env:
7067
CI_JOB_NAME: ${{ matrix.name }}
@@ -80,22 +77,6 @@ jobs:
8077
# Check the `calculate_matrix` job to see how is the matrix defined.
8178
include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}
8279
steps:
83-
- if: contains(matrix.os, 'windows')
84-
uses: msys2/[email protected]
85-
with:
86-
# i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64.
87-
msystem: ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}
88-
# don't try to download updates for already installed packages
89-
update: false
90-
# don't try to use the msys that comes built-in to the github runner,
91-
# so we can control what is installed (i.e. not python)
92-
release: true
93-
# Inherit the full path from the Windows environment, with MSYS2's */bin/
94-
# dirs placed in front. This lets us run Windows-native Python etc.
95-
path-type: inherit
96-
install: >
97-
make
98-
9980
- name: disable git crlf conversion
10081
run: git config --global core.autocrlf false
10182

‎Cargo.lock

+32-39
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ name = "anyhow"
186186
version = "1.0.95"
187187
source = "registry+https://github.com/rust-lang/crates.io-index"
188188
checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
189+
dependencies = [
190+
"backtrace",
191+
]
189192

190193
[[package]]
191194
name = "ar_archive_writer"
@@ -417,9 +420,9 @@ version = "0.1.0"
417420

418421
[[package]]
419422
name = "cc"
420-
version = "1.2.7"
423+
version = "1.2.13"
421424
source = "registry+https://github.com/rust-lang/crates.io-index"
422-
checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
425+
checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
423426
dependencies = [
424427
"shlex",
425428
]
@@ -1095,9 +1098,9 @@ dependencies = [
10951098

10961099
[[package]]
10971100
name = "elsa"
1098-
version = "1.7.1"
1101+
version = "1.11.0"
10991102
source = "registry+https://github.com/rust-lang/crates.io-index"
1100-
checksum = "848fe615fbb0a74d9ae68dcaa510106d32e37d9416207bbea4bd008bd89c47ed"
1103+
checksum = "2343daaeabe09879d4ea058bb4f1e63da3fc07dadc6634e01bda1b3d6a9d9d2b"
11011104
dependencies = [
11021105
"stable_deref_trait",
11031106
]
@@ -1196,13 +1199,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
11961199
checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
11971200

11981201
[[package]]
1199-
name = "field-offset"
1200-
version = "0.3.6"
1201-
source = "registry+https://github.com/rust-lang/crates.io-index"
1202-
checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
1202+
name = "features-status-dump"
1203+
version = "0.1.0"
12031204
dependencies = [
1204-
"memoffset",
1205-
"rustc_version",
1205+
"anyhow",
1206+
"clap",
1207+
"serde",
1208+
"serde_json",
1209+
"tidy",
12061210
]
12071211

12081212
[[package]]
@@ -1993,7 +1997,7 @@ dependencies = [
19931997
"anyhow",
19941998
"clap",
19951999
"fs-err",
1996-
"rustc-hash 2.1.0",
2000+
"rustc-hash 2.1.1",
19972001
"rustdoc-json-types",
19982002
"serde",
19992003
"serde_json",
@@ -2281,15 +2285,6 @@ dependencies = [
22812285
"libc",
22822286
]
22832287

2284-
[[package]]
2285-
name = "memoffset"
2286-
version = "0.9.1"
2287-
source = "registry+https://github.com/rust-lang/crates.io-index"
2288-
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
2289-
dependencies = [
2290-
"autocfg",
2291-
]
2292-
22932288
[[package]]
22942289
name = "mime"
22952290
version = "0.3.17"
@@ -2308,9 +2303,9 @@ dependencies = [
23082303

23092304
[[package]]
23102305
name = "minifier"
2311-
version = "0.3.2"
2306+
version = "0.3.4"
23122307
source = "registry+https://github.com/rust-lang/crates.io-index"
2313-
checksum = "bd559bbf5d350ac7f2c1cf92ed71a869b847a92bce0c1318b47932a5b5f65cdd"
2308+
checksum = "1cf47565b1430f5fe6c81d3afcb4b835271348d7eb35294a4d592e38dd09ea22"
23142309

23152310
[[package]]
23162311
name = "minimal-lexical"
@@ -3193,7 +3188,7 @@ dependencies = [
31933188
"proc-macro2",
31943189
"quote",
31953190
"rinja_parser",
3196-
"rustc-hash 2.1.0",
3191+
"rustc-hash 2.1.1",
31973192
"serde",
31983193
"syn 2.0.96",
31993194
]
@@ -3257,9 +3252,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
32573252

32583253
[[package]]
32593254
name = "rustc-hash"
3260-
version = "2.1.0"
3255+
version = "2.1.1"
32613256
source = "registry+https://github.com/rust-lang/crates.io-index"
3262-
checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
3257+
checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
32633258

32643259
[[package]]
32653260
name = "rustc-main"
@@ -3273,13 +3268,6 @@ dependencies = [
32733268
"tikv-jemalloc-sys",
32743269
]
32753270

3276-
[[package]]
3277-
name = "rustc-perf-wrapper"
3278-
version = "0.1.0"
3279-
dependencies = [
3280-
"clap",
3281-
]
3282-
32833271
[[package]]
32843272
name = "rustc-rayon"
32853273
version = "0.5.1"
@@ -3329,7 +3317,6 @@ dependencies = [
33293317
"rand 0.8.5",
33303318
"rand_xoshiro",
33313319
"rustc_data_structures",
3332-
"rustc_feature",
33333320
"rustc_index",
33343321
"rustc_macros",
33353322
"rustc_serialize",
@@ -3386,10 +3373,12 @@ dependencies = [
33863373
name = "rustc_ast_lowering"
33873374
version = "0.0.0"
33883375
dependencies = [
3376+
"rustc_abi",
33893377
"rustc_ast",
33903378
"rustc_ast_pretty",
33913379
"rustc_data_structures",
33923380
"rustc_errors",
3381+
"rustc_feature",
33933382
"rustc_fluent_macro",
33943383
"rustc_hir",
33953384
"rustc_index",
@@ -3408,6 +3397,7 @@ name = "rustc_ast_passes"
34083397
version = "0.0.0"
34093398
dependencies = [
34103399
"itertools",
3400+
"rustc_abi",
34113401
"rustc_ast",
34123402
"rustc_ast_pretty",
34133403
"rustc_attr_parsing",
@@ -3664,7 +3654,7 @@ dependencies = [
36643654
"memmap2",
36653655
"parking_lot",
36663656
"portable-atomic",
3667-
"rustc-hash 2.1.0",
3657+
"rustc-hash 2.1.1",
36683658
"rustc-rayon",
36693659
"rustc-stable-hash",
36703660
"rustc_arena",
@@ -3693,6 +3683,7 @@ version = "0.0.0"
36933683
dependencies = [
36943684
"ctrlc",
36953685
"libc",
3686+
"rustc_abi",
36963687
"rustc_ast",
36973688
"rustc_ast_lowering",
36983689
"rustc_ast_passes",
@@ -4001,6 +3992,7 @@ version = "0.0.0"
40013992
dependencies = [
40023993
"rustc-rayon",
40033994
"rustc-rayon-core",
3995+
"rustc_abi",
40043996
"rustc_ast",
40053997
"rustc_ast_lowering",
40063998
"rustc_ast_passes",
@@ -4050,6 +4042,7 @@ name = "rustc_lexer"
40504042
version = "0.0.0"
40514043
dependencies = [
40524044
"expect-test",
4045+
"memchr",
40534046
"unicode-properties",
40544047
"unicode-xid",
40554048
]
@@ -4162,7 +4155,6 @@ version = "0.0.0"
41624155
dependencies = [
41634156
"bitflags",
41644157
"either",
4165-
"field-offset",
41664158
"gsgdt",
41674159
"polonius-engine",
41684160
"rustc-rayon-core",
@@ -4346,6 +4338,7 @@ version = "0.0.0"
43464338
dependencies = [
43474339
"rustc_abi",
43484340
"rustc_ast",
4341+
"rustc_ast_lowering",
43494342
"rustc_ast_pretty",
43504343
"rustc_attr_parsing",
43514344
"rustc_data_structures",
@@ -4369,7 +4362,7 @@ dependencies = [
43694362
name = "rustc_pattern_analysis"
43704363
version = "0.0.0"
43714364
dependencies = [
4372-
"rustc-hash 2.1.0",
4365+
"rustc-hash 2.1.1",
43734366
"rustc_abi",
43744367
"rustc_apfloat",
43754368
"rustc_arena",
@@ -4410,7 +4403,6 @@ dependencies = [
44104403
name = "rustc_query_impl"
44114404
version = "0.0.0"
44124405
dependencies = [
4413-
"field-offset",
44144406
"measureme",
44154407
"rustc_data_structures",
44164408
"rustc_errors",
@@ -4765,7 +4757,7 @@ name = "rustdoc-json-types"
47654757
version = "0.1.0"
47664758
dependencies = [
47674759
"bincode",
4768-
"rustc-hash 2.1.0",
4760+
"rustc-hash 2.1.1",
47694761
"serde",
47704762
"serde_json",
47714763
]
@@ -5416,8 +5408,9 @@ dependencies = [
54165408
"ignore",
54175409
"miropt-test-tools",
54185410
"regex",
5419-
"rustc-hash 2.1.0",
5411+
"rustc-hash 2.1.1",
54205412
"semver",
5413+
"serde",
54215414
"similar",
54225415
"termcolor",
54235416
"walkdir",

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ members = [
4545
"src/tools/rustdoc-gui-test",
4646
"src/tools/opt-dist",
4747
"src/tools/coverage-dump",
48-
"src/tools/rustc-perf-wrapper",
4948
"src/tools/wasm-component-ld",
49+
"src/tools/features-status-dump",
5050
]
5151

5252
exclude = [

‎compiler/rustc_abi/Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ bitflags = "2.4.1"
99
rand = { version = "0.8.4", default-features = false, optional = true }
1010
rand_xoshiro = { version = "0.6.0", optional = true }
1111
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
12-
rustc_feature = { path = "../rustc_feature", optional = true }
1312
rustc_index = { path = "../rustc_index", default-features = false }
1413
rustc_macros = { path = "../rustc_macros", optional = true }
1514
rustc_serialize = { path = "../rustc_serialize", optional = true }
@@ -24,7 +23,6 @@ default = ["nightly", "randomize"]
2423
# without depending on rustc_data_structures, rustc_macros and rustc_serialize
2524
nightly = [
2625
"dep:rustc_data_structures",
27-
"dep:rustc_feature",
2826
"dep:rustc_macros",
2927
"dep:rustc_serialize",
3028
"dep:rustc_span",

0 commit comments

Comments
 (0)