Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a4de684

Browse files
committedJan 21, 2025·
Merge remote-tracking branch 'upstream/master'
2 parents 8c51586 + a7a6c64 commit a4de684

File tree

11,950 files changed

+712051
-182806
lines changed

Some content is hidden

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

11,950 files changed

+712051
-182806
lines changed
 

‎.gitignore

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ no_llvm_build
4646
/inst/
4747
/llvm/
4848
/mingw-build/
49-
build/
50-
!/compiler/rustc_mir_build/src/build/
49+
/build
5150
/build-rust-analyzer/
5251
/dist/
5352
/unicode-downloads
@@ -57,6 +56,8 @@ build/
5756
/src/tools/x/target
5857
# Created by default with `src/ci/docker/run.sh`
5958
/obj/
59+
# Created by nix dev shell / .envrc
60+
src/tools/nix-dev-shell/flake.lock
6061

6162
## ICE reports
6263
rustc-ice-*.txt
@@ -87,12 +88,12 @@ package.json
8788
tests/rustdoc-gui/src/**.lock
8889

8990
## direnv
90-
.envrc
91-
.direnv/
91+
/.envrc
92+
/.direnv/
9293

9394
## nix
94-
flake.nix
95+
/flake.nix
9596
flake.lock
96-
default.nix
97+
/default.nix
9798

9899
# Before adding new lines, see the comment at the top.

‎.gitmodules

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,14 @@
2222
path = library/stdarch
2323
url = https://github.com/rust-lang/stdarch.git
2424
shallow = true
25-
[submodule "src/doc/rustc-dev-guide"]
26-
path = src/doc/rustc-dev-guide
27-
url = https://github.com/rust-lang/rustc-dev-guide.git
28-
shallow = true
2925
[submodule "src/doc/edition-guide"]
3026
path = src/doc/edition-guide
3127
url = https://github.com/rust-lang/edition-guide.git
3228
shallow = true
3329
[submodule "src/llvm-project"]
3430
path = src/llvm-project
3531
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/19.1-2024-09-17
32+
branch = rustc/19.1-2024-12-03
3733
shallow = true
3834
[submodule "src/doc/embedded-book"]
3935
path = src/doc/embedded-book
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)