Skip to content

Commit 0c056d1

Browse files
authored
Merge branch 'master' into split-x86_64-msvc
2 parents 70ab84d + c074d8e commit 0c056d1

File tree

5,932 files changed

+519671
-76811
lines changed

Some content is hidden

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

5,932 files changed

+519671
-76811
lines changed

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ tracking issue or there are none, feel free to ignore this.
77
This PR will get automatically assigned to a reviewer. In case you would like
88
a specific user to review your work, you can assign it to them by using
99
10-
r\? <reviewer name> (with the `\` removed)
10+
r? <reviewer name>
1111
-->
1212
<!-- homu-ignore:end -->

.github/renovate.json5

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
// Let Renovatebot keep an opened issue that tracks our dependencies
4+
"dependencyDashboard": true,
5+
// Disable "normal" package updates
6+
"enabledManagers": [],
7+
// Update lockfiles once per week
8+
"lockFileMaintenance": {
9+
"enabled": true,
10+
"schedule": [
11+
"before 5am on Tuesday"
12+
]
13+
}
14+
}

.github/workflows/ci.yml

+10-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# and also on pushes to special branches (auto, try).
33
#
44
# The actual definition of the executed jobs is calculated by a Python
5-
# script located at src/ci/github-actions/calculate-job-matrix.py, which
5+
# script located at src/ci/github-actions/ci.py, which
66
# uses job definition data from src/ci/github-actions/jobs.yml.
77
# You should primarily modify the `jobs.yml` file if you want to modify
88
# what jobs are executed in CI.
@@ -46,7 +46,7 @@ jobs:
4646
# If you want to modify CI jobs, take a look at src/ci/github-actions/jobs.yml.
4747
calculate_matrix:
4848
name: Calculate job matrix
49-
runs-on: ubuntu-latest
49+
runs-on: ubuntu-24.04
5050
outputs:
5151
jobs: ${{ steps.jobs.outputs.jobs }}
5252
run_type: ${{ steps.jobs.outputs.run_type }}
@@ -56,18 +56,18 @@ jobs:
5656
- name: Calculate the CI job matrix
5757
env:
5858
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
59-
run: python3 src/ci/github-actions/calculate-job-matrix.py >> $GITHUB_OUTPUT
59+
run: python3 src/ci/github-actions/ci.py calculate-job-matrix >> $GITHUB_OUTPUT
6060
id: jobs
6161
job:
62-
name: ${{ matrix.name }}
62+
name: ${{ matrix.full_name }}
6363
needs: [ calculate_matrix ]
6464
runs-on: "${{ matrix.os }}"
6565
defaults:
6666
run:
6767
shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
6868
timeout-minutes: 360
6969
env:
70-
CI_JOB_NAME: ${{ matrix.image }}
70+
CI_JOB_NAME: ${{ matrix.name }}
7171
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
7272
# commit of PR sha or commit sha. `GITHUB_SHA` is not accurate for PRs.
7373
HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
@@ -233,16 +233,17 @@ jobs:
233233
env:
234234
DATADOG_SITE: datadoghq.com
235235
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
236-
DD_GITHUB_JOB_NAME: ${{ matrix.name }}
236+
DD_GITHUB_JOB_NAME: ${{ matrix.full_name }}
237237
run: |
238-
npm install -g @datadog/datadog-ci@^2.x.x
239-
python3 src/ci/scripts/upload-build-metrics.py build/cpu-usage.csv
238+
cd src/ci
239+
npm ci
240+
python3 scripts/upload-build-metrics.py ../../build/cpu-usage.csv
240241
241242
# This job isused to tell bors the final status of the build, as there is no practical way to detect
242243
# when a workflow is successful listening to webhooks only in our current bors implementation (homu).
243244
outcome:
244245
name: bors build finished
245-
runs-on: ubuntu-latest
246+
runs-on: ubuntu-24.04
246247
needs: [ calculate_matrix, job ]
247248
# !cancelled() executes the job regardless of whether the previous jobs passed or failed
248249
if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}

.github/workflows/dependencies.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
not-waiting-on-bors:
2828
if: github.repository_owner == 'rust-lang'
2929
name: skip if S-waiting-on-bors
30-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-24.04
3131
steps:
3232
- env:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -47,7 +47,7 @@ jobs:
4747
if: github.repository_owner == 'rust-lang'
4848
name: update dependencies
4949
needs: not-waiting-on-bors
50-
runs-on: ubuntu-latest
50+
runs-on: ubuntu-24.04
5151
steps:
5252
- name: checkout the source code
5353
uses: actions/checkout@v4
@@ -94,7 +94,7 @@ jobs:
9494
if: github.repository_owner == 'rust-lang'
9595
name: amend PR
9696
needs: update
97-
runs-on: ubuntu-latest
97+
runs-on: ubuntu-24.04
9898
permissions:
9999
contents: write
100100
pull-requests: write

.gitignore

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ package.json
8888
tests/rustdoc-gui/src/**.lock
8989

9090
## direnv
91-
.envrc
92-
.direnv/
91+
/.envrc
92+
/.direnv/
9393

9494
## nix
95-
flake.nix
95+
/flake.nix
9696
flake.lock
97-
default.nix
97+
/default.nix
9898

9999
# Before adding new lines, see the comment at the top.

.gitmodules

+1-5
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,14 @@
2222
path = library/stdarch
2323
url = https://github.com/rust-lang/stdarch.git
2424
shallow = true
25-
[submodule "src/doc/rustc-dev-guide"]
26-
path = src/doc/rustc-dev-guide
27-
url = https://github.com/rust-lang/rustc-dev-guide.git
28-
shallow = true
2925
[submodule "src/doc/edition-guide"]
3026
path = src/doc/edition-guide
3127
url = https://github.com/rust-lang/edition-guide.git
3228
shallow = true
3329
[submodule "src/llvm-project"]
3430
path = src/llvm-project
3531
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/19.1-2024-09-17
32+
branch = rustc/19.1-2024-12-03
3733
shallow = true
3834
[submodule "src/doc/embedded-book"]
3935
path = src/doc/embedded-book

.mailmap

+55-2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ Andrew Poelstra <[email protected]> <[email protected]>
4848
Anhad Singh <[email protected]>
4949
Antoine Plaskowski <[email protected]>
5050
51+
5152
Araam Borhanian <[email protected]>
5253
5354
Areski Belaid <[email protected]> areski <[email protected]>
@@ -62,7 +63,10 @@ Austin Seipp <[email protected]> <[email protected]>
6263
Ayaz Hafiz <[email protected]>
6364
Aydin Kim <[email protected]> aydin.kim <[email protected]>
6465
Ayush Mishra <[email protected]>
66+
6567
68+
69+
6670
BaoshanPang <[email protected]>
6771
Barosl Lee <[email protected]> Barosl LEE <[email protected]>
6872
Bastian Kersting <[email protected]>
@@ -84,7 +88,8 @@ boolean_coercion <[email protected]>
8488
8589
bors <[email protected]> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
8690
bors <[email protected]> bors[bot] <bors[bot]@users.noreply.github.com>
87-
91+
92+
8893
Braden Nelson <[email protected]>
8994
Brandon Sanderson <[email protected]> Brandon Sanderson <[email protected]>
9095
Brett Cannon <[email protected]> Brett Cannon <[email protected]>
@@ -98,6 +103,8 @@ Caleb Cartwright <[email protected]>
98103
Caleb Jones <[email protected]>
99104
100105
106+
Catherine <[email protected]>
107+
101108
cameron1024 <[email protected]>
102109
Camille Gillot <[email protected]>
103110
Carl-Anton Ingmarsson <[email protected]> <[email protected]>
@@ -133,11 +140,13 @@ Clement Miao <[email protected]>
133140
Clément Renault <[email protected]>
134141
Cliff Dyer <[email protected]>
135142
Clinton Ryan <[email protected]>
143+
136144
137145
Crazycolorz5 <[email protected]>
138146
139147
Cyryl Płotnicki <[email protected]>
140148
Damien Schoof <[email protected]>
149+
141150
Dan Robertson <[email protected]>
142151
Daniel Campoverde <[email protected]>
143152
Daniel J Rollins <[email protected]>
@@ -179,10 +188,17 @@ Eduardo Bautista <[email protected]> <=>
179188
180189
Eduardo Broto <[email protected]>
181190
191+
Jacob Finkelman <[email protected]>
192+
193+
194+
195+
182196
183197
Elly Fong-Jones <[email protected]>
184198
185199
200+
201+
186202
Eric Holmes <[email protected]>
187203
188204
@@ -206,6 +222,7 @@ Felix S. Klock II <[email protected]> <[email protected]>
206222
Félix Saparelli <[email protected]>
207223
Flaper Fesp <[email protected]>
208224
Florian Berger <[email protected]>
225+
209226
Florian Wilkens <[email protected]> Florian Wilkens <[email protected]>
210227
François Mockers <[email protected]>
211228
@@ -240,6 +257,8 @@ Herman J. Radtke III <[email protected]> Herman J. Radtke III <hermanradtk
240257
Hirochika Matsumoto <[email protected]> <[email protected]>
241258
Hrvoje Nikšić <[email protected]>
242259
Hsiang-Cheng Yang <[email protected]>
260+
Huon Wilson <[email protected]>
261+
243262
244263
245264
@@ -252,8 +271,13 @@ ivan tkachenko <[email protected]>
252271
J. J. Weber <[email protected]>
253272
254273
274+
Jacob Hoffman-Andrews <[email protected]> <[email protected]>
255275
Jacob Greenfield <[email protected]>
256276
277+
278+
Jake Goulding <[email protected]>
279+
280+
257281
Jake Vossen <[email protected]>
258282
259283
Jakob Lautrup Nysom <[email protected]>
@@ -286,6 +310,7 @@ Jerry Hardee <[email protected]>
286310
Jesús Rubio <[email protected]>
287311
Jethro Beekman <[email protected]>
288312
Jian Zeng <[email protected]>
313+
Jieyou Xu <[email protected]>
289314
290315
291316
@@ -321,9 +346,12 @@ Josh Holmer <[email protected]>
321346
322347
323348
349+
350+
Jubilee Young <[email protected]>
324351
Julian Knodt <[email protected]>
325352
326353
Junyoung Cho <[email protected]>
354+
327355
328356
329357
@@ -384,12 +412,14 @@ Marcell Pardavi <[email protected]>
384412
Marcus Klaas de Vries <[email protected]>
385413
Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
386414
Mark Mansi <[email protected]>
415+
387416
Mark Rousskov <[email protected]>
388417
Mark Sinclair <[email protected]>
389418
Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
390419
Markus Legner <[email protected]>
391420
Markus Westerlind <[email protected]> Markus <[email protected]>
392421
Martin Carton <[email protected]>
422+
393423
Martin Habovštiak <[email protected]>
394424
Martin Hafskjold Thoresen <[email protected]>
395425
@@ -414,6 +444,7 @@ Melody Horn <[email protected]> <[email protected]>
414444
415445
416446
447+
417448
Michael Williams <[email protected]>
418449
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
419450
Michael Woerister <michaelwoerister@posteo> <[email protected]>
@@ -430,6 +461,7 @@ Ms2ger <[email protected]> <[email protected]>
430461
msizanoen1 <[email protected]>
431462
Mukilan Thiagarajan <[email protected]>
432463
Nadrieril Feneanar <[email protected]>
464+
Nadrieril Feneanar <[email protected]> <[email protected]>
433465
Nadrieril Feneanar <[email protected]> <[email protected]>
434466
435467
@@ -446,15 +478,23 @@ Nicholas Bishop <[email protected]> <[email protected]>
446478
447479
Nicholas Nethercote <[email protected]> <[email protected]>
448480
Nicholas Nethercote <[email protected]> <[email protected]>
481+
482+
449483
Nick Platt <[email protected]>
450484
Niclas Schwarzlose <[email protected]>
451485
Nicolas Abram <[email protected]>
452486
Nicole Mazzuca <[email protected]>
487+
Niko Matsakis <[email protected]>
488+
489+
Noratrieb <[email protected]>
453490
454491
492+
455493
456494
457495
496+
Nikita Popov <[email protected]>
497+
458498
459499
460500
@@ -515,6 +555,7 @@ Ricky Hosfelt <[email protected]>
515555
Ritiek Malhotra <[email protected]>
516556
Rob Arnold <[email protected]>
517557
Rob Arnold <[email protected]> Rob Arnold <[email protected]>
558+
518559
Robert Foss <[email protected]> robertfoss <[email protected]>
519560
Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
520561
Robert Habermeier <[email protected]>
@@ -552,7 +593,15 @@ Simon Sapin <[email protected]> <[email protected]>
552593
Simonas Kazlauskas <[email protected]> Simonas Kazlauskas <[email protected]>
553594
Simonas Kazlauskas <[email protected]> <[email protected]>
554595
Siva Prasad <[email protected]>
596+
597+
598+
555599
600+
Sophia June Turner <[email protected]>
601+
Sophia June Turner <[email protected]> <[email protected]>
602+
Sophia June Turner <[email protected]> <[email protected]>
603+
Sophia June Turner <[email protected]> <[email protected]>
604+
Sophia June Turner <[email protected]> <[email protected]>
556605
Srinivas Reddy Thatiparthy <[email protected]>
557606
Stanislav Tkach <[email protected]>
558607
startling <[email protected]>
@@ -585,8 +634,10 @@ Tim Diekmann <[email protected]>
585634
586635
Tim JIANG <[email protected]>
587636
Tim Joseph Dumol <[email protected]>
637+
588638
Timothy Maloney <[email protected]>
589639
Tomas Koutsky <[email protected]>
640+
Tomasz Miąsko <[email protected]>
590641
Torsten Weber <[email protected]>
591642
592643
@@ -606,7 +657,9 @@ Valerii Lashmanov <[email protected]>
606657
Vitali Haravy <[email protected]> Vitali Haravy <[email protected]>
607658
Vitaly Shukela <[email protected]>
608659
Waffle Lapkin <[email protected]>
609-
Waffle Lapkin <[email protected]>
660+
661+
Weihang Lo <[email protected]>
662+
610663
611664
whitequark <[email protected]>
612665

0 commit comments

Comments
 (0)