Merge from rustc

Kobzol · Kobzol · commit 6be99fab11b0 · 2024-12-30T18:20:50.000+01:00
diff --git a/src/doc/rustc-dev-guide/.mailmap b/src/doc/rustc-dev-guide/.mailmap
@@ -3,3 +3,4 @@ Jynn Nelson <github@jyn.dev> <joshua@yottadb.com>
 Jynn Nelson <github@jyn.dev> <jyn.nelson@redjack.com>
 Jynn Nelson <github@jyn.dev> <jnelson@cloudflare.com>
 Jynn Nelson <github@jyn.dev>
+FOO BAR

-Original file line number
+Diff line change
 Jynn Nelson <[email protected]> <[email protected]>
 Jynn Nelson <[email protected]> <[email protected]>
 Jynn Nelson <[email protected]>
 +FOO BAR