Skip to content

Commit aaa0c6f

Browse files
Rollup merge of #132471 - Noratrieb:lots-of-mailmapping, r=Mark-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.
2 parents 8570a30 + e4305f1 commit aaa0c6f

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

.mailmap

+20-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Alexis Beingessner <a.beingessner@gmail.com>
3131
Alfie John <alfie@alfie.wtf> Alfie John <alfiej@fastmail.fm>
3232
Alona Enraght-Moony <code@alona.page> <nixon.emoony@gmail.com>
3333
Alona Enraght-Moony <code@alona.page> <nixon@caminus.local>
34+
Alona Enraght-Moony <code@alona.page> <contact@alona.page>
3435
Amanda Stjerna <mail@amandastjerna.se> <albin.stjerna@gmail.com>
3536
Amanda Stjerna <mail@amandastjerna.se> <amanda.stjerna@it.uu.se>
3637
Amos Onn <amosonn@gmail.com>
@@ -75,6 +76,7 @@ Benjamin Jackman <ben@jackman.biz>
7576
Benoît Cortier <benoit.cortier@fried-world.eu>
7677
Bheesham Persaud <bheesham123@hotmail.com> Bheesham Persaud <bheesham.persaud@live.ca>
7778
bjorn3 <17426603+bjorn3@users.noreply.github.com> <bjorn3@users.noreply.github.com>
79+
bjorn3 <17426603+bjorn3@users.noreply.github.com> <bjorn3_gh@protonmail.com>
7880
Björn Steinbrink <bsteinbr@gmail.com> <B.Steinbrink@gmx.de>
7981
blake2-ppc <ulrik.sverdrup@gmail.com> <blake2-ppc>
8082
blyxyas <blyxyas@gmail.com> Alejandra González <blyxyas@gmail.com>
@@ -172,6 +174,7 @@ Dzmitry Malyshau <kvarkus@gmail.com>
172174
E. Dunham <edunham@mozilla.com> edunham <edunham@mozilla.com>
173175
Ed Barnard <eabarnard@gmail.com>
174176
Eduard-Mihai Burtescu <edy.burt@gmail.com>
177+
Eduard-Mihai Burtescu <edy.burt@gmail.com> <eddyb@lyken.rs>
175178
Eduardo Bautista <me@eduardobautista.com> <=>
176179
Eduardo Bautista <me@eduardobautista.com> <mail@eduardobautista.com>
177180
Eduardo Broto <ebroto@tutanota.com>
@@ -186,6 +189,7 @@ Erick Tryzelaar <erick.tryzelaar@gmail.com> <etryzelaar@iqt.org>
186189
Erik Desjardins <erikdesjardins@users.noreply.github.com>
187190
Erik Jensen <erikjensen@rkjnsn.net>
188191
Erin Power <xampprocky@gmail.com>
192+
Erin Power <xampprocky@gmail.com> <xampprocky@icloud.com>
189193
Erin Power <xampprocky@gmail.com> <theaaronepower@gmail.com>
190194
Erin Power <xampprocky@gmail.com> <Aaronepower@users.noreply.github.com>
191195
Esteban Küber <esteban@kuber.com.ar>
@@ -198,6 +202,7 @@ F001 <changchun.fan@qq.com>
198202
Fabian Kössel <fkjogu@users.noreply.github.com>
199203
Falco Hirschenberger <falco.hirschenberger@gmail.com> <hirschen@itwm.fhg.de>
200204
Felix S. Klock II <pnkfelix@pnkfx.org> Felix S Klock II <pnkfelix@pnkfx.org>
205+
Felix S. Klock II <pnkfelix@pnkfx.org> <pnkfelix@mozilla.com>
201206
Félix Saparelli <felix@passcod.name>
202207
Flaper Fesp <flaper87@gmail.com>
203208
Florian Berger <fbergr@gmail.com>
@@ -245,7 +250,7 @@ Irina Popa <irinagpopa@gmail.com>
245250
Ivan Ivaschenko <defuz.net@gmail.com>
246251
ivan tkachenko <me@ratijas.tk>
247252
J. J. Weber <jjweber@gmail.com>
248-
Jack Huey <jack.huey@umassmed.edu>
253+
Jack Huey <jack.huey@umassmed.edu> <jackh726@gmail.com>
249254
Jacob <jacob.macritchie@gmail.com>
250255
Jacob Greenfield <xales@naveria.com>
251256
Jacob Pratt <jacob@jhpratt.dev> <the.z.cuber@gmail.com>
@@ -292,6 +297,7 @@ John Clements <clements@racket-lang.org> <clements@brinckerhoff.org>
292297
John Hodge <acessdev@gmail.com> John Hodge <tpg@mutabah.net>
293298
John Hörnvall <trolledwoods@gmail.com>
294299
John Kåre Alsaker <john.kare.alsaker@gmail.com>
300+
John Kåre Alsaker <john.kare.alsaker@gmail.com> <zoxc32@gmail.com>
295301
John Talling <inrustwetrust@users.noreply.github.com>
296302
John Van Enk <vanenkj@gmail.com>
297303
Jonas Tepe <jonasprogrammer@gmail.com>
@@ -368,6 +374,7 @@ Lukas Lueg <lukas.lueg@gmail.com>
368374
Luke Metz <luke.metz@students.olin.edu>
369375
Luqman Aden <me@luqman.ca> <laden@csclub.uwaterloo.ca>
370376
Luqman Aden <me@luqman.ca> <laden@mozilla.com>
377+
Luqman Aden <me@luqman.ca> <rust@luqman.ca>
371378
Lzu Tao <taolzu@gmail.com>
372379
Maik Klein <maikklein@googlemail.com>
373380
Malo Jaffré <jaffre.malo@gmail.com>
@@ -409,6 +416,7 @@ mental <m3nta1@yahoo.com>
409416
mibac138 <5672750+mibac138@users.noreply.github.com>
410417
Michael Williams <m.t.williams@live.com>
411418
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
419+
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail.com>
412420
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@users.noreply.github.com>
413421
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@posteo.net>
414422
Michael Zhang <hmperson1@gmail.com>
@@ -422,6 +430,7 @@ Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com>
422430
msizanoen1 <qtmlabs@protonmail.com>
423431
Mukilan Thiagarajan <mukilanthiagarajan@gmail.com>
424432
Nadrieril Feneanar <Nadrieril@users.noreply.github.com>
433+
Nadrieril Feneanar <Nadrieril@users.noreply.github.com> <nadrieril+git@gmail.com>
425434
NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com>
426435
NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm+github@gmail.com>
427436
Nathan Ringo <remexre@gmail.com>
@@ -442,6 +451,8 @@ Niclas Schwarzlose <15schnic@gmail.com>
442451
Nicolas Abram <abramlujan@gmail.com>
443452
Nicole Mazzuca <npmazzuca@gmail.com>
444453
Noratrieb <48135649+Noratrieb@users.noreply.github.com> <48135649+Nilstrieb@users.noreply.github.com>
454+
Noratrieb <48135649+Noratrieb@users.noreply.github.com> <nilstrieb@gmail.com>
455+
Noratrieb <48135649+Noratrieb@users.noreply.github.com> <nora@noratrieb.dev>
445456
Nif Ward <nif.ward@gmail.com>
446457
Nika Layzell <nika@thelayzells.com> <michael@thelayzells.com>
447458
NODA Kai <nodakai@gmail.com>
@@ -460,6 +471,7 @@ Oliver Scherer <oli-obk@users.noreply.github.com> <github6541940@oli-obk.de>
460471
Oliver Scherer <oli-obk@users.noreply.github.com> <public.oliver.schneider@kit.edu>
461472
Oliver Scherer <oli-obk@users.noreply.github.com> <oliver.schneider@kit.edu>
462473
Oliver Scherer <oli-obk@users.noreply.github.com> <obk8176014uqher834@olio-obk.de>
474+
Oliver Scherer <oli-obk@users.noreply.github.com> <rustc-contact@oli-obk.de>
463475
Oliver Scherer <oli-obk@users.noreply.github.com>
464476
Onur Özkan <onurozkan.dev@outlook.com> <work@onurozkan.dev>
465477
Onur Özkan <onurozkan.dev@outlook.com>
@@ -496,6 +508,7 @@ Raphaël Huchet <rap2hpoutre@users.noreply.github.com>
496508
rChaser53 <tayoshizawa29@gmail.com>
497509
Rémy Rakic <remy.rakic@gmail.com>
498510
Rémy Rakic <remy.rakic@gmail.com> <remy.rakic+github@gmail.com>
511+
Rémy Rakic <remy.rakic@gmail.com> <remy.rakic+rust@gmail.com>
499512
Renato Riccieri Santos Zannon <renato@rrsz.com.br>
500513
Richard Diamond <wichard@vitalitystudios.com> <wichard@hahbee.co>
501514
Ricky Hosfelt <ricky@hosfelt.io>
@@ -525,6 +538,7 @@ Samuel Tardieu <sam@rfc1149.net>
525538
Santiago Pastorino <spastorino@gmail.com>
526539
Santiago Pastorino <spastorino@gmail.com> <santiago@wyeworks.com>
527540
Scott McMurray <scottmcm@users.noreply.github.com>
541+
Scott McMurray <scottmcm@users.noreply.github.com> <smcmurray@acm.org>
528542
Scott Olson <scott@solson.me> Scott Olson <scott@scott-olson.org>
529543
Sean Gillespie <sean.william.g@gmail.com> swgillespie <sean.william.g@gmail.com>
530544
Seiichi Uchida <seuchida@gmail.com>
@@ -536,6 +550,7 @@ Shyam Sundar B <shyambaskaran@outlook.com>
536550
Simon Barber-Dueck <sbarberdueck@gmail.com> Simon BD <simon@server>
537551
Simon Sapin <simon@exyr.org> <simon.sapin@exyr.org>
538552
Simonas Kazlauskas <git@kazlauskas.me> Simonas Kazlauskas <github@kazlauskas.me>
553+
Simonas Kazlauskas <git@kazlauskas.me> <simonas+t-compiler@kazlauskas.me>
539554
Siva Prasad <sivaauturic@gmail.com>
540555
Smittyvb <me@smitop.com>
541556
Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>
@@ -556,6 +571,8 @@ Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
556571
Tau Gärtli <git@tau.garden> <ruben.schmidmeister@icloud.com>
557572
Tero Hänninen <lgvz@users.noreply.github.com> Tero Hänninen <tejohann@kapsi.fi>
558573
The8472 <git@infinite-source.de>
574+
The8472 <git@infinite-source.de> <the8472.rs@infinite-source.de>
575+
The8472 <git@infinite-source.de> <the8472@users.noreply.github.com>
559576
Theo Belaire <theo.belaire@gmail.com> Theo Belaire <tyr.god.of.war.42@gmail.com>
560577
Theodore Luo Wang <wangtheo662@gmail.com>
561578
Thiago Pontes <email@thiago.me> thiagopnts <thiagopnts@gmail.com>
@@ -593,7 +610,8 @@ Waffle Lapkin <waffle.lapkin@tasking.com>
593610
Wesley Wiser <wwiser@gmail.com> <wesleywiser@microsoft.com>
594611
whitequark <whitequark@whitequark.org>
595612
William Ting <io@williamting.com> <william.h.ting@gmail.com>
596-
Wim Looman <wim@nemo157.com>
613+
Wim Looman <wim@nemo157.com> <rust-lang@nemo157.com>
614+
Wim Looman <wim@nemo157.com> <git@nemo157.com>
597615
Without Boats <woboats@gmail.com>
598616
Without Boats <woboats@gmail.com> <boats@mozilla.com>
599617
Xinye Tao <xy.tao@outlook.com>

0 commit comments

Comments
 (0)