Rollup merge of rust-lang#134965 - Noratrieb:slightly-late-for-boxing-day-sadly-but-still-almost, r=BoxyUwU

matthiaskrgr · web-flow · commit d1c7ad081fc2 · 2025-01-03T22:12:42.000+01:00
Make Boxy UwU as requested by r? ``@BoxyUwU`` , supersedes rust-lang#129906 We need 2 entries here, the first one tells us that this email and this name is canonical for you, the second entry maps that email to your canonical email (and name).
diff --git a/.mailmap b/.mailmap
@@ -88,7 +88,8 @@ boolean_coercion <booleancoercion@gmail.com>
 Boris Egorov <jightuse@gmail.com> <egorov@linux.com>
 bors <bors@rust-lang.org> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
 bors <bors@rust-lang.org> bors[bot] <bors[bot]@users.noreply.github.com>
-Boxy <rust@boxyuwu.dev> <supbscripter@gmail.com>
+BoxyUwU <rust@boxyuwu.dev>
+BoxyUwU <rust@boxyuwu.dev> <supbscripter@gmail.com>
 Braden Nelson <moonheart08@users.noreply.github.com>
 Brandon Sanderson <singingboyo@gmail.com> Brandon Sanderson <singingboyo@hotmail.com>
 Brett Cannon <brett@python.org> Brett Cannon <brettcannon@users.noreply.github.com>

-Original file line number
+Diff line change
 Boris Egorov <[email protected]> <[email protected]>
 bors <[email protected]> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
 bors <[email protected]> bors[bot] <bors[bot]@users.noreply.github.com>
 -Boxy <[email protected]> <[email protected]>
 +BoxyUwU <[email protected]>
 +BoxyUwU <[email protected]> <[email protected]>
 Braden Nelson <[email protected]>
 Brandon Sanderson <[email protected]> Brandon Sanderson <[email protected]>
 Brett Cannon <[email protected]> Brett Cannon <[email protected]>