Review: move create_generic_arg_path to LoweringContext

Author: aerooneqq

compiler/rustc_ast_lowering/src/delegation.rs

@@ -55,9 +55,7 @@ use rustc_span::def_id::{DefId, LocalDefId};
 use rustc_span::symbol::kw;
 use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol};
 
-use crate::delegation::generics::{
-    DelegationGenericArgsIterator, GenericsGenerationResult, GenericsGenerationResults,
-};
+use crate::delegation::generics::{GenericsGenerationResult, GenericsGenerationResults};
 use crate::diagnostics::{
     CycleInDelegationSignatureResolution, DelegationAttemptedBlockWithDefsDeletion,
     DelegationBlockSpecifiedWhenNoParams, UnresolvedDelegationCallee,
@@ -631,12 +629,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 // free-to-trait reuses.
                 let ty = match generics.self_ty_propagation_kind {
                     Some(hir::DelegationSelfTyPropagationKind::SelfParam) => {
-                        let kind = hir::TyKind::Path(
-                            DelegationGenericArgsIterator::create_generic_arg_path(
-                                self,
-                                generics.parent.generics.find_self_param(),
-                            ),
-                        );
+                        let self_param = generics.parent.generics.find_self_param();
+                        let path = self.create_generic_arg_path(self_param);
+                        let kind = hir::TyKind::Path(path);
 
                         let ty = match ty {
                             Some(ty) => hir::Ty { kind, ..ty.clone() },

compiler/rustc_ast_lowering/src/delegation/generics.rs

@@ -127,12 +127,12 @@ impl<'hir> DelegationGenericArgsIterator<'hir> {
             hir::GenericParamKind::Type { .. } => hir::GenericArg::Type(ctx.arena.alloc(hir::Ty {
                 hir_id,
                 span: p.span,
-                kind: hir::TyKind::Path(Self::create_generic_arg_path(ctx, &p)),
+                kind: hir::TyKind::Path(ctx.create_generic_arg_path(&p)),
             })),
             hir::GenericParamKind::Const { .. } => {
                 hir::GenericArg::Const(ctx.arena.alloc(hir::ConstArg {
                     hir_id,
-                    kind: hir::ConstArgKind::Path(Self::create_generic_arg_path(ctx, &p)),
+                    kind: hir::ConstArgKind::Path(ctx.create_generic_arg_path(&p)),
                     span: p.span,
                 }))
             }
@@ -150,35 +150,6 @@ impl<'hir> DelegationGenericArgsIterator<'hir> {
 
         args
     }
-
-    pub(super) fn create_generic_arg_path(
-        ctx: &mut LoweringContext<'_, 'hir>,
-        p: &hir::GenericParam<'hir>,
-    ) -> hir::QPath<'hir> {
-        let res = Res::Def(
-            match p.kind {
-                hir::GenericParamKind::Lifetime { .. } => DefKind::LifetimeParam,
-                hir::GenericParamKind::Type { .. } => DefKind::TyParam,
-                hir::GenericParamKind::Const { .. } => DefKind::ConstParam,
-            },
-            p.def_id.to_def_id(),
-        );
-
-        hir::QPath::Resolved(
-            None,
-            ctx.arena.alloc(hir::Path {
-                segments: ctx.arena.alloc_slice(&[hir::PathSegment {
-                    args: None,
-                    hir_id: ctx.next_id(),
-                    ident: p.name.ident(),
-                    infer_args: false,
-                    res,
-                }]),
-                res,
-                span: p.span,
-            }),
-        )
-    }
 }
 
 impl<'hir> HirOrTyGenerics<'hir> {
@@ -596,4 +567,33 @@ impl<'hir> LoweringContext<'_, 'hir> {
             )),
         }
     }
+
+    pub(super) fn create_generic_arg_path(
+        &mut self,
+        p: &hir::GenericParam<'hir>,
+    ) -> hir::QPath<'hir> {
+        let res = Res::Def(
+            match p.kind {
+                hir::GenericParamKind::Lifetime { .. } => DefKind::LifetimeParam,
+                hir::GenericParamKind::Type { .. } => DefKind::TyParam,
+                hir::GenericParamKind::Const { .. } => DefKind::ConstParam,
+            },
+            p.def_id.to_def_id(),
+        );
+
+        hir::QPath::Resolved(
+            None,
+            self.arena.alloc(hir::Path {
+                segments: self.arena.alloc_slice(&[hir::PathSegment {
+                    args: None,
+                    hir_id: self.next_id(),
+                    ident: p.name.ident(),
+                    infer_args: false,
+                    res,
+                }]),
+                res,
+                span: p.span,
+            }),
+        )
+    }
 }