Skip to content

Commit 738e30e

Browse files
committed
Merge pull request rust-lang#30174 from brson/authors
Update AUTHORS.txt and .mailmap for 1.5
2 parents b716bc9 + 8c603c8 commit 738e30e

File tree

2 files changed

+255
-16
lines changed

2 files changed

+255
-16
lines changed

.mailmap

Lines changed: 85 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,65 @@
55
# email addresses.
66
#
77

8+
# NB: Completely bogus names are just mapped to bors
9+
bors <bors@rust-lang.org> root <root@localhost>
10+
bors <bors@rust-lang.org> unknown <Eric@.(none)>
11+
bors <bors@rust-lang.org> unknown <Mozilla@.(none)>
12+
bors <bors@rust-lang.org> asdf <asdf@debian.localdomain>
813
Aaron Todd <github@opprobrio.us>
914
Abhishek Chanda <abhishek.becs@gmail.com> Abhishek Chanda <abhishek@cloudscaling.com>
15+
Adrien Tétar <adri-from-59@hotmail.fr> adridu59 <adri-from-59@hotmail.fr>
1016
Ahmed Charles <ahmedcharles@gmail.com> <acharles@outlook.com>
1117
Aydin Kim <ladinjin@hanmail.net> aydin.kim <aydin.kim@samsung.com>
18+
Alex Burka <durka42+github@gmail.com> Alex Burka <aburka@seas.upenn.edu>
1219
Alex Lyon <arcterus@mail.com> <Arcterus@mail.com>
1320
Alex Newman <posix4e@gmail.com> Alex HotShot Newman <posix4e@gmail.com>
1421
Alex Rønne Petersen <alex@lycus.org>
22+
Alexander Light <allight@cs.brown.edu> Alexander Light <scialexlight@gmail.com>
23+
Alexis Beingessner <a.beingessner@gmail.com> Alexis <a.beingessner@gmail.com>
24+
Alfie John <alfiej@fastmail.fm> Alfie John <alfie@alfie.wtf>
1525
Andreas Gal <gal@mozilla.com> <andreas.gal@gmail.com>
1626
Andrew Kuchev <0coming.soon@gmail.com> Andrew <0coming.soon@gmail.com>
1727
Andrew Poelstra <asp11@sfu.ca> <apoelstra@wpsoftware.net>
28+
Angus Lees <gus@inodes.org> Angus Lees <gus@debian.org>
1829
Anton Löfgren <anton.lofgren@gmail.com> <alofgren@op5.com>
30+
Areski Belaid <areski@gmail.com> areski <areski@gmail.com>
1931
Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> arielb1 <arielb1@mail.tau.ac.il>
2032
Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> Ariel Ben-Yehuda <ariel.byd@gmail.com>
2133
Austin Seipp <mad.one@gmail.com> <as@hacks.yi.org>
34+
Barosl LEE <github@barosl.com> Barosl Lee <vcs@barosl.com>
2235
Ben Alpert <ben@benalpert.com> <spicyjalapeno@gmail.com>
36+
Ben S <ogham@users.noreply.github.com> Ben S <ogham@bsago.me>
2337
Benjamin Jackman <ben@jackman.biz>
38+
Bheesham Persaud <bheesham123@hotmail.com> Bheesham Persaud <bheesham.persaud@live.ca>
2439
Björn Steinbrink <bsteinbr@gmail.com> <B.Steinbrink@gmx.de>
40+
Brandon Sanderson <singingboyo@gmail.com> <singingboyo@hotmail.com>
2541
blake2-ppc <ulrik.sverdrup@gmail.com> <blake2-ppc>
42+
bluss <bluss@users.noreply.github.com> bluss <bluss>
2643
Boris Egorov <jightuse@gmail.com> <egorov@linux.com>
44+
Brett Cannon <brett@python.org> <brettcannon@users.noreply.github.com>
2745
Brian Anderson <banderson@mozilla.com> <andersrb@gmail.com>
2846
Brian Dawn <brian.t.dawn@gmail.com>
47+
Brian Leibig <brian@brianleibig.com> <brian.leibig@gmail.com>
2948
Carl-Anton Ingmarsson <mail@carlanton.se> <ca.ingmarsson@gmail.com>
3049
Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <carol.nichols@gmail.com>
50+
Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <cnichols@thinkthroughmath.com>
3151
Carol Willing <carolcode@willingconsulting.com>
52+
chitra <bogus> chitra <chitra@chitra-HP-Pavilion-g6-Notebook-PC.(none)>
53+
Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com>
3254
Chris Pressey <cpressey@gmail.com>
55+
Chris Thorn <chris@thorn.co> Chris Thorn <thorn@thoughtbot.com>
3356
Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com>
3457
Corey Farwell <coreyf+rust@rwell.org> Corey Farwell <coreyf@rwell.org>
58+
Corey Richardson <corey@octayn.net> Elaine "See More" Nemo <corey@octayn.net>
59+
Daniel Ramos <dan@daramos.com>
3560
David Klein <david.klein@baesystemsdetica.com>
3661
David Manescu <david.manescu@gmail.com> <dman2626@uni.sydney.edu.au>
3762
Damien Schoof <damien.schoof@gmail.com>
3863
Derek Chiang <derekchiang93@gmail.com> Derek Chiang (Enchi Jiang) <derekchiang93@gmail.com>
3964
Diggory Hardy <diggory.hardy@gmail.com> Diggory Hardy <github@dhardy.name>
4065
Dylan Braithwaite <dylanbraithwaite1@gmail.com> <mail@dylanb.me>
66+
Dzmitry Malyshau <kvarkus@gmail.com>
4167
Eduardo Bautista <me@eduardobautista.com> <mail@eduardobautista.com>
4268
Eduardo Bautista <me@eduardobautista.com> <=>
4369
Elliott Slaughter <elliottslaughter@gmail.com> <eslaughter@mozilla.com>
@@ -48,44 +74,60 @@ Eric Holk <eric.holk@gmail.com> <eholk@cs.indiana.edu>
4874
Eric Holmes <eric@ejholmes.net>
4975
Eric Reed <ecreed@cs.washington.edu> <ereed@mozilla.com>
5076
Erick Tryzelaar <erick.tryzelaar@gmail.com> <etryzelaar@iqt.org>
51-
Evgeny Sologubov
77+
Evgeny Sologubov <bogus> Evgeny Sologubov <C:\Self\AppData\Mail>
5278
Falco Hirschenberger <falco.hirschenberger@gmail.com> <hirschen@itwm.fhg.de>
5379
Felix S. Klock II <pnkfelix@pnkfx.org> Felix S Klock II <pnkfelix@pnkfx.org>
80+
Flavio Percoco <flaper87@gmail.com> Flaper Fesp <flaper87@gmail.com>
81+
Flavio Percoco <flaper87@gmail.com> Flavio Percoco Premoli <flaper87@gmail.com>
82+
Florian Wilkens <mrfloya_github@outlook.com> Florian Wilkens <floya@live.de>
5483
Gareth Daniel Smith <garethdanielsmith@gmail.com>
5584
Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
5685
Graham Fawcett <fawcett@uwindsor.ca> <graham.fawcett@gmail.com>
5786
Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
87+
Graydon Hoare <graydon@pobox.com> unknown <graydon@4632428-PC.(none)>
88+
Guillaume Gomez <guillaume1.gomez@gmail.com> GuillaumeGomez <guillaume1.gomez@gmail.com>
5889
Heather <heather@cynede.net> <Heather@cynede.net>
5990
Heather <heather@cynede.net> <Cynede@Gentoo.org>
91+
Herman J. Radtke III <herman@hermanradtke.com> Herman J. Radtke III <hermanradtke@gmail.com>
6092
Ilyong Cho <ilyoan@gmail.com>
6193
J. J. Weber <jjweber@gmail.com>
6294
Jakub Bukaj <jakub@jakub.cc>
6395
Jakub Bukaj <jakub@jakub.cc> <jakubw@jakubw.net>
96+
Jakub Bukaj <jakub@jakub.cc> Jakub Bukaj <jakub.bukaj@yahoo.com>
6497
James Deng <cnjamesdeng@gmail.com> <cnJamesDeng@gmail.com>
98+
Jason Fager <jfager@gmail.com> jfager <jfager@gmail.com>
6599
James Miller <bladeon@gmail.com> <james@aatch.net>
66100
Jason Orendorff <jorendorff@mozilla.com> <jason@mozmac-2.local>
67101
Jason Orendorff <jorendorff@mozilla.com> <jason.orendorff@gmail.com>
102+
Jason Toffaletti <toffaletti@gmail.com> Jason Toffaletti <jason@topsy.com>
103+
Jauhien Piatlicki <jauhien@gentoo.org> Jauhien Piatlicki <jpiatlicki@zertisa.com>
68104
Jeremy Letang <letang.jeremy@gmail.com>
69105
Jihyun Yu <jihyun@nclab.kaist.ac.kr> jihyun <jihyun@nablecomm.com>
70106
Jihyun Yu <jihyun@nclab.kaist.ac.kr> <yjh0502@gmail.com>
71-
Johann Hofmann <mail@johann-hofmann.com> Johann <git@johann-hofmann.com> Johann Hofmann <git@johann-hofmann.com>
107+
Jihyun Yu <jihyun@nclab.kaist.ac.kr> Jihyun Yu <j.yu@navercorp.com>
108+
Johann Hofmann <mail@johann-hofmann.com> Johann <git@johann-hofmann.com>
109+
Johann Hofmann <mail@johann-hofmann.com> Johann Hofmann <git@johann-hofmann.com>
72110
John Clements <clements@racket-lang.org> <clements@brinckerhoff.org>
73111
John Hodge <acessdev@gmail.com> John Hodge <tpg@mutabah.net>
74112
Jorge Aparicio <japaric@linux.com> <japaricious@gmail.com>
75113
Jonathan Bailey <jbailey@mozilla.com> <jbailey@jbailey-20809.local>
114+
Jonathan S <gereeter@gmail.com> Jonathan S <gereeter+code@gmail.com>
115+
Jose Narvaez <jnarvaez@zendesk.com> Jose Narvaez <goyox86@gmail.com>
76116
Junyoung Cho <june0.cho@samsung.com>
77117
Jyun-Yan You <jyyou.tw@gmail.com> <jyyou@cs.nctu.edu.tw>
78118
Kang Seonghoon <kang.seonghoon@mearie.org> <public+git@mearie.org>
79-
Keegan McAllister <kmcallister@mozilla.com> <mcallister.keegan@gmail.com>
119+
Keegan McAllister <mcallister.keegan@gmail.com> <kmcallister@mozilla.com>
80120
Kyeongwoon Lee <kyeongwoon.lee@samsung.com>
81121
Lee Wondong <wdlee91@gmail.com>
82122
Lee Jeffery <leejeffery@gmail.com> Lee Jeffery <lee@leejeffery.co.uk>
83123
Lennart Kudling <github@kudling.de>
124+
Leo Testard <leo.testard@gmail.com>
84125
Lindsey Kuper <lindsey@composition.al> <lindsey@rockstargirl.org>
85126
Lindsey Kuper <lindsey@composition.al> <lkuper@mozilla.com>
86127
Luqman Aden <me@luqman.ca> <laden@mozilla.com>
87128
Luqman Aden <me@luqman.ca> <laden@csclub.uwaterloo.ca>
88129
Luke Metz <luke.metz@students.olin.edu>
130+
Makoto Nakashima <makoto.nksm+github@gmail.com>
89131
Makoto Nakashima <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com>
90132
Makoto Nakashima <makoto.nksm+github@gmail.com> gifnksm <makoto.nksm+github@gmail.com>
91133
Markus Westerlind <marwes91@gmail.com> Markus <marwes91@gmail.com>
@@ -98,40 +140,77 @@ Matthew Auld <matthew.auld@intel.com>
98140
Matthew McPherrin <matthew@mcpherrin.ca> <matt@mcpherrin.ca>
99141
Matthijs Hofstra <thiezz@gmail.com>
100142
Michael Williams <m.t.williams@live.com>
101-
Michael Woerister <michaelwoerister@gmail> <michaelwoerister@gmail.com> <michaelwoerister@posteo> Michael Woerister <michaelwoerister@posteo>
143+
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@posteo.net>
144+
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail.com>
145+
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
146+
Mickaël Raybaud-Roig <raybaudroigm@gmail.com>
147+
Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com>
148+
Mukilan Thiagarajan <mukilanthiagarajan@gmail.com> Mukilan Thiyagarajan <mukilanthiagarajan@gmail.com>
102149
Neil Pankey <npankey@gmail.com> <neil@wire.im>
150+
Nathan Wilson <wilnathan@gmail.com>
151+
Nathaniel Herman <nherman@post.harvard.edu> Nathaniel Herman <nherman@college.harvard.edu>
103152
Nicholas Mazzuca <npmazzuca@gmail.com> Nicholas <npmazzuca@gmail.com>
104-
Oliver Schneider <github6541940@oli-obk.de> <git1984941651981@oli-obk.de> <git1984941651981@oli-obk.de> Oliver 'ker' Schneider <rust19446194516@oli-obk.de>
153+
Nif Ward <nif.ward@gmail.com>
154+
Oliver Schneider <oliver.schneider@kit.edu> <github6541940@oli-obk.de>
155+
Oliver Schneider <oliver.schneider@kit.edu> <git1984941651981@oli-obk.de>
156+
Oliver Schneider <oliver.schneider@kit.edu> <git1984941651981@oli-obk.de>
157+
Oliver Schneider <oliver.schneider@kit.edu> Oliver 'ker' Schneider <rust19446194516@oli-obk.de>
158+
Oliver Schneider <oliver.schneider@kit.edu> oli-obk <github6541940@oli-obk.de>
159+
Oliver Schneider <oliver.schneider@kit.edu> Oliver 'ker' Schneider <rust19446194516@oli-obk.de>
160+
Oliver Schneider <oliver.schneider@kit.edu> <git1984941651981@oli-obk.de>
161+
Oliver Schneider <oliver.schneider@kit.edu> <github333195615777966@oli-obk.de>
162+
Oliver Schneider <oliver.schneider@kit.edu> <github6541940@oli-obk.de>
163+
Oliver Schneider <oliver.schneider@kit.edu> <git-spam9815368754983@oli-obk.de>
164+
Oliver Schneider <oliver.schneider@kit.edu> <git-spam-no-reply9815368754983@oli-obk.de>
105165
Ožbolt Menegatti <ozbolt.menegatti@gmail.com> gareins <ozbolt.menegatti@gmail.com>
106166
Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com>
107167
Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com>
108168
Peter Elmers <peter.elmers@yahoo.com> <peter.elmers@rice.edu>
169+
Peter Zotov <whitequark@whitequark.org>
170+
Phil Dawes <phil@phildawes.net> <pdawes@drw.com>
109171
Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com>
110172
Philipp Brüschweiler <blei42@gmail.com> <bruphili@student.ethz.ch>
111173
Pradeep Kumar <gohanpra@gmail.com>
112174
Przemysław Wesołek <jest@go.art.pl> Przemek Wesołek <jest@go.art.pl>
113175
Ralph Giles <giles@thaumas.net> Ralph Giles <giles@mozilla.com>
176+
Rafael Ávila de Espíndola <respindola@mozilla.com> Rafael Avila de Espindola <espindola@dream.(none)>
114177
Richard Diamond <wichard@vitalitystudios.com> <wichard@hahbee.co>
115178
Rob Arnold <robarnold@cs.cmu.edu>
179+
Rob Arnold <robarnold@cs.cmu.edu> <robarnold@68-26-94-7.pools.spcsdns.net>
116180
Robert Foss <dev@robertfoss.se> robertfoss <dev@robertfoss.se>
117181
Robert Gawdzik <rgawdzik@hotmail.com> Robert Gawdzik ☢ <rgawdzik@hotmail.com>
118182
Robert Millar <robert.millar@cantab.net>
183+
Rohit Joshi <rohitjoshi@users.noreply.github.com> <rohit.joshi@capitalone.com>
184+
Russell Johnston <rpjohnst@gmail.com>
185+
Ruud van Asseldonk <dev@veniogames.com> Ruud van Asseldonk <ruuda@google.com>
119186
Ryan Scheel <ryan.havvy@gmail.com>
187+
Scott Olson <scott@solson.me> Scott Olson <scott@scott-olson.org>
120188
Sean Gillespie <sean.william.g@gmail.com> swgillespie <sean.william.g@gmail.com>
121189
Seonghyun Kim <sh8281.kim@samsung.com>
190+
Simonas Kazlauskas <git@kazlauskas.me> <github@kazlauskas.me>
122191
Simon Barber-Dueck <sbarberdueck@gmail.com> Simon BD <simon@server>
123192
Simon Sapin <simon@exyr.org> <simon.sapin@exyr.org>
124193
startling <tdixon51793@gmail.com>
194+
Stepan Koltsov <stepan.koltsov@gmail.com> <nga@yandex-team.ru>
125195
Steven Fackler <sfackler@gmail.com> <sfackler@palantir.com>
126196
Steven Stewart-Gallus <sstewartgallus00@langara.bc.ca> <sstewartgallus00@mylangara.bc.ca>
197+
Stuart Pernsteiner <stuart@pernsteiner.org> <spernsteiner@mozilla.com>
127198
Tamir Duberstein <tamird@gmail.com> Tamir Duberstein <tamird@squareup.com>
199+
Tero Hänninen <tejohann@kapsi.fi> <lgvz@users.noreply.github.com>
200+
Theo Belaire <theo.belaire@gmail.com> <tyr.god.of.war.42@gmail.com>
128201
Ticki <Ticki@users.noreply.github.com> Ticki <@>
202+
Tim Brooks <brooks@cern.ch> <tim.brooks@staples.com>
129203
Tim Chevalier <chevalier@alum.wellesley.edu> <catamorphism@gmail.com>
130204
Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com>
205+
Ty Overby <ty@pre-alpha.com> TyOverby <ty@pre-alpha.com>
206+
U-NOV2010\eugals <bogus> U-NOV2010\eugals <C:\Self\AppData\Mail>
131207
Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost>
132-
Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com>
208+
Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
209+
Vitali Haravy <HumaneProgrammer@gmail.com> <humaneprogrammer@gmail.com>
133210
William Ting <io@williamting.com> <william.h.ting@gmail.com>
134211
Xuefeng Wu <benewu@gmail.com> Xuefeng Wu <xfwu@thoughtworks.com> XuefengWu <benewu@gmail.com>
135212
Youngsoo Son <ysson83@gmail.com> <ysoo.son@samsung.com>
136213
Zack Corr <zack@z0w0.me> <zackcorr95@gmail.com>
214+
Zach Pomerantz <zmp@umich.edu>
137215
Zack Slayton <zack.slayton@gmail.com>
216+
Zbigniew Siciarz <zbigniew@siciarz.net> <antyqjon@gmail.com>

0 commit comments

Comments
 (0)