Merge from rustc

Author: The Miri Cronjob Bot

.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]>
@@ -98,6 +102,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 +139,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 +187,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 +221,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 +256,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 +270,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 +309,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 +345,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 +411,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 +443,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 +460,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 +477,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 +554,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 +592,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 +633,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 +656,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]>

compiler/rustc_abi/src/lib.rs

@@ -8,6 +8,38 @@
 #![warn(unreachable_pub)]
 // tidy-alphabetical-end
 
+/*! ABI handling for rustc
+
+## What is an "ABI"?
+
+Literally, "application binary interface", which means it is everything about how code interacts,
+at the machine level, with other code. This means it technically covers all of the following:
+- object binary format for e.g. relocations or offset tables
+- in-memory layout of types
+- procedure calling conventions
+
+When we discuss "ABI" in the context of rustc, we are probably discussing calling conventions.
+To describe those `rustc_abi` also covers type layout, as it must for values passed on the stack.
+Despite `rustc_abi` being about calling conventions, it is good to remember these usages exist.
+You will encounter all of them and more if you study target-specific codegen enough!
+Even in general conversation, when someone says "the Rust ABI is unstable", it may allude to
+either or both of
+- `repr(Rust)` types have a mostly-unspecified layout
+- `extern "Rust" fn(A) -> R` has an unspecified calling convention
+
+## Crate Goal
+
+ABI is a foundational concept, so the `rustc_abi` crate serves as an equally foundational crate.
+It cannot carry all details relevant to an ABI: those permeate code generation and linkage.
+Instead, `rustc_abi` is intended to provide the interface for reasoning about the binary interface.
+It should contain traits and types that other crates then use in their implementation.
+For example, a platform's `extern "C" fn` calling convention will be implemented in `rustc_target`
+but `rustc_abi` contains the types for calculating layout and describing register-passing.
+This makes it easier to describe things in the same way across targets, codegen backends, and
+even other Rust compilers, such as rust-analyzer!
+
+*/
+
 use std::fmt;
 #[cfg(feature = "nightly")]
 use std::iter::Step;

compiler/rustc_ast/src/ast.rs

@@ -241,15 +241,15 @@ impl AngleBracketedArg {
     }
 }
 
-impl Into<P<GenericArgs>> for AngleBracketedArgs {
-    fn into(self) -> P<GenericArgs> {
-        P(GenericArgs::AngleBracketed(self))
+impl From<AngleBracketedArgs> for P<GenericArgs> {
+    fn from(val: AngleBracketedArgs) -> Self {
+        P(GenericArgs::AngleBracketed(val))
     }
 }
 
-impl Into<P<GenericArgs>> for ParenthesizedArgs {
-    fn into(self) -> P<GenericArgs> {
-        P(GenericArgs::Parenthesized(self))
+impl From<ParenthesizedArgs> for P<GenericArgs> {
+    fn from(val: ParenthesizedArgs) -> Self {
+        P(GenericArgs::Parenthesized(val))
     }
 }
 

compiler/rustc_ast/src/expand/autodiff_attrs.rs

@@ -6,7 +6,6 @@
 use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 
-use crate::expand::typetree::TypeTree;
 use crate::expand::{Decodable, Encodable, HashStable_Generic};
 use crate::ptr::P;
 use crate::{Ty, TyKind};
@@ -79,10 +78,6 @@ pub struct AutoDiffItem {
     /// The name of the function being generated
     pub target: String,
     pub attrs: AutoDiffAttrs,
-    /// Describe the memory layout of input types
-    pub inputs: Vec<TypeTree>,
-    /// Describe the memory layout of the output type
-    pub output: TypeTree,
 }
 #[derive(Clone, Eq, PartialEq, Encodable, Decodable, Debug, HashStable_Generic)]
 pub struct AutoDiffAttrs {
@@ -262,22 +257,14 @@ impl AutoDiffAttrs {
         !matches!(self.mode, DiffMode::Error | DiffMode::Source)
     }
 
-    pub fn into_item(
-        self,
-        source: String,
-        target: String,
-        inputs: Vec<TypeTree>,
-        output: TypeTree,
-    ) -> AutoDiffItem {
-        AutoDiffItem { source, target, inputs, output, attrs: self }
+    pub fn into_item(self, source: String, target: String) -> AutoDiffItem {
+        AutoDiffItem { source, target, attrs: self }
     }
 }
 
 impl fmt::Display for AutoDiffItem {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Differentiating {} -> {}", self.source, self.target)?;
-        write!(f, " with attributes: {:?}", self.attrs)?;
-        write!(f, " with inputs: {:?}", self.inputs)?;
-        write!(f, " with output: {:?}", self.output)
+        write!(f, " with attributes: {:?}", self.attrs)
     }
 }

compiler/rustc_ast/src/format.rs

@@ -4,6 +4,7 @@ use rustc_span::{Ident, Span, Symbol};
 
 use crate::Expr;
 use crate::ptr::P;
+use crate::token::LitKind;
 
 // Definitions:
 //
@@ -45,6 +46,10 @@ pub struct FormatArgs {
     pub span: Span,
     pub template: Vec<FormatArgsPiece>,
     pub arguments: FormatArguments,
+    /// The raw, un-split format string literal, with no escaping or processing.
+    ///
+    /// Generally only useful for lints that care about the raw bytes the user wrote.
+    pub uncooked_fmt_str: (LitKind, Symbol),
 }
 
 /// A piece of a format template string.

compiler/rustc_ast/src/mut_visit.rs

@@ -1596,7 +1596,7 @@ fn walk_inline_asm_sym<T: MutVisitor>(
 
 fn walk_format_args<T: MutVisitor>(vis: &mut T, fmt: &mut FormatArgs) {
     // FIXME: visit the template exhaustively.
-    let FormatArgs { span, template: _, arguments } = fmt;
+    let FormatArgs { span, template: _, arguments, uncooked_fmt_str: _ } = fmt;
     for FormatArgument { kind, expr } in arguments.all_args_mut() {
         match kind {
             FormatArgumentKind::Named(ident) | FormatArgumentKind::Captured(ident) => {

compiler/rustc_ast/src/ptr.rs

@@ -158,9 +158,9 @@ impl<T> From<Vec<T>> for P<[T]> {
     }
 }
 
-impl<T> Into<Vec<T>> for P<[T]> {
-    fn into(self) -> Vec<T> {
-        self.into_vec()
+impl<T> From<P<[T]>> for Vec<T> {
+    fn from(val: P<[T]>) -> Self {
+        val.into_vec()
     }
 }
 

compiler/rustc_ast/src/visit.rs

@@ -1061,7 +1061,7 @@ pub fn walk_inline_asm_sym<'a, V: Visitor<'a>>(
 }
 
 pub fn walk_format_args<'a, V: Visitor<'a>>(visitor: &mut V, fmt: &'a FormatArgs) -> V::Result {
-    let FormatArgs { span: _, template: _, arguments } = fmt;
+    let FormatArgs { span: _, template: _, arguments, uncooked_fmt_str: _ } = fmt;
     for FormatArgument { kind, expr } in arguments.all_args() {
         match kind {
             FormatArgumentKind::Named(ident) | FormatArgumentKind::Captured(ident) => {

compiler/rustc_ast_lowering/src/lib.rs

@@ -1845,11 +1845,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             GenericParamKind::Lifetime => {
                 // AST resolution emitted an error on those parameters, so we lower them using
                 // `ParamName::Error`.
+                let ident = self.lower_ident(param.ident);
                 let param_name =
                     if let Some(LifetimeRes::Error) = self.resolver.get_lifetime_res(param.id) {
-                        ParamName::Error
+                        ParamName::Error(ident)
                     } else {
-                        let ident = self.lower_ident(param.ident);
                         ParamName::Plain(ident)
                     };
                 let kind =