Skip to content

Commit 375d04e

Browse files
committed
Merge branch 'main' into kw/rv64im-unknown-elf
2 parents 1281f26 + 693f365 commit 375d04e

File tree

5,687 files changed

+148849
-89102
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,687 files changed

+148849
-89102
lines changed

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
custom: ["rust-lang.org/funding"]

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ jobs:
313313
needs: [ calculate_matrix, job ]
314314
# !cancelled() executes the job regardless of whether the previous jobs passed or failed
315315
if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}
316+
environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto')) && 'bors') || '' }}
316317
steps:
317318
- name: checkout the source code
318319
uses: actions/checkout@v5

.github/workflows/ghcr.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ jobs:
5555
images=(
5656
# Mirrored because used by the tidy job, which doesn't cache Docker images
5757
"ubuntu:22.04"
58+
# Mirrored because used by x86-64-gnu-miri
59+
"ubuntu:24.04"
5860
# Mirrored because used by all linux CI jobs, including tidy
5961
"moby/buildkit:buildx-stable-1"
6062
# Mirrored because used when CI is running inside a Docker container

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ no_llvm_build
4848
/llvm/
4949
/mingw-build/
5050
/build
51-
/build-rust-analyzer/
51+
/build-rust-analyzer
5252
/dist/
5353
/unicode-downloads
5454
/target

.mailmap

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Andre Bogus <[email protected]>
4343
4444
4545
Andrea Ciliberti <[email protected]>
46+
4647
4748
Andreas Jonson <[email protected]>
4849
Andrew Gauger <[email protected]>
@@ -82,12 +83,15 @@ Ben Sago <[email protected]> <[email protected]>
8283
Ben Striegel <[email protected]>
8384
Benjamin Jackman <[email protected]>
8485
Benoît Cortier <[email protected]>
86+
8587
Bheesham Persaud <[email protected]> Bheesham Persaud <[email protected]>
8688
8789
8890
8991
blake2-ppc <[email protected]> <blake2-ppc>
90-
blyxyas <[email protected]> Alejandra González <[email protected]>
92+
Alejandra González <[email protected]> blyxyas <[email protected]>
93+
Alejandra González <[email protected]> blyxyas <[email protected]>
94+
Alejandra González <[email protected]> Alejandra González <[email protected]>
9195
boolean_coercion <[email protected]>
9296
9397
bors <[email protected]> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
@@ -427,6 +431,7 @@ Lzu Tao <[email protected]>
427431
Maik Klein <[email protected]>
428432
429433
434+
430435
Malo Jaffré <[email protected]>
431436
Manish Goregaokar <[email protected]>
432437
@@ -448,9 +453,10 @@ Martin Habovštiak <[email protected]>
448453
Martin Hafskjold Thoresen <[email protected]>
449454
450455
Matej Lach <[email protected]> Matej Ľach <[email protected]>
451-
Mateusz Mikuła <[email protected]>
452-
453-
456+
Mateusz Mikuła <[email protected]>
457+
458+
459+
454460
455461
Matthew Auld <[email protected]>
456462
Matthew Jasper <[email protected]>
@@ -596,7 +602,7 @@ Rui <[email protected]>
596602
Russell Johnston <[email protected]>
597603
Rustin-Liu <[email protected]>
598604
Rusty Blitzerr <[email protected]>
599-
RustyYato <krishna.sd.2012@gmail.com>
605+
RustyYato <rustyyato@gmail.com>
600606
Ruud van Asseldonk <[email protected]> Ruud van Asseldonk <[email protected]>
601607
Ryan Leung <[email protected]>
602608

0 commit comments

Comments
 (0)