Merge pull request #18662 from lnicola/sync-from-rust

internal: Sync from downstream

Author: lnicola

.gitattributes

@@ -4,8 +4,10 @@
 *.cpp rust
 *.h rust
 *.rs rust diff=rust
-*.fixed linguist-language=Rust
-*.mir linguist-language=Rust
+*.fixed linguist-language=Rust -merge
+*.mir linguist-language=Rust -merge
+*.stderr -merge
+*.stdout -merge
 src/etc/installer/gfx/* binary
 src/vendor/** -text
 Cargo.lock linguist-generated=false

.github/renovate.json5

@@ -0,0 +1,14 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  // Let Renovatebot keep an opened issue that tracks our dependencies
+  "dependencyDashboard": true,
+  // Disable "normal" package updates
+  "enabledManagers": [],
+  // Update lockfiles once per week
+  "lockFileMaintenance": {
+    "enabled": true,
+    "schedule": [
+      "before 5am on Tuesday"
+    ]
+  }
+}

.gitignore

@@ -46,8 +46,7 @@ no_llvm_build
 /inst/
 /llvm/
 /mingw-build/
-build/
-!/compiler/rustc_mir_build/src/build/
+/build
 /build-rust-analyzer/
 /dist/
 /unicode-downloads
@@ -89,12 +88,12 @@ package.json
 tests/rustdoc-gui/src/**.lock
 
 ## direnv
-.envrc
-.direnv/
+/.envrc
+/.direnv/
 
 ## nix
-flake.nix
+/flake.nix
 flake.lock
-default.nix
+/default.nix
 
 # Before adding new lines, see the comment at the top.

.gitmodules

@@ -33,7 +33,7 @@
 [submodule "src/llvm-project"]
 	path = src/llvm-project
 	url = https://github.com/rust-lang/llvm-project.git
-	branch = rustc/19.1-2024-09-17
+	branch = rustc/19.1-2024-12-03
 	shallow = true
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book

.mailmap

@@ -254,6 +254,7 @@ Jack Huey <[email protected]> <[email protected]>
 Jacob <[email protected]>
 Jacob Greenfield <[email protected]>
 Jacob Pratt <[email protected]> <[email protected]>
+Jacob Pratt <[email protected]> <[email protected]>
 Jake Vossen <[email protected]>
 Jakob Degen <[email protected]> <[email protected]>
 Jakob Lautrup Nysom <[email protected]>