Convert some Into impls into From impls

compiler/rustc_ast/src/ast.rs

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

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]> {
+impl<T> From<P<[T]>> for Vec<T> {
-    fn into(self) -> Vec<T> {
+    fn from(val: P<[T]>) -> Self {
-        self.into_vec()
+        val.into_vec()
     }
 }
 

compiler/rustc_error_messages/src/lib.rs

@@ -357,9 +357,9 @@ impl From<Cow<'static, str>> for DiagMessage {
 /// subdiagnostic derive refers to typed identifiers that are `DiagMessage`s, so need to be
 /// able to convert between these, as much as they'll be converted back into `DiagMessage`
 /// using `with_subdiagnostic_message` eventually. Don't use this other than for the derive.
-impl Into<SubdiagMessage> for DiagMessage {
+impl From<DiagMessage> for SubdiagMessage {
-    fn into(self) -> SubdiagMessage {
+    fn from(val: DiagMessage) -> Self {
-        match self {
+        match val {
             DiagMessage::Str(s) => SubdiagMessage::Str(s),
             DiagMessage::Translated(s) => SubdiagMessage::Translated(s),
             DiagMessage::FluentIdentifier(id, None) => SubdiagMessage::FluentIdentifier(id),

compiler/rustc_errors/src/diagnostic.rs

@@ -156,9 +156,9 @@ impl IntoDiagArg for DiagArgValue {
     }
 }
 
-impl Into<FluentValue<'static>> for DiagArgValue {
+impl From<DiagArgValue> for FluentValue<'static> {
-    fn into(self) -> FluentValue<'static> {
+    fn from(val: DiagArgValue) -> Self {
-        match self {
+        match val {
             DiagArgValue::Str(s) => From::from(s),
             DiagArgValue::Number(n) => From::from(n),
             DiagArgValue::StrListSepByAnd(l) => fluent_value_from_str_list_sep_by_and(l),

compiler/rustc_hir/src/hir.rs

@@ -4072,33 +4072,33 @@ impl<'hir> OwnerNode<'hir> {
     }
 }
 
-impl<'hir> Into<OwnerNode<'hir>> for &'hir Item<'hir> {
+impl<'hir> From<&'hir Item<'hir>> for OwnerNode<'hir> {
-    fn into(self) -> OwnerNode<'hir> {
+    fn from(val: &'hir Item<'hir>) -> Self {
-        OwnerNode::Item(self)
+        OwnerNode::Item(val)
     }
 }
 
-impl<'hir> Into<OwnerNode<'hir>> for &'hir ForeignItem<'hir> {
+impl<'hir> From<&'hir ForeignItem<'hir>> for OwnerNode<'hir> {
-    fn into(self) -> OwnerNode<'hir> {
+    fn from(val: &'hir ForeignItem<'hir>) -> Self {
-        OwnerNode::ForeignItem(self)
+        OwnerNode::ForeignItem(val)
     }
 }
 
-impl<'hir> Into<OwnerNode<'hir>> for &'hir ImplItem<'hir> {
+impl<'hir> From<&'hir ImplItem<'hir>> for OwnerNode<'hir> {
-    fn into(self) -> OwnerNode<'hir> {
+    fn from(val: &'hir ImplItem<'hir>) -> Self {
-        OwnerNode::ImplItem(self)
+        OwnerNode::ImplItem(val)
     }
 }
 
-impl<'hir> Into<OwnerNode<'hir>> for &'hir TraitItem<'hir> {
+impl<'hir> From<&'hir TraitItem<'hir>> for OwnerNode<'hir> {
-    fn into(self) -> OwnerNode<'hir> {
+    fn from(val: &'hir TraitItem<'hir>) -> Self {
-        OwnerNode::TraitItem(self)
+        OwnerNode::TraitItem(val)
     }
 }
 
-impl<'hir> Into<Node<'hir>> for OwnerNode<'hir> {
+impl<'hir> From<OwnerNode<'hir>> for Node<'hir> {
-    fn into(self) -> Node<'hir> {
+    fn from(val: OwnerNode<'hir>) -> Self {
-        match self {
+        match val {
             OwnerNode::Item(n) => Node::Item(n),
             OwnerNode::ForeignItem(n) => Node::ForeignItem(n),
             OwnerNode::ImplItem(n) => Node::ImplItem(n),

compiler/rustc_metadata/src/rmeta/mod.rs

@@ -303,9 +303,9 @@ pub(crate) struct RawDefId {
     index: u32,
 }
 
-impl Into<RawDefId> for DefId {
+impl From<DefId> for RawDefId {
-    fn into(self) -> RawDefId {
+    fn from(val: DefId) -> Self {
-        RawDefId { krate: self.krate.as_u32(), index: self.index.as_u32() }
+        RawDefId { krate: val.krate.as_u32(), index: val.index.as_u32() }
     }
 }
 

compiler/rustc_middle/src/mir/interpret/error.rs

@@ -88,10 +88,10 @@ impl ReportedErrorInfo {
     }
 }
 
-impl Into<ErrorGuaranteed> for ReportedErrorInfo {
+impl From<ReportedErrorInfo> for ErrorGuaranteed {
     #[inline]
-    fn into(self) -> ErrorGuaranteed {
+    fn from(val: ReportedErrorInfo) -> Self {
-        self.error
+        val.error
     }
 }
 

compiler/rustc_middle/src/ty/adt.rs

@@ -249,9 +249,9 @@ pub enum AdtKind {
     Enum,
 }
 
-impl Into<DataTypeKind> for AdtKind {
+impl From<AdtKind> for DataTypeKind {
-    fn into(self) -> DataTypeKind {
+    fn from(val: AdtKind) -> Self {
-        match self {
+        match val {
             AdtKind::Struct => DataTypeKind::Struct,
             AdtKind::Union => DataTypeKind::Union,
             AdtKind::Enum => DataTypeKind::Enum,

compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs

@@ -45,12 +45,12 @@ pub enum TypeAnnotationNeeded {
     E0284,
 }
 
-impl Into<ErrCode> for TypeAnnotationNeeded {
+impl From<TypeAnnotationNeeded> for ErrCode {
-    fn into(self) -> ErrCode {
+    fn from(val: TypeAnnotationNeeded) -> Self {
-        match self {
+        match val {
-            Self::E0282 => E0282,
+            TypeAnnotationNeeded::E0282 => E0282,
-            Self::E0283 => E0283,
+            TypeAnnotationNeeded::E0283 => E0283,
-            Self::E0284 => E0284,
+            TypeAnnotationNeeded::E0284 => E0284,
         }
     }
 }