Merge ref 'd3e1ccdf40ae' from rust-lang/rust

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

Upstream ref: d3e1ccd
Filtered ref: de0859194683d26da60d5d81db7f1f2a143b591d
Upstream diff: cc328c1...d3e1ccd

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

Author: The rustc-josh-sync Cronjob Bot

.mailmap

@@ -448,9 +448,10 @@ Martin Habovštiak <martin.habovstiak@gmail.com>
 Martin Hafskjold Thoresen <martinhath@gmail.com>
 Martin Nordholts <martin.nordholts@codetale.se> <enselic@gmail.com>
 Matej Lach <matej.lach@gmail.com> Matej Ľach <matej.lach@gmail.com>
-Mateusz Mikuła <mati865@gmail.com>
-Mateusz Mikuła <mati865@gmail.com> <mati865@users.noreply.github.com>
-Mateusz Mikuła <mati865@gmail.com> <matti@marinelayer.io>
+Mateusz Mikuła <oss@mateuszmikula.dev>
+Mateusz Mikuła <oss@mateuszmikula.dev> <mati865@gmail.com>
+Mateusz Mikuła <oss@mateuszmikula.dev> <mati865@users.noreply.github.com>
+Mateusz Mikuła <oss@mateuszmikula.dev> <matti@marinelayer.io>
 Matt Brubeck <mbrubeck@limpet.net> <mbrubeck@cs.hmc.edu>
 Matthew Auld <matthew.auld@intel.com>
 Matthew Jasper <mjjasper1@gmail.com>
@@ -596,7 +597,7 @@ Rui <xiongmao86dev@sina.com>
 Russell Johnston <rpjohnst@gmail.com>
 Rustin-Liu <rustin.liu@gmail.com>
 Rusty Blitzerr <rusty.blitzerr@gmail.com>
-RustyYato <krishna.sd.2012@gmail.com>
+RustyYato <rustyyato@gmail.com>
 Ruud van Asseldonk <dev@veniogames.com> Ruud van Asseldonk <ruuda@google.com>
 Ryan Leung <rleungx@gmail.com>
 Ryan Levick <me@ryanlevick.com> <rylev@users.noreply.github.com>