Skip to content

Commit 1f8b790

Browse files
committed
Add more mailmap entries
The people updated in this commit have contributed under different email addresses than the ones they have used in rust-lang/team. A new change will use team data for thanks reviewers, which requires this to be in sync. Therefore, I have updated many of the people that I've noticed being duplicated after the change.
1 parent e4305f1 commit 1f8b790

File tree

1 file changed

+30
-1
lines changed

1 file changed

+30
-1
lines changed

.mailmap

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ Andrew Poelstra <asp11@sfu.ca> <apoelstra@wpsoftware.net>
4848
Anhad Singh <andypythonappdeveloper@gmail.com>
4949
Antoine Plaskowski <antoine.plaskowski@epitech.eu>
5050
Anton Löfgren <anton.lofgren@gmail.com> <alofgren@op5.com>
51+
apiraino <apiraino@users.noreply.github.com> <apiraino@protonmail.com>
5152
Araam Borhanian <avborhanian@gmail.com>
5253
Araam Borhanian <avborhanian@gmail.com> <dobbybabee@gmail.com>
5354
Areski Belaid <areski@gmail.com> areski <areski@gmail.com>
@@ -62,6 +63,7 @@ Austin Seipp <mad.one@gmail.com> <as@hacks.yi.org>
6263
Ayaz Hafiz <ayaz.hafiz.1@gmail.com>
6364
Aydin Kim <ladinjin@hanmail.net> aydin.kim <aydin.kim@samsung.com>
6465
Ayush Mishra <ayushmishra2005@gmail.com>
66+
Ashley Mannix <kodraus@hey.com> <ashleymannix@live.com.au>
6567
asrar <aszenz@gmail.com>
6668
BaoshanPang <pangbw@gmail.com>
6769
Barosl Lee <vcs@barosl.com> Barosl LEE <github@barosl.com>
@@ -133,11 +135,13 @@ Clement Miao <clementmiao@gmail.com>
133135
Clément Renault <renault.cle@gmail.com>
134136
Cliff Dyer <jcd@sdf.org>
135137
Clinton Ryan <clint.ryan3@gmail.com>
138+
Taylor Cramer <cramertaylorj@gmail.com> <cramertj@google.com>
136139
ember arlynx <ember@lunar.town> <corey@octayn.net>
137140
Crazycolorz5 <Crazycolorz5@gmail.com>
138141
csmoe <35686186+csmoe@users.noreply.github.com>
139142
Cyryl Płotnicki <cyplo@cyplo.net>
140143
Damien Schoof <damien.schoof@gmail.com>
144+
Dan Gohman <dev@sunfishcode.online> <sunfish@mozilla.com>
141145
Dan Robertson <danlrobertson89@gmail.com>
142146
Daniel Campoverde <alx741@riseup.net>
143147
Daniel J Rollins <drollins@financialforce.com>
@@ -179,6 +183,8 @@ Eduardo Bautista <me@eduardobautista.com> <=>
179183
Eduardo Bautista <me@eduardobautista.com> <mail@eduardobautista.com>
180184
Eduardo Broto <ebroto@tutanota.com>
181185
Edward Shen <code@eddie.sh> <xes@meta.com>
186+
Jacob Finkelman <eh2406@wayne.edu>
187+
Jacob Finkelman <eh2406@wayne.edu> <YeomanYaacov@gmail.com>
182188
Elliott Slaughter <elliottslaughter@gmail.com> <eslaughter@mozilla.com>
183189
Elly Fong-Jones <elly@leptoquark.net>
184190
Eric Holk <eric.holk@gmail.com> <eholk@cs.indiana.edu>
@@ -206,6 +212,7 @@ Felix S. Klock II <pnkfelix@pnkfx.org> <pnkfelix@mozilla.com>
206212
Félix Saparelli <felix@passcod.name>
207213
Flaper Fesp <flaper87@gmail.com>
208214
Florian Berger <fbergr@gmail.com>
215+
Florian Gilcher <florian.gilcher@asquera.de> <flo@andersground.net>
209216
Florian Wilkens <mrfloya_github@outlook.com> Florian Wilkens <floya@live.de>
210217
François Mockers <mockersf@gmail.com>
211218
Frank Steffahn <fdsteffahn@gmail.com> <frank.steffahn@stu.uni-kiel.de>
@@ -240,6 +247,8 @@ Herman J. Radtke III <herman@hermanradtke.com> Herman J. Radtke III <hermanradtk
240247
Hirochika Matsumoto <git@hkmatsumoto.com> <matsujika@gmail.com>
241248
Hrvoje Nikšić <hniksic@gmail.com>
242249
Hsiang-Cheng Yang <rick68@users.noreply.github.com>
250+
Huon Wilson <dbau.pp@gmail.com>
251+
Huon Wilson <dbau.pp@gmail.com> <wilson.huon@gmail.com>
243252
Ian Jackson <ijackson@chiark.greenend.org.uk> <ian.jackson@citrix.com>
244253
Ian Jackson <ijackson@chiark.greenend.org.uk> <ijackson+github@slimy.greenend.org.uk>
245254
Ian Jackson <ijackson@chiark.greenend.org.uk> <iwj@xenproject.org>
@@ -252,8 +261,11 @@ ivan tkachenko <me@ratijas.tk>
252261
J. J. Weber <jjweber@gmail.com>
253262
Jack Huey <jack.huey@umassmed.edu> <jackh726@gmail.com>
254263
Jacob <jacob.macritchie@gmail.com>
264+
Jacob Hoffman-Andrews <rust@hoffman-andrews.com> <github@hoffman-andrews.com>
255265
Jacob Greenfield <xales@naveria.com>
256266
Jacob Pratt <jacob@jhpratt.dev> <the.z.cuber@gmail.com>
267+
Jake Goulding <jake.goulding@gmail.com> <jake.goulding@integer32.com>
268+
Jake Goulding <jake.goulding@gmail.com> <shepmaster@mac.com>
257269
Jake Vossen <jake@vossen.dev>
258270
Jakob Degen <jakob.e.degen@gmail.com> <jakob@degen.com>
259271
Jakob Lautrup Nysom <jako3047@gmail.com>
@@ -321,9 +333,12 @@ Josh Holmer <jholmer.in@gmail.com>
321333
Josh Stone <cuviper@gmail.com> <jistone@redhat.com>
322334
Josh Stone <cuviper@gmail.com> <jistone@fedoraproject.org>
323335
Julia Ryan <juliaryan3.14@gmail.com> <josephryan3.14@gmail.com>
336+
Jubilee Young <workingjubilee@gmail.com> <46493976+workingjubilee@users.noreply.github.com>
337+
Jubilee Young <workingjubilee@gmail.com> <workingjubilee@gmail.com>
324338
Julian Knodt <julianknodt@gmail.com>
325339
jumbatm <jumbatm@gmail.com> <30644300+jumbatm@users.noreply.github.com>
326340
Junyoung Cho <june0.cho@samsung.com>
341+
Jynn Nelson <github@jyn.dev> <rust@jyn.dev>
327342
Jynn Nelson <github@jyn.dev> <jyn514@gmail.com>
328343
Jynn Nelson <github@jyn.dev> <joshua@yottadb.com>
329344
Jynn Nelson <github@jyn.dev> <jyn.nelson@redjack.com>
@@ -384,12 +399,14 @@ Marcell Pardavi <marcell.pardavi@gmail.com>
384399
Marcus Klaas de Vries <mail@marcusklaas.nl>
385400
Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew>
386401
Mark Mansi <markm@cs.wisc.edu>
402+
Mark Mansi <markm@cs.wisc.edu> <m.mim95@gmail.com>
387403
Mark Rousskov <mark.simulacrum@gmail.com>
388404
Mark Sinclair <mark.edward.x@gmail.com>
389405
Mark Sinclair <mark.edward.x@gmail.com> =Mark Sinclair <=125axel125@gmail.com>
390406
Markus Legner <markus@legner.ch>
391407
Markus Westerlind <marwes91@gmail.com> Markus <marwes91@gmail.com>
392408
Martin Carton <cartonmartin+git@gmail.com>
409+
Martin Carton <cartonmartin+git@gmail.com> <cartonmartin@gmail.com>
393410
Martin Habovštiak <martin.habovstiak@gmail.com>
394411
Martin Hafskjold Thoresen <martinhath@gmail.com>
395412
Martin Nordholts <martin.nordholts@codetale.se> <enselic@gmail.com>
@@ -414,6 +431,7 @@ Melody Horn <melody@boringcactus.com> <mathphreak@gmail.com>
414431
Mendes <pedro.mendes.26@gmail.com>
415432
mental <m3nta1@yahoo.com>
416433
mibac138 <5672750+mibac138@users.noreply.github.com>
434+
Michael Howell <michael@notriddle.com> <notriddle+rust-mod@protonmail.com>
417435
Michael Williams <m.t.williams@live.com>
418436
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
419437
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail.com>
@@ -430,6 +448,7 @@ Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com>
430448
msizanoen1 <qtmlabs@protonmail.com>
431449
Mukilan Thiagarajan <mukilanthiagarajan@gmail.com>
432450
Nadrieril Feneanar <Nadrieril@users.noreply.github.com>
451+
Nadrieril Feneanar <Nadrieril@users.noreply.github.com> <nadrieril+rust@gmail.com>
433452
Nadrieril Feneanar <Nadrieril@users.noreply.github.com> <nadrieril+git@gmail.com>
434453
NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com>
435454
NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm+github@gmail.com>
@@ -446,6 +465,8 @@ Nicholas Bishop <nbishop@nbishop.net> <nicholasbishop@gmail.com>
446465
Nicholas Bishop <nbishop@nbishop.net> <nicholasbishop@google.com>
447466
Nicholas Nethercote <n.nethercote@gmail.com> <nnethercote@apple.com>
448467
Nicholas Nethercote <n.nethercote@gmail.com> <nnethercote@mozilla.com>
468+
Nick Cameron <nrc@ncameron.org> <ncameron@mozilla.com>
469+
Nick Fitzgerald <fitzgen@gmail.com> <nfitzgerald@mozilla.com>
449470
Nick Platt <platt.nicholas@gmail.com>
450471
Niclas Schwarzlose <15schnic@gmail.com>
451472
Nicolas Abram <abramlujan@gmail.com>
@@ -515,6 +536,7 @@ Ricky Hosfelt <ricky@hosfelt.io>
515536
Ritiek Malhotra <ritiekmalhotra123@gmail.com>
516537
Rob Arnold <robarnold@cs.cmu.edu>
517538
Rob Arnold <robarnold@cs.cmu.edu> Rob Arnold <robarnold@68-26-94-7.pools.spcsdns.net>
539+
Robert Collins <robertc@robertcollins.net> <robertc+rust@robertcollins.net>
518540
Robert Foss <dev@robertfoss.se> robertfoss <dev@robertfoss.se>
519541
Robert Gawdzik <rgawdzik@hotmail.com> Robert Gawdzik ☢ <rgawdzik@hotmail.com>
520542
Robert Habermeier <rphmeier@gmail.com>
@@ -553,6 +575,11 @@ Simonas Kazlauskas <git@kazlauskas.me> Simonas Kazlauskas <github@kazlauskas.me>
553575
Simonas Kazlauskas <git@kazlauskas.me> <simonas+t-compiler@kazlauskas.me>
554576
Siva Prasad <sivaauturic@gmail.com>
555577
Smittyvb <me@smitop.com>
578+
Sophia June Turner <547158+sophiajt@users.noreply.github.com>
579+
Sophia June Turner <547158+sophiajt@users.noreply.github.com> <547158+jntrnr@users.noreply.github.com>
580+
Sophia June Turner <547158+sophiajt@users.noreply.github.com> <jonathandturner@users.noreply.github.com>
581+
Sophia June Turner <547158+sophiajt@users.noreply.github.com> <jturner@mozilla.com>
582+
Sophia June Turner <547158+sophiajt@users.noreply.github.com> <jonathan.d.turner@gmail.com>
556583
Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>
557584
Stanislav Tkach <stanislav.tkach@gmail.com>
558585
startling <tdixon51793@gmail.com>
@@ -585,8 +612,10 @@ Tim Diekmann <t.diekmann.3dv@gmail.com>
585612
Tim Hutt <tdhutt@gmail.com>
586613
Tim JIANG <p90eri@gmail.com>
587614
Tim Joseph Dumol <tim@timdumol.com>
615+
Tim Neuman <timnn@google.com> <mail@timnn.me>
588616
Timothy Maloney <tmaloney@pdx.edu>
589617
Tomas Koutsky <tomas@stepnivlk.net>
618+
Tomasz Miąsko <tomasz.miasko@gmail.com>
590619
Torsten Weber <TorstenWeber12@gmail.com>
591620
Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com>
592621
Trevor Gross <tmgross@umich.edu> <t.gross35@gmail.com>
@@ -606,7 +635,7 @@ Valerii Lashmanov <vflashm@gmail.com>
606635
Vitali Haravy <HumaneProgrammer@gmail.com> Vitali Haravy <humaneprogrammer@gmail.com>
607636
Vitaly Shukela <vi0oss@gmail.com>
608637
Waffle Lapkin <waffle.lapkin@gmail.com>
609-
Waffle Lapkin <waffle.lapkin@tasking.com>
638+
Waffle Lapkin <waffle.lapkin@gmail.com> <waffle.lapkin@tasking.com>
610639
Wesley Wiser <wwiser@gmail.com> <wesleywiser@microsoft.com>
611640
whitequark <whitequark@whitequark.org>
612641
William Ting <io@williamting.com> <william.h.ting@gmail.com>

0 commit comments

Comments
 (0)