Skip to content

Commit 97c8038

Browse files
authored
Merge branch 'rust-lang:master' into rwlock-downgrade
2 parents 5e84405 + a73bc4a commit 97c8038

File tree

3,400 files changed

+63140
-33998
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,400 files changed

+63140
-33998
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

.github/workflows/dependencies.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- name: cargo update rustbook
6868
run: |
6969
echo -e "\nrustbook dependencies:" >> cargo_update.log
70-
cargo update --manifest-path src/tools/rustbook 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
70+
cargo update --manifest-path src/tools/rustbook/Cargo.toml 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
7171
- name: upload Cargo.lock artifact for use in PR
7272
uses: actions/upload-artifact@v4
7373
with:

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