Skip to content

Commit 0edf572

Browse files
committed
Merge from rust-lang/rust
2 parents 3b5b350 + ad3b725 commit 0edf572

File tree

1,805 files changed

+755181
-14013
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,805 files changed

+755181
-14013
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ name: CI
1111
on:
1212
push:
1313
branches:
14-
# CI on master only serves for caching citool builds for the `calculate_matrix` job.
15-
# In order to use GHA cache on PR CI (and auto/try) jobs, we need to write to it
16-
# from the default branch.
17-
- master
1814
- auto
1915
- try
2016
- try-perf
@@ -57,13 +53,6 @@ jobs:
5753
steps:
5854
- name: Checkout the source code
5955
uses: actions/checkout@v4
60-
# Cache citool to make its build faster, as it's in the critical path.
61-
# The rust-cache doesn't bleed into the main `job`, so it should not affect any other
62-
# Rust compilation.
63-
- name: Cache citool
64-
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
65-
with:
66-
workspaces: src/ci/citool
6756
- name: Test citool
6857
# Only test citool on the auto branch, to reduce latency of the calculate matrix job
6958
# on PR/try builds.

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
path = src/doc/rust-by-example
1919
url = https://github.com/rust-lang/rust-by-example.git
2020
shallow = true
21-
[submodule "library/stdarch"]
22-
path = library/stdarch
23-
url = https://github.com/rust-lang/stdarch.git
24-
shallow = true
2521
[submodule "src/doc/edition-guide"]
2622
path = src/doc/edition-guide
2723
url = https://github.com/rust-lang/edition-guide.git

.mailmap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,10 @@ David Carlier <devnexen@gmail.com>
162162
David Klein <david.klein@baesystemsdetica.com>
163163
David Manescu <david.manescu@gmail.com> <dman2626@uni.sydney.edu.au>
164164
David Ross <daboross@daboross.net>
165-
David Wood <david@davidtw.co> <david.wood@huawei.com>
165+
David Wood <david@davidtw.co> <Q0KPU0H1YOEPHRY1R2SN5B5RL@david.davidtw.co>
166+
David Wood <david@davidtw.co> <agile.lion3441@fuligin.ink>
166167
David Wood <david@davidtw.co> <david.wood2@arm.com>
168+
David Wood <david@davidtw.co> <david.wood@huawei.com>
167169
Deadbeef <ent3rm4n@gmail.com>
168170
Deadbeef <ent3rm4n@gmail.com> <fee1-dead-beef@protonmail.com>
169171
dependabot[bot] <dependabot[bot]@users.noreply.github.com> <27856297+dependabot-preview[bot]@users.noreply.github.com>

0 commit comments

Comments
 (0)