Skip to content

Commit b93d6ba

Browse files
authored
Merge pull request #3 from Infineon/feature/update-test-doc-to-master
Solve conflicts with upstream
2 parents 2d9f036 + e303685 commit b93d6ba

File tree

13,526 files changed

+352215
-203612
lines changed

Some content is hidden

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

13,526 files changed

+352215
-203612
lines changed

.clang-format

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BasedOnStyle: LLVM

.git-blame-ignore-revs

+4
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ b2d2184edea578109a48ec3d8decbee5948e8f35
2323
# test directives migration
2424
6e48b96692d63a79a14563f27fe5185f122434f8
2525
ec2cc761bc7067712ecc7734502f703fe3b024c8
26+
# format use declarations
27+
84ac80f1921afc243d71fd0caaa4f2838c294102
28+
# bless mir-opt tests to add `copy`
29+
99cb0c6bc399fb94a0ddde7e9b38e9c00d523bad

.github/pull_request_template.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- homu-ignore:start -->
12
<!--
23
If this PR is related to an unstable feature or an otherwise tracked effort,
34
please link to the relevant tracking issue here. If you don't know of a related
@@ -7,4 +8,5 @@ This PR will get automatically assigned to a reviewer. In case you would like
78
a specific user to review your work, you can assign it to them by using
89
910
r​? <reviewer name>
10-
-->
11+
-->
12+
<!-- homu-ignore:end -->

.github/workflows/ci.yml

+3-10
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ concurrency:
3838
cancel-in-progress: true
3939
env:
4040
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
41+
# This will be empty in PR jobs.
42+
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
4143
jobs:
4244
# The job matrix for `calculate_matrix` is defined in src/ci/github-actions/jobs.yml.
4345
# It calculates which jobs should be executed, based on the data of the ${{ github }} context.
@@ -63,7 +65,7 @@ jobs:
6365
defaults:
6466
run:
6567
shell: ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}
66-
timeout-minutes: 600
68+
timeout-minutes: 240
6769
env:
6870
CI_JOB_NAME: ${{ matrix.image }}
6971
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
@@ -93,8 +95,6 @@ jobs:
9395
path-type: inherit
9496
install: >
9597
make
96-
dos2unix
97-
diffutils
9898
9999
- name: disable git crlf conversion
100100
run: git config --global core.autocrlf false
@@ -154,12 +154,6 @@ jobs:
154154

155155
- name: checkout submodules
156156
run: src/ci/scripts/checkout-submodules.sh
157-
158-
- name: Setup Python
159-
uses: actions/setup-python@v5
160-
with:
161-
python-version: '3.x'
162-
if: runner.environment == 'github-hosted'
163157

164158
- name: install MinGW
165159
run: src/ci/scripts/install-mingw.sh
@@ -242,6 +236,5 @@ jobs:
242236
shell: bash
243237
if: needs.calculate_matrix.outputs.run_type == 'auto'
244238
env:
245-
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
246239
TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
247240
TOOLSTATE_PUBLISH: 1

.github/workflows/dependencies.yml

+13-2
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,22 @@ jobs:
6464
- name: cargo update
6565
# Remove first line that always just says "Updating crates.io index"
6666
run: cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
67+
- name: cargo update library
68+
run: |
69+
echo -e "\nlibrary dependencies:" >> cargo_update.log
70+
cargo update --manifest-path library/Cargo.toml 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
71+
- name: cargo update rustbook
72+
run: |
73+
echo -e "\nrustbook dependencies:" >> cargo_update.log
74+
cargo update --manifest-path src/tools/rustbook/Cargo.toml 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
6775
- name: upload Cargo.lock artifact for use in PR
6876
uses: actions/upload-artifact@v4
6977
with:
7078
name: Cargo-lock
71-
path: Cargo.lock
79+
path: |
80+
Cargo.lock
81+
library/Cargo.lock
82+
src/tools/rustbook/Cargo.lock
7283
retention-days: 1
7384
- name: upload cargo-update log artifact for use in PR
7485
uses: actions/upload-artifact@v4
@@ -113,7 +124,7 @@ jobs:
113124
git config user.name github-actions
114125
git config user.email [email protected]
115126
git switch --force-create cargo_update
116-
git add ./Cargo.lock
127+
git add ./Cargo.lock ./library/Cargo.lock ./src/tools/rustbook/Cargo.lock
117128
git commit --no-verify --file=commit.txt
118129
119130
- name: push

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ Session.vim
1919
*.iml
2020
.vscode
2121
.project
22+
.vim/
23+
.helix/
24+
.zed/
2225
.favorites.json
2326
.settings/
2427
.vs/
@@ -48,11 +51,15 @@ build/
4851
/dist/
4952
/unicode-downloads
5053
/target
54+
/library/target
5155
/src/bootstrap/target
5256
/src/tools/x/target
5357
# Created by default with `src/ci/docker/run.sh`
5458
/obj/
5559

60+
## ICE reports
61+
rustc-ice-*.txt
62+
5663
## Temporary files
5764
*~
5865
\#*

.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/18.1-2024-05-19
36+
branch = rustc/19.1-2024-07-30
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

.ignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Make vscode *not* count `config.toml` as ignored, so it is included in search
2+
!/config.toml

.mailmap

+4-1
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>
@@ -379,6 +381,7 @@ Markus Westerlind <[email protected]> Markus <[email protected]>
379381
Martin Carton <[email protected]>
380382
Martin Habovštiak <[email protected]>
381383
Martin Hafskjold Thoresen <[email protected]>
384+
382385
Matej Lach <[email protected]> Matej Ľach <[email protected]>
383386
Mateusz Mikuła <[email protected]>
384387
@@ -434,7 +437,7 @@ Nick Platt <[email protected]>
434437
Niclas Schwarzlose <[email protected]>
435438
Nicolas Abram <[email protected]>
436439
Nicole Mazzuca <[email protected]>
437-
Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> nils <[email protected]>
440+
Noratrieb <48135649+Noratrieb@users.noreply.github.com> <[email protected]>
438441
439442
440443

.reuse/dep5

-122
This file was deleted.

0 commit comments

Comments
 (0)