Skip to content

Commit 458a144

Browse files
committed
Merge branch 'reference_vis' of https://github.com/Walnut356/rust into reference_vis
2 parents c8e2bf9 + 834d936 commit 458a144

File tree

1,609 files changed

+23772
-16175
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,609 files changed

+23772
-16175
lines changed

.gitattributes

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
*.cpp rust
55
*.h rust
66
*.rs rust diff=rust
7-
*.fixed linguist-language=Rust
8-
*.mir linguist-language=Rust
7+
*.fixed linguist-language=Rust -merge
8+
*.mir linguist-language=Rust -merge
9+
*.stderr -merge
10+
*.stdout -merge
911
src/etc/installer/gfx/* binary
1012
src/vendor/** -text
1113
Cargo.lock linguist-generated=false

.github/renovate.json5

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
// Let Renovatebot keep an opened issue that tracks our dependencies
4+
"dependencyDashboard": true,
5+
// Disable "normal" package updates
6+
"enabledManagers": [],
7+
// Update lockfiles once per week
8+
"lockFileMaintenance": {
9+
"enabled": true,
10+
"schedule": [
11+
"before 5am on Tuesday"
12+
]
13+
}
14+
}

.gitignore

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ package.json
8888
tests/rustdoc-gui/src/**.lock
8989

9090
## direnv
91-
.envrc
92-
.direnv/
91+
/.envrc
92+
/.direnv/
9393

9494
## nix
95-
flake.nix
95+
/flake.nix
9696
flake.lock
97-
default.nix
97+
/default.nix
9898

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

.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/19.1-2024-09-17
36+
branch = rustc/19.1-2024-12-03
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book

.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ Jack Huey <jack.huey@umassmed.edu> <jackh726@gmail.com>
254254
Jacob <jacob.macritchie@gmail.com>
255255
Jacob Greenfield <xales@naveria.com>
256256
Jacob Pratt <jacob@jhpratt.dev> <the.z.cuber@gmail.com>
257+
Jacob Pratt <jacob@jhpratt.dev> <jacopratt@tesla.com>
257258
Jake Vossen <jake@vossen.dev>
258259
Jakob Degen <jakob.e.degen@gmail.com> <jakob@degen.com>
259260
Jakob Lautrup Nysom <jako3047@gmail.com>

0 commit comments

Comments
 (0)