propagate_self_ty -> self_ty_propagation_kind

Author: aerooneqq

compiler/rustc_ast_lowering/src/delegation.rs

@@ -409,7 +409,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                     child_seg_id: generics.child.args_segment_id,
                     child_seg_id_for_sig: generics.child.segment_id_for_sig(),
                     parent_seg_id_for_sig: generics.parent.segment_id_for_sig(),
-                    propagate_self_ty: generics.propagate_self_ty,
+                    self_ty_propagation_kind: generics.self_ty_propagation_kind,
                     group_id: {
                         let id = match source {
                             DelegationSource::Single => None,
@@ -629,7 +629,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
 
                 // Explicitly create `Self` self-type in case of infers or static
                 // free-to-trait reuses.
-                let ty = match generics.propagate_self_ty {
+                let ty = match generics.self_ty_propagation_kind {
                     Some(hir::DelegationSelfTyPropagationKind::SelfParam) => {
                         let kind = hir::TyKind::Path(
                             DelegationGenericArgsIterator::create_generic_arg_path(
@@ -654,7 +654,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         };
 
         if let Some(hir::DelegationSelfTyPropagationKind::SelfTy(id)) =
-            generics.propagate_self_ty.as_mut()
+            generics.self_ty_propagation_kind.as_mut()
         {
             *id = match new_path {
                 hir::QPath::Resolved(ty, _) => ty,

compiler/rustc_ast_lowering/src/delegation/generics.rs

@@ -86,7 +86,7 @@ impl GenericsGenerationResult<'_> {
 pub(super) struct GenericsGenerationResults<'hir> {
     pub(super) parent: GenericsGenerationResult<'hir>,
     pub(super) child: GenericsGenerationResult<'hir>,
-    pub(super) propagate_self_ty: Option<hir::DelegationSelfTyPropagationKind>,
+    pub(super) self_ty_propagation_kind: Option<hir::DelegationSelfTyPropagationKind>,
 }
 
 #[derive(Debug)]
@@ -357,7 +357,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
             let child = DelegationGenerics::generate_all(sig_params, GenericsPosition::Child, true);
             let child = GenericsGenerationResult::new(child);
 
-            return GenericsGenerationResults { parent, child, propagate_self_ty: None };
+            return GenericsGenerationResults { parent, child, self_ty_propagation_kind: None };
         }
 
         let delegation_in_free_ctx =
@@ -422,7 +422,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         GenericsGenerationResults {
             parent: GenericsGenerationResult::new(parent_generics),
             child: GenericsGenerationResult::new(child_generics),
-            propagate_self_ty: match free_to_trait_delegation {
+            self_ty_propagation_kind: match free_to_trait_delegation {
                 true => Some(match qself_is_none {
                     true => hir::DelegationSelfTyPropagationKind::SelfParam,
                     false => match qself_is_infer {

compiler/rustc_hir/src/hir.rs

@@ -3867,7 +3867,7 @@ pub struct DelegationInfo {
     pub child_seg_id: HirId,
     pub parent_seg_id_for_sig: Option<HirId>,
     pub child_seg_id_for_sig: Option<HirId>,
-    pub propagate_self_ty: Option<DelegationSelfTyPropagationKind>,
+    pub self_ty_propagation_kind: Option<DelegationSelfTyPropagationKind>,
     pub group_id: Option<(LocalExpnId, bool /* unused_target_expr */)>,
 }
 

compiler/rustc_hir_analysis/src/delegation.rs

@@ -83,8 +83,8 @@ fn create_self_position_kind(
         | (FnKind::AssocTrait, FnKind::Free) => SelfPositionKind::Zero,
 
         (FnKind::Free, FnKind::AssocTrait) => {
-            let propagate_self_ty = tcx.hir_delegation_info(delegation_id).propagate_self_ty;
-            SelfPositionKind::AfterLifetimes(propagate_self_ty)
+            let kind = tcx.hir_delegation_info(delegation_id).self_ty_propagation_kind;
+            SelfPositionKind::AfterLifetimes(kind)
         }
 
         _ => SelfPositionKind::None,