Merge from rust-lang/rust

Author: lnicola

.gitmodules

@@ -22,10 +22,6 @@
 	path = library/stdarch
 	url = https://github.com/rust-lang/stdarch.git
 	shallow = true
-[submodule "src/doc/rustc-dev-guide"]
-	path = src/doc/rustc-dev-guide
-	url = https://github.com/rust-lang/rustc-dev-guide.git
-	shallow = true
 [submodule "src/doc/edition-guide"]
 	path = src/doc/edition-guide
 	url = https://github.com/rust-lang/edition-guide.git

.mailmap

@@ -48,6 +48,7 @@ Andrew Poelstra <[email protected]> <[email protected]>
 Anhad Singh <[email protected]>
 Antoine Plaskowski <[email protected]>
 Anton Löfgren <[email protected]> <[email protected]>
+apiraino <[email protected]> <[email protected]>
 Araam Borhanian <[email protected]>
 Araam Borhanian <[email protected]> <[email protected]>
 Areski Belaid <[email protected]> areski <[email protected]>
@@ -62,7 +63,10 @@ Austin Seipp <[email protected]> <[email protected]>
 Ayaz Hafiz <[email protected]>
 Aydin Kim <[email protected]> aydin.kim <[email protected]>
 Ayush Mishra <[email protected]>
+Ashley Mannix <[email protected]> <[email protected]>
 asrar <[email protected]>
+b-naber <[email protected]>
+b-naber <[email protected]> <[email protected]>
 BaoshanPang <[email protected]>
 Barosl Lee <[email protected]> Barosl LEE <[email protected]>
 Bastian Kersting <[email protected]>
@@ -84,7 +88,8 @@ boolean_coercion <[email protected]>
 Boris Egorov <[email protected]> <[email protected]>
 bors <[email protected]> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
 bors <[email protected]> bors[bot] <bors[bot]@users.noreply.github.com>
-Boxy <[email protected]> <[email protected]>
+BoxyUwU <[email protected]>
+BoxyUwU <[email protected]> <[email protected]>
 Braden Nelson <[email protected]>
 Brandon Sanderson <[email protected]> Brandon Sanderson <[email protected]>
 Brett Cannon <[email protected]> Brett Cannon <[email protected]>
@@ -98,6 +103,8 @@ Caleb Cartwright <[email protected]>
 Caleb Jones <[email protected]>
 Noah Lev <[email protected]>
 Noah Lev <[email protected]> <[email protected]>
+Catherine <[email protected]>
+Catherine <[email protected]> <[email protected]>
 cameron1024 <[email protected]>
 Camille Gillot <[email protected]>
 Carl-Anton Ingmarsson <[email protected]> <[email protected]>
@@ -133,11 +140,13 @@ Clement Miao <[email protected]>
 Clément Renault <[email protected]>
 Cliff Dyer <[email protected]>
 Clinton Ryan <[email protected]>
+Taylor Cramer <[email protected]> <[email protected]>
 ember arlynx <[email protected]> <[email protected]>
 Crazycolorz5 <[email protected]>
 csmoe <[email protected]>
 Cyryl Płotnicki <[email protected]>
 Damien Schoof <[email protected]>
+Dan Gohman <[email protected]> <[email protected]>
 Dan Robertson <[email protected]>
 Daniel Campoverde <[email protected]>
 Daniel J Rollins <[email protected]>
@@ -179,10 +188,17 @@ Eduardo Bautista <[email protected]> <=>
 Eduardo Bautista <[email protected]> <[email protected]>
 Eduardo Broto <[email protected]>
 Edward Shen <[email protected]> <[email protected]>
+Jacob Finkelman <[email protected]>
+Jacob Finkelman <[email protected]> <[email protected]>
+Jacob Finkelman <[email protected]> <[email protected]>
+Jacob Finkelman <[email protected]> <[email protected]>
+Jacob Finkelman <[email protected]> <[email protected]>
 Elliott Slaughter <[email protected]> <[email protected]>
 Elly Fong-Jones <[email protected]>
 Eric Holk <[email protected]> <[email protected]>
 Eric Holk <[email protected]> <[email protected]>
+Eric Holk <[email protected]> <[email protected]>
+Eric Holk <[email protected]> <[email protected]>
 Eric Holmes <[email protected]>
 Eric Reed <[email protected]> <[email protected]>
 Erick Tryzelaar <[email protected]> <[email protected]>
@@ -206,6 +222,7 @@ Felix S. Klock II <[email protected]> <[email protected]>
 Félix Saparelli <[email protected]>
 Flaper Fesp <[email protected]>
 Florian Berger <[email protected]>
+Florian Gilcher <[email protected]> <[email protected]>
 Florian Wilkens <[email protected]> Florian Wilkens <[email protected]>
 François Mockers <[email protected]>
 Frank Steffahn <[email protected]> <[email protected]>
@@ -240,6 +257,8 @@ Herman J. Radtke III <[email protected]> Herman J. Radtke III <hermanradtk
 Hirochika Matsumoto <[email protected]> <[email protected]>
 Hrvoje Nikšić <[email protected]>
 Hsiang-Cheng Yang <[email protected]>
+Huon Wilson <[email protected]>
+Huon Wilson <[email protected]> <[email protected]>
 Ian Jackson <[email protected]> <[email protected]>
 Ian Jackson <[email protected]> <[email protected]>
 Ian Jackson <[email protected]> <[email protected]>
@@ -252,9 +271,13 @@ ivan tkachenko <[email protected]>
 J. J. Weber <[email protected]>
 Jack Huey <[email protected]> <[email protected]>
 Jacob <[email protected]>
+Jacob Hoffman-Andrews <[email protected]> <[email protected]>
 Jacob Greenfield <[email protected]>
 Jacob Pratt <[email protected]> <[email protected]>
 Jacob Pratt <[email protected]> <[email protected]>
+Jake Goulding <[email protected]>
+Jake Goulding <[email protected]> <[email protected]> 
+Jake Goulding <[email protected]> <[email protected]>
 Jake Vossen <[email protected]>
 Jakob Degen <[email protected]> <[email protected]>
 Jakob Lautrup Nysom <[email protected]>
@@ -287,6 +310,7 @@ Jerry Hardee <[email protected]>
 Jesús Rubio <[email protected]>
 Jethro Beekman <[email protected]>
 Jian Zeng <[email protected]>
+Jieyou Xu <[email protected]>
 Jieyou Xu <[email protected]> <[email protected]>
 Jihyun Yu <[email protected]> <[email protected]>
 Jihyun Yu <[email protected]> jihyun <[email protected]>
@@ -322,9 +346,12 @@ Josh Holmer <[email protected]>
 Josh Stone <[email protected]> <[email protected]>
 Josh Stone <[email protected]> <[email protected]>
 Julia Ryan <[email protected]> <[email protected]>
+Jubilee Young <[email protected]> <[email protected]>
+Jubilee Young <[email protected]>
 Julian Knodt <[email protected]>
 jumbatm <[email protected]> <[email protected]>
 Junyoung Cho <[email protected]>
+Jynn Nelson <[email protected]> <[email protected]>
 Jynn Nelson <[email protected]> <[email protected]>
 Jynn Nelson <[email protected]> <[email protected]>
 Jynn Nelson <[email protected]> <[email protected]>
@@ -385,12 +412,14 @@ Marcell Pardavi <[email protected]>
 Marcus Klaas de Vries <[email protected]>
 Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
 Mark Mansi <[email protected]>
+Mark Mansi <[email protected]> <[email protected]>
 Mark Rousskov <[email protected]>
 Mark Sinclair <[email protected]>
 Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
 Markus Legner <[email protected]>
 Markus Westerlind <[email protected]> Markus <[email protected]>
 Martin Carton <[email protected]>
+Martin Carton <[email protected]> <[email protected]>
 Martin Habovštiak <[email protected]>
 Martin Hafskjold Thoresen <[email protected]>
 Martin Nordholts <[email protected]> <[email protected]>
@@ -415,6 +444,7 @@ Melody Horn <[email protected]> <[email protected]>
 Mendes <[email protected]>
 mental <[email protected]>
 mibac138 <[email protected]>
+Michael Howell <[email protected]> <[email protected]>
 Michael Williams <[email protected]>
 Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
 Michael Woerister <michaelwoerister@posteo> <[email protected]>
@@ -431,6 +461,7 @@ Ms2ger <[email protected]> <[email protected]>
 msizanoen1 <[email protected]>
 Mukilan Thiagarajan <[email protected]>
 Nadrieril Feneanar <[email protected]>
+Nadrieril Feneanar <[email protected]> <[email protected]>
 Nadrieril Feneanar <[email protected]> <[email protected]>
 NAKASHIMA, Makoto <[email protected]> <[email protected]>
 NAKASHIMA, Makoto <[email protected]> <[email protected]>
@@ -447,15 +478,23 @@ Nicholas Bishop <[email protected]> <[email protected]>
 Nicholas Bishop <[email protected]> <[email protected]>
 Nicholas Nethercote <[email protected]> <[email protected]>
 Nicholas Nethercote <[email protected]> <[email protected]>
+Nick Cameron <[email protected]> <[email protected]>
+Nick Fitzgerald <[email protected]> <[email protected]>
 Nick Platt <[email protected]>
 Niclas Schwarzlose <[email protected]>
 Nicolas Abram <[email protected]>
 Nicole Mazzuca <[email protected]>
+Niko Matsakis <[email protected]>
+Niko Matsakis <[email protected]> <[email protected]>
+Noratrieb <[email protected]>
 Noratrieb <[email protected]> <[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]>
+Nikita Popov <[email protected]>
+Nikita Popov <[email protected]> <[email protected]>
 NODA Kai <[email protected]>
 Oğuz Ağcayazı <[email protected]> <[email protected]>
 Oğuz Ağcayazı <[email protected]> <[email protected]>
@@ -516,6 +555,7 @@ Ricky Hosfelt <[email protected]>
 Ritiek Malhotra <[email protected]>
 Rob Arnold <[email protected]>
 Rob Arnold <[email protected]> Rob Arnold <[email protected]>
+Robert Collins <[email protected]> <[email protected]>
 Robert Foss <[email protected]> robertfoss <[email protected]>
 Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
 Robert Habermeier <[email protected]>
@@ -553,7 +593,15 @@ Simon Sapin <[email protected]> <[email protected]>
 Simonas Kazlauskas <[email protected]> Simonas Kazlauskas <[email protected]>
 Simonas Kazlauskas <[email protected]> <[email protected]>
 Siva Prasad <[email protected]>
+Skgland <[email protected]>
+Skgland <[email protected]> <[email protected]>
+Skgland <[email protected]> <[email protected]>
 Smittyvb <[email protected]>
+Sophia June Turner <[email protected]>
+Sophia June Turner <[email protected]> <[email protected]>
+Sophia June Turner <[email protected]> <[email protected]>
+Sophia June Turner <[email protected]> <[email protected]>
+Sophia June Turner <[email protected]> <[email protected]>
 Srinivas Reddy Thatiparthy <[email protected]>
 Stanislav Tkach <[email protected]>
 startling <[email protected]>
@@ -586,8 +634,10 @@ Tim Diekmann <[email protected]>
 Tim Hutt <[email protected]>
 Tim JIANG <[email protected]>
 Tim Joseph Dumol <[email protected]>
+Tim Neumann <[email protected]> <[email protected]>
 Timothy Maloney <[email protected]>
 Tomas Koutsky <[email protected]>
+Tomasz Miąsko <[email protected]>
 Torsten Weber <[email protected]>
 Torsten Weber <[email protected]> <[email protected]>
 Trevor Gross <[email protected]> <[email protected]>
@@ -607,7 +657,9 @@ Valerii Lashmanov <[email protected]>
 Vitali Haravy <[email protected]> Vitali Haravy <[email protected]>
 Vitaly Shukela <[email protected]>
 Waffle Lapkin <[email protected]>
-Waffle Lapkin <[email protected]>
+Waffle Lapkin <[email protected]> <[email protected]>
+Weihang Lo <[email protected]>
+Weihang Lo <[email protected]> <[email protected]>
 Wesley Wiser <[email protected]> <[email protected]>
 whitequark <[email protected]>
 William Ting <[email protected]> <[email protected]>