Skip to content

Commit

Permalink
Rollup merge of rust-lang#132471 - Noratrieb:lots-of-mailmapping, r=M…
Browse files Browse the repository at this point in the history
…ark-Simulacrum

Add a bunch of mailmap entries

This adds a bunch of missing mailmap entries for many people. These are needed when using rust-lang/team information in rust-lang/thanks (rust-lang/thanks#53), as the emails there may differ.

These are "easy" ones, where there was a mailmap entry already, making it clear which one is the preferred email address.
  • Loading branch information
workingjubilee authored Nov 2, 2024
2 parents 8570a30 + e4305f1 commit aaa0c6f
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Alexis Beingessner <[email protected]>
Alfie John <[email protected]> Alfie John <[email protected]>
Alona Enraght-Moony <[email protected]> <[email protected]>
Alona Enraght-Moony <[email protected]> <[email protected]>
Alona Enraght-Moony <[email protected]> <[email protected]>
Amanda Stjerna <[email protected]> <[email protected]>
Amanda Stjerna <[email protected]> <[email protected]>
Amos Onn <[email protected]>
Expand Down Expand Up @@ -75,6 +76,7 @@ Benjamin Jackman <[email protected]>
Benoît Cortier <[email protected]>
Bheesham Persaud <[email protected]> Bheesham Persaud <[email protected]>
bjorn3 <[email protected]> <[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]>
Expand Down Expand Up @@ -172,6 +174,7 @@ Dzmitry Malyshau <[email protected]>
E. Dunham <[email protected]> edunham <[email protected]>
Ed Barnard <[email protected]>
Eduard-Mihai Burtescu <[email protected]>
Eduard-Mihai Burtescu <[email protected]> <[email protected]>
Eduardo Bautista <[email protected]> <=>
Eduardo Bautista <[email protected]> <[email protected]>
Eduardo Broto <[email protected]>
Expand All @@ -186,6 +189,7 @@ Erick Tryzelaar <[email protected]> <[email protected]>
Erik Desjardins <[email protected]>
Erik Jensen <[email protected]>
Erin Power <[email protected]>
Erin Power <[email protected]> <[email protected]>
Erin Power <[email protected]> <[email protected]>
Erin Power <[email protected]> <[email protected]>
Esteban Küber <[email protected]>
Expand All @@ -198,6 +202,7 @@ F001 <[email protected]>
Fabian Kössel <[email protected]>
Falco Hirschenberger <[email protected]> <[email protected]>
Felix S. Klock II <[email protected]> Felix S Klock II <[email protected]>
Felix S. Klock II <[email protected]> <[email protected]>
Félix Saparelli <[email protected]>
Flaper Fesp <[email protected]>
Florian Berger <[email protected]>
Expand Down Expand Up @@ -245,7 +250,7 @@ Irina Popa <[email protected]>
Ivan Ivaschenko <[email protected]>
ivan tkachenko <[email protected]>
J. J. Weber <[email protected]>
Jack Huey <[email protected]>
Jack Huey <[email protected]> <[email protected]>
Jacob <[email protected]>
Jacob Greenfield <[email protected]>
Jacob Pratt <[email protected]> <[email protected]>
Expand Down Expand Up @@ -292,6 +297,7 @@ John Clements <[email protected]> <[email protected]>
John Hodge <[email protected]> John Hodge <[email protected]>
John Hörnvall <[email protected]>
John Kåre Alsaker <[email protected]>
John Kåre Alsaker <[email protected]> <[email protected]>
John Talling <[email protected]>
John Van Enk <[email protected]>
Jonas Tepe <[email protected]>
Expand Down Expand Up @@ -368,6 +374,7 @@ Lukas Lueg <[email protected]>
Luke Metz <[email protected]>
Luqman Aden <[email protected]> <[email protected]>
Luqman Aden <[email protected]> <[email protected]>
Luqman Aden <[email protected]> <[email protected]>
Lzu Tao <[email protected]>
Maik Klein <[email protected]>
Malo Jaffré <[email protected]>
Expand Down Expand Up @@ -409,6 +416,7 @@ mental <[email protected]>
mibac138 <[email protected]>
Michael Williams <[email protected]>
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
Michael Woerister <michaelwoerister@posteo> <[email protected]>
Michael Woerister <michaelwoerister@posteo> <[email protected]>
Michael Woerister <michaelwoerister@posteo> <[email protected]>
Michael Zhang <[email protected]>
Expand All @@ -422,6 +430,7 @@ Ms2ger <[email protected]> <[email protected]>
msizanoen1 <[email protected]>
Mukilan Thiagarajan <[email protected]>
Nadrieril Feneanar <[email protected]>
Nadrieril Feneanar <[email protected]> <[email protected]>
NAKASHIMA, Makoto <[email protected]> <[email protected]>
NAKASHIMA, Makoto <[email protected]> <[email protected]>
Nathan Ringo <[email protected]>
Expand All @@ -442,6 +451,8 @@ Niclas Schwarzlose <[email protected]>
Nicolas Abram <[email protected]>
Nicole Mazzuca <[email protected]>
Noratrieb <[email protected]> <[email protected]>
Noratrieb <[email protected]> <[email protected]>
Noratrieb <[email protected]> <[email protected]>
Nif Ward <[email protected]>
Nika Layzell <[email protected]> <[email protected]>
NODA Kai <[email protected]>
Expand All @@ -460,6 +471,7 @@ Oliver Scherer <[email protected]> <[email protected]>
Oliver Scherer <[email protected]> <[email protected]>
Oliver Scherer <[email protected]> <[email protected]>
Oliver Scherer <[email protected]> <[email protected]>
Oliver Scherer <[email protected]> <[email protected]>
Oliver Scherer <[email protected]>
Onur Özkan <[email protected]> <[email protected]>
Onur Özkan <[email protected]>
Expand Down Expand Up @@ -496,6 +508,7 @@ Raphaël Huchet <[email protected]>
rChaser53 <[email protected]>
Rémy Rakic <[email protected]>
Rémy Rakic <[email protected]> <[email protected]>
Rémy Rakic <[email protected]> <[email protected]>
Renato Riccieri Santos Zannon <[email protected]>
Richard Diamond <[email protected]> <[email protected]>
Ricky Hosfelt <[email protected]>
Expand Down Expand Up @@ -525,6 +538,7 @@ Samuel Tardieu <[email protected]>
Santiago Pastorino <[email protected]>
Santiago Pastorino <[email protected]> <[email protected]>
Scott McMurray <[email protected]>
Scott McMurray <[email protected]> <[email protected]>
Scott Olson <[email protected]> Scott Olson <[email protected]>
Sean Gillespie <[email protected]> swgillespie <[email protected]>
Seiichi Uchida <[email protected]>
Expand All @@ -536,6 +550,7 @@ Shyam Sundar B <[email protected]>
Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
Simon Sapin <[email protected]> <[email protected]>
Simonas Kazlauskas <[email protected]> Simonas Kazlauskas <[email protected]>
Simonas Kazlauskas <[email protected]> <[email protected]>
Siva Prasad <[email protected]>
Smittyvb <[email protected]>
Srinivas Reddy Thatiparthy <[email protected]>
Expand All @@ -556,6 +571,8 @@ Tatsuyuki Ishi <[email protected]>
Tau Gärtli <[email protected]> <[email protected]>
Tero Hänninen <[email protected]> Tero Hänninen <[email protected]>
The8472 <[email protected]>
The8472 <[email protected]> <[email protected]>
The8472 <[email protected]> <[email protected]>
Theo Belaire <[email protected]> Theo Belaire <[email protected]>
Theodore Luo Wang <[email protected]>
Thiago Pontes <[email protected]> thiagopnts <[email protected]>
Expand Down Expand Up @@ -593,7 +610,8 @@ Waffle Lapkin <[email protected]>
Wesley Wiser <[email protected]> <[email protected]>
whitequark <[email protected]>
William Ting <[email protected]> <[email protected]>
Wim Looman <[email protected]>
Wim Looman <[email protected]> <[email protected]>
Wim Looman <[email protected]> <[email protected]>
Without Boats <[email protected]>
Without Boats <[email protected]> <[email protected]>
Xinye Tao <[email protected]>
Expand Down

0 comments on commit aaa0c6f

Please sign in to comment.