Skip to content

Commit afe7379

Browse files
authored
Merge branch 'rust-lang:master' into master
2 parents e1fcc93 + 026e9ed commit afe7379

File tree

1,942 files changed

+38572
-20371
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,942 files changed

+38572
-20371
lines changed

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

0 commit comments

Comments
 (0)