Skip to content

Commit f96e296

Browse files
borsbors
committed
Auto merge of rust-lang#17880 - lnicola:sync-from-rust, r=lnicola
minor: sync from downstream
2 parents 00423bb + 28af7e0 commit f96e296

File tree

3,690 files changed

+50038
-31483
lines changed

Some content is hidden

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

3,690 files changed

+50038
-31483
lines changed

‎.git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ b2d2184edea578109a48ec3d8decbee5948e8f35
2323
# test directives migration
2424
6e48b96692d63a79a14563f27fe5185f122434f8
2525
ec2cc761bc7067712ecc7734502f703fe3b024c8
26+
# format use declarations
27+
84ac80f1921afc243d71fd0caaa4f2838c294102

‎.gitignore

+4
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,6 +51,7 @@ 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`

‎.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

0 commit comments

Comments
 (0)