Rollup merge of rust-lang#149569 - blyxyas:mailmap, r=Mark-Simulacrum

Zalathar · web-flow · commit 8aa8ff2890b5 · 2025-12-04T16:29:26.000+11:00
Fix mailmap issue

My name and username got separated in thanks.rust-lang.org, probably due to me changing my email in Github about a month ago.
diff --git a/.mailmap b/.mailmap
@@ -43,6 +43,7 @@ Andre Bogus <bogusandre@gmail.com>
 Andre Bogus <bogusandre@gmail.com> <andre.bogus@aleph-alpha.de>
 Andre Bogus <bogusandre@gmail.com> <andre.bogus@ankordata.de>
 Andrea Ciliberti <meziu210@icloud.com>
+
 Andreas Gal <gal@mozilla.com> <andreas.gal@gmail.com>
 Andreas Jonson <andjo403@users.noreply.github.com>
 Andrew Gauger <andygauge@gmail.com>
@@ -87,7 +88,9 @@ bjorn3 <17426603+bjorn3@users.noreply.github.com> <bjorn3@users.noreply.github.c
 bjorn3 <17426603+bjorn3@users.noreply.github.com> <bjorn3_gh@protonmail.com>
 Björn Steinbrink <bsteinbr@gmail.com> <B.Steinbrink@gmx.de>
 blake2-ppc <ulrik.sverdrup@gmail.com> <blake2-ppc>
-blyxyas <blyxyas@gmail.com> Alejandra González <blyxyas@gmail.com>
+Alejandra González <blyxyas@goose.love> blyxyas <blyxyas@gmail.com>
+Alejandra González <blyxyas@goose.love> blyxyas <blyxyas@goose.love>
+Alejandra González <blyxyas@goose.love> Alejandra González <blyxyas@gmail.com>
 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>

-Original file line number
+Diff line change
 Andre Bogus <[email protected]> <[email protected]>
 Andre Bogus <[email protected]> <[email protected]>
 Andrea Ciliberti <[email protected]>
++
 Andreas Gal <[email protected]> <[email protected]>
 Andreas Jonson <[email protected]>
 Andrew Gauger <[email protected]>
 bjorn3 <[email protected]> <[email protected]>
 Björn Steinbrink <[email protected]> <[email protected]>
 blake2-ppc <[email protected]> <blake2-ppc>
 -blyxyas <[email protected]> Alejandra González <[email protected]>
 +Alejandra González <[email protected]> blyxyas <[email protected]>
 +Alejandra González <[email protected]> blyxyas <[email protected]>
 +Alejandra González <[email protected]> Alejandra González <[email protected]>
 boolean_coercion <[email protected]>
 Boris Egorov <[email protected]> <[email protected]>
 bors <[email protected]> bors[bot] <26634292+bors[bot]@users.noreply.github.com>