Skip to content

Commit bfd31ea

Browse files
authored
Merge branch 'master' into master
2 parents f93f693 + 9649706 commit bfd31ea

File tree

7,691 files changed

+149645
-98019
lines changed

Some content is hidden

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

7,691 files changed

+149645
-98019
lines changed

.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/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-2
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,12 +51,14 @@ build/
4851
/dist/
4952
/unicode-downloads
5053
/target
54+
/library/target
5155
/src/bootstrap/target
5256
/src/tools/x/target
53-
/inc-fat/
5457
# Created by default with `src/ci/docker/run.sh`
5558
/obj/
56-
/rustc-ice*
59+
60+
## ICE reports
61+
rustc-ice-*.txt
5762

5863
## Temporary files
5964
*~

.gitmodules

+1-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

.mailmap

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ Nick Platt <[email protected]>
435435
Niclas Schwarzlose <[email protected]>
436436
Nicolas Abram <[email protected]>
437437
Nicole Mazzuca <[email protected]>
438-
Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> nils <[email protected]>
438+
Noratrieb <48135649+Noratrieb@users.noreply.github.com> <[email protected]>
439439
440440
441441

.reuse/dep5

-124
This file was deleted.

0 commit comments

Comments
 (0)