Merge ref '6159a44067eb' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 6159a44
Filtered ref: 6ab1e12842abe4da734757701b2f17970e11f6b9
Upstream diff: c5dabe8...6159a44

This merge was created using https://github.com/rust-lang/josh-sync.

Author: lnicola

.github/workflows/post-merge.yml

@@ -6,7 +6,7 @@ name: Post merge analysis
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   analysis:

.gitignore

@@ -48,7 +48,7 @@ no_llvm_build
 /llvm/
 /mingw-build/
 /build
-/build-rust-analyzer/
+/build-rust-analyzer
 /dist/
 /unicode-downloads
 /target

.mailmap

@@ -9,7 +9,7 @@ Aaron Todd <[email protected]>
 Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>
 Abhijeet Bhagat <[email protected]>
 Abroskin Alexander <[email protected]>
-Adolfo Ochagavía <[email protected]>
+Adolfo Ochagavía <[email protected]> <[email protected]>
 Adrian Heine né Lang <[email protected]>
 Adrien Tétar <[email protected]>
 Ahmed Charles <[email protected]> <[email protected]>
@@ -36,6 +36,7 @@ Amanda Stjerna <[email protected]> <[email protected]>
 Amanda Stjerna <[email protected]> <[email protected]>
 Amanieu d'Antras <[email protected]> <[email protected]>
 Amos Onn <[email protected]>
+Amos Wenger <[email protected]> <[email protected]>
 Ana-Maria Mihalache <[email protected]>
 Anatoly Ikorsky <[email protected]>
 Andre Bogus <[email protected]>
@@ -138,7 +139,6 @@ Christian Poveda <[email protected]> <[email protected].
 Christian Poveda <[email protected]> <[email protected]>
 Christian Vallentin <[email protected]>
 Christoffer Buchholz <[email protected]>
-Christopher Durham <[email protected]>
 Clark Gaebel <[email protected]> <[email protected]>
 Clement Miao <[email protected]>
 Clément Renault <[email protected]>
@@ -147,6 +147,7 @@ Clinton Ryan <[email protected]>
 Taylor Cramer <[email protected]> <[email protected]>
 ember arlynx <[email protected]> <[email protected]>
 Crazycolorz5 <[email protected]>
+Crystal Durham <[email protected]>
 csmoe <[email protected]>
 Cyryl Płotnicki <[email protected]>
 Damien Schoof <[email protected]>
@@ -276,7 +277,8 @@ Irina Popa <[email protected]>
 Ivan Ivaschenko <[email protected]>
 ivan tkachenko <[email protected]>
 J. J. Weber <[email protected]>
-Jack Huey <[email protected]> <[email protected]>
+Jack Huey <[email protected]> <[email protected]>
+Jack Huey <[email protected]> <[email protected]>
 Jacob <[email protected]>
 Jacob Hoffman-Andrews <[email protected]> <[email protected]>
 Jacob Greenfield <[email protected]>
@@ -292,6 +294,8 @@ Jakub Adam Wieczorek <[email protected]>
 Jakub Adam Wieczorek <[email protected]> <[email protected]>
 Jakub Adam Wieczorek <[email protected]> <[email protected]>
 Jakub Adam Wieczorek <[email protected]> <[email protected]>
+Jakub Adam Wieczorek <[email protected]> <[email protected]>
+Jakub Adam Wieczorek <[email protected]> <[email protected]>
 Jakub Beránek <[email protected]> <[email protected]>
 James [Undefined] <[email protected]>
 James Deng <[email protected]> <[email protected]>
@@ -303,6 +307,7 @@ Jamie Hill-Daniel <[email protected]> <[email protected]>
 Jana Dönszelmann <[email protected]>
 Jana Dönszelmann <[email protected]> <[email protected]>
 Jana Dönszelmann <[email protected]> <[email protected]>
+Jane Lusby <[email protected]> <[email protected]>
 Jan-Erik Rediger <[email protected]> <[email protected]>
 Jaro Fietz <[email protected]>
 Jason Fager <[email protected]>
@@ -313,6 +318,7 @@ Jason Toffaletti <[email protected]> Jason Toffaletti <[email protected]>
 Jauhien Piatlicki <[email protected]> Jauhien Piatlicki <[email protected]>
 Jay True <[email protected]>
 Jeremy Letang <[email protected]>
+Jeremy Soller <[email protected]> <[email protected]>
 Jeremy Sorensen <[email protected]>
 Jeremy Stucki <[email protected]> <[email protected]>
 Jeremy Stucki <[email protected]> <[email protected]>
@@ -336,6 +342,7 @@ John Kåre Alsaker <[email protected]>
 John Kåre Alsaker <[email protected]> <[email protected]>
 John Talling <[email protected]>
 John Van Enk <[email protected]>
+Jon Gjengset <[email protected]> <[email protected]>
 Jonas Tepe <[email protected]>
 Jonathan Bailey <[email protected]> <[email protected]>
 Jonathan Chan Kwan Yin <[email protected]>
@@ -424,7 +431,7 @@ Malo Jaffré <[email protected]>
 Manish Goregaokar <[email protected]>
 Mara Bos <[email protected]>
 Marcell Pardavi <[email protected]>
-Marco Ieni <[email protected]>
+Marco Ieni <[email protected]> <[email protected]>
 Marcus Klaas de Vries <[email protected]>
 Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
 Marijn Schouten <[email protected]> <[email protected]>
@@ -441,9 +448,10 @@ Martin Habovštiak <[email protected]>
 Martin Hafskjold Thoresen <[email protected]>
 Martin Nordholts <[email protected]> <[email protected]>
 Matej Lach <[email protected]> Matej Ľach <[email protected]>
-Mateusz Mikuła <[email protected]>
-Mateusz Mikuła <[email protected]> <[email protected]>
-Mateusz Mikuła <[email protected]> <[email protected]>
+Mateusz Mikuła <[email protected]>
+Mateusz Mikuła <[email protected]> <[email protected]>
+Mateusz Mikuła <[email protected]> <[email protected]>
+Mateusz Mikuła <[email protected]> <[email protected]>
 Matt Brubeck <[email protected]> <[email protected]>
 Matthew Auld <[email protected]>
 Matthew Jasper <[email protected]>
@@ -531,6 +539,7 @@ Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]>
+Onur Özkan <[email protected]> <[email protected]>
 Onur Özkan <[email protected]> <[email protected]>
 Onur Özkan <[email protected]>
 Ömer Sinan Ağacan <[email protected]>
@@ -588,9 +597,10 @@ Rui <[email protected]>
 Russell Johnston <[email protected]>
 Rustin-Liu <[email protected]>
 Rusty Blitzerr <[email protected]>
-RustyYato <krishna.sd.2012@gmail.com>
+RustyYato <rustyyato@gmail.com>
 Ruud van Asseldonk <[email protected]> Ruud van Asseldonk <[email protected]>
 Ryan Leung <[email protected]>
+Ryan Levick <[email protected]> <[email protected]>
 Ryan Scheel <[email protected]>
 Ryan Sullivant <[email protected]>
 Ryan Wiedemann <[email protected]>
@@ -686,6 +696,8 @@ Weihang Lo <[email protected]>
 Weihang Lo <[email protected]> <[email protected]>
 Wesley Wiser <[email protected]> <[email protected]>
 whitequark <[email protected]>
+Will Crichton <[email protected]> <[email protected]>
+Will Crichton <[email protected]> <[email protected]>
 William Ting <[email protected]> <[email protected]>
 Wim Looman <[email protected]> <[email protected]>
 Wim Looman <[email protected]> <[email protected]>
@@ -695,6 +707,8 @@ Xinye Tao <[email protected]>
 Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
 Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
 York Xiang <[email protected]>
+Yoshua Wuyts <[email protected]> <[email protected]>
+Yoshua Wuyts <[email protected]> <[email protected]>
 Yotam Ofek <[email protected]> <[email protected]>
 Youngsoo Son <[email protected]> <[email protected]>
 Youngsuk Kim <[email protected]>