Skip to content

Commit b4af35f

Browse files
committed
Auto merge of #29444 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #29264, #29405, #29417, #29435, #29437, #29438 - Failed merges:
2 parents 8ca0acc + 0809eaa commit b4af35f

File tree

8 files changed

+227
-100
lines changed

8 files changed

+227
-100
lines changed

.mailmap

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ Aaron Todd <github@opprobrio.us>
99
Abhishek Chanda <abhishek.becs@gmail.com> Abhishek Chanda <abhishek@cloudscaling.com>
1010
Ahmed Charles <ahmedcharles@gmail.com> <acharles@outlook.com>
1111
Aydin Kim <ladinjin@hanmail.net> aydin.kim <aydin.kim@samsung.com>
12+
Alex Burka <durka42+github@gmail.com> Alex Burka <aburka@seas.upenn.edu>
1213
Alex Lyon <arcterus@mail.com> <Arcterus@mail.com>
1314
Alex Newman <posix4e@gmail.com> Alex HotShot Newman <posix4e@gmail.com>
1415
Alex Rønne Petersen <alex@lycus.org>
16+
Alfie John <alfie@alfie.wtf> Alfie John <alfiej@fastmail.fm>
1517
Andreas Gal <gal@mozilla.com> <andreas.gal@gmail.com>
1618
Andrew Kuchev <0coming.soon@gmail.com> Andrew <0coming.soon@gmail.com>
1719
Andrew Poelstra <asp11@sfu.ca> <apoelstra@wpsoftware.net>
@@ -20,6 +22,7 @@ Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> arielb1 <arielb1@mail.tau.ac.il>
2022
Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> Ariel Ben-Yehuda <ariel.byd@gmail.com>
2123
Austin Seipp <mad.one@gmail.com> <as@hacks.yi.org>
2224
Ben Alpert <ben@benalpert.com> <spicyjalapeno@gmail.com>
25+
Ben Sago <ogham@users.noreply.github.com> Ben S <ogham@bsago.me> Ben S <ogham@users.noreply.github.com>
2326
Benjamin Jackman <ben@jackman.biz>
2427
Björn Steinbrink <bsteinbr@gmail.com> <B.Steinbrink@gmx.de>
2528
blake2-ppc <ulrik.sverdrup@gmail.com> <blake2-ppc>
@@ -29,9 +32,11 @@ Brian Dawn <brian.t.dawn@gmail.com>
2932
Carl-Anton Ingmarsson <mail@carlanton.se> <ca.ingmarsson@gmail.com>
3033
Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <carol.nichols@gmail.com>
3134
Carol Willing <carolcode@willingconsulting.com>
35+
Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com>
3236
Chris Pressey <cpressey@gmail.com>
3337
Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com>
3438
Corey Farwell <coreyf+rust@rwell.org> Corey Farwell <coreyf@rwell.org>
39+
Corey Richardson <corey@octayn.net> Elaine "See More" Nemo <corey@octayn.net>
3540
David Klein <david.klein@baesystemsdetica.com>
3641
David Manescu <david.manescu@gmail.com> <dman2626@uni.sydney.edu.au>
3742
Damien Schoof <damien.schoof@gmail.com>
@@ -51,7 +56,7 @@ Erick Tryzelaar <erick.tryzelaar@gmail.com> <etryzelaar@iqt.org>
5156
Evgeny Sologubov
5257
Falco Hirschenberger <falco.hirschenberger@gmail.com> <hirschen@itwm.fhg.de>
5358
Felix S. Klock II <pnkfelix@pnkfx.org> Felix S Klock II <pnkfelix@pnkfx.org>
54-
Gareth Daniel Smith <garethdanielsmith@gmail.com>
59+
Gareth Daniel Smith <garethdanielsmith@gmail.com> gareth <gareth@gareth-N56VM.(none)>
5560
Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
5661
Graham Fawcett <fawcett@uwindsor.ca> <graham.fawcett@gmail.com>
5762
Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
@@ -99,9 +104,11 @@ Matthew McPherrin <matthew@mcpherrin.ca> <matt@mcpherrin.ca>
99104
Matthijs Hofstra <thiezz@gmail.com>
100105
Michael Williams <m.t.williams@live.com>
101106
Michael Woerister <michaelwoerister@gmail> <michaelwoerister@gmail.com> <michaelwoerister@posteo> Michael Woerister <michaelwoerister@posteo>
107+
Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com>
102108
Neil Pankey <npankey@gmail.com> <neil@wire.im>
103109
Nicholas Mazzuca <npmazzuca@gmail.com> Nicholas <npmazzuca@gmail.com>
104110
Oliver Schneider <github6541940@oli-obk.de> <git1984941651981@oli-obk.de> <git1984941651981@oli-obk.de> Oliver 'ker' Schneider <rust19446194516@oli-obk.de>
111+
Oliver Schneider <github6541940@oli-obk.de> Oliver Schneider <git1984941651981@oli-obk.de> Oliver Schneider <git-spam9815368754983@oli-obk.de> Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
105112
Ožbolt Menegatti <ozbolt.menegatti@gmail.com> gareins <ozbolt.menegatti@gmail.com>
106113
Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com>
107114
Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com>
@@ -116,6 +123,7 @@ Rob Arnold <robarnold@cs.cmu.edu>
116123
Robert Foss <dev@robertfoss.se> robertfoss <dev@robertfoss.se>
117124
Robert Gawdzik <rgawdzik@hotmail.com> Robert Gawdzik ☢ <rgawdzik@hotmail.com>
118125
Robert Millar <robert.millar@cantab.net>
126+
Ruud van Asseldonk <dev@veniogames.com> Ruud van Asseldonk <ruuda@google.com>
119127
Ryan Scheel <ryan.havvy@gmail.com>
120128
Sean Gillespie <sean.william.g@gmail.com> swgillespie <sean.william.g@gmail.com>
121129
Seonghyun Kim <sh8281.kim@samsung.com>
@@ -125,11 +133,14 @@ startling <tdixon51793@gmail.com>
125133
Steven Fackler <sfackler@gmail.com> <sfackler@palantir.com>
126134
Steven Stewart-Gallus <sstewartgallus00@langara.bc.ca> <sstewartgallus00@mylangara.bc.ca>
127135
Tamir Duberstein <tamird@gmail.com> Tamir Duberstein <tamird@squareup.com>
136+
Thiago Pontes <email@thiago.me> thiagopnts <thiagopnts@gmail.com>
128137
Ticki <Ticki@users.noreply.github.com> Ticki <@>
129138
Tim Chevalier <chevalier@alum.wellesley.edu> <catamorphism@gmail.com>
130139
Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com>
131140
Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost>
141+
Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com> bluss <bluss>
132142
Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com>
143+
Vitali Haravy <HumaneProgrammer@gmail.com> Vitali Haravy <humaneprogrammer@gmail.com>
133144
William Ting <io@williamting.com> <william.h.ting@gmail.com>
134145
Xuefeng Wu <benewu@gmail.com> Xuefeng Wu <xfwu@thoughtworks.com> XuefengWu <benewu@gmail.com>
135146
Youngsoo Son <ysson83@gmail.com> <ysoo.son@samsung.com>

0 commit comments

Comments
 (0)