visit_shared_ty_const to visit_infer

Author: BoxyUwU

compiler/rustc_ast_lowering/src/index.rs

@@ -300,7 +300,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
         });
     }
 
-    fn visit_shared_ty_const(
+    fn visit_infer(
         &mut self,
         inf_id: HirId,
         inf_span: Span,

compiler/rustc_hir/src/intravisit.rs

@@ -361,12 +361,7 @@ pub trait Visitor<'v>: Sized {
     }
 
     #[allow(unused_variables)]
-    fn visit_shared_ty_const(
-        &mut self,
-        inf_id: HirId,
-        inf_span: Span,
-        kind: InferKind<'v>,
-    ) -> Self::Result {
+    fn visit_infer(&mut self, inf_id: HirId, inf_span: Span, kind: InferKind<'v>) -> Self::Result {
         self.visit_id(inf_id)
     }
 
@@ -894,9 +889,7 @@ pub fn walk_generic_arg<'v, V: Visitor<'v>>(
         GenericArg::Lifetime(lt) => visitor.visit_lifetime(lt),
         GenericArg::Type(ty) => visitor.visit_ty(ty),
         GenericArg::Const(ct) => visitor.visit_const_arg(ct),
-        GenericArg::Infer(inf) => {
-            visitor.visit_shared_ty_const(inf.hir_id, inf.span, InferKind::Ambig(inf))
-        }
+        GenericArg::Infer(inf) => visitor.visit_infer(inf.hir_id, inf.span, InferKind::Ambig(inf)),
     }
 }
 
@@ -905,7 +898,7 @@ pub fn walk_unambig_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) ->
         Some(ambig_ty) => visitor.visit_ty(ambig_ty),
         None => {
             try_visit!(visitor.visit_id(typ.hir_id));
-            visitor.visit_shared_ty_const(typ.hir_id, typ.span, InferKind::Ty(typ))
+            visitor.visit_infer(typ.hir_id, typ.span, InferKind::Ty(typ))
         }
     }
 }
@@ -969,11 +962,7 @@ pub fn walk_const_arg<'v, V: Visitor<'v>>(
         Some(ambig_ct) => visitor.visit_const_arg(ambig_ct),
         None => {
             try_visit!(visitor.visit_id(const_arg.hir_id));
-            visitor.visit_shared_ty_const(
-                const_arg.hir_id,
-                const_arg.span(),
-                InferKind::Const(const_arg),
-            )
+            visitor.visit_infer(const_arg.hir_id, const_arg.span(), InferKind::Const(const_arg))
         }
     }
 }

compiler/rustc_hir_analysis/src/collect.rs

@@ -139,7 +139,7 @@ pub(crate) struct HirPlaceholderCollector {
 }
 
 impl<'v> Visitor<'v> for HirPlaceholderCollector {
-    fn visit_shared_ty_const(
+    fn visit_infer(
         &mut self,
         _inf_id: HirId,
         inf_span: Span,

compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

@@ -490,7 +490,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                     impl<'v> Visitor<'v> for FindInferInClosureWithBinder {
                         type Result = ControlFlow<Span>;
 
-                        fn visit_shared_ty_const(
+                        fn visit_infer(
                             &mut self,
                             _inf_id: HirId,
                             inf_span: Span,

compiler/rustc_hir_typeck/src/fallback.rs

@@ -641,7 +641,7 @@ impl<'tcx> AnnotateUnitFallbackVisitor<'_, 'tcx> {
 impl<'tcx> Visitor<'tcx> for AnnotateUnitFallbackVisitor<'_, 'tcx> {
     type Result = ControlFlow<errors::SuggestAnnotation>;
 
-    fn visit_shared_ty_const(
+    fn visit_infer(
         &mut self,
         inf_id: HirId,
         inf_span: Span,

compiler/rustc_hir_typeck/src/writeback.rs

@@ -351,7 +351,7 @@ impl<'cx, 'tcx> Visitor<'tcx> for WritebackCx<'cx, 'tcx> {
         }
     }
 
-    fn visit_shared_ty_const(
+    fn visit_infer(
         &mut self,
         inf_id: HirId,
         inf_span: Span,

compiler/rustc_privacy/src/lib.rs

@@ -1106,7 +1106,7 @@ impl<'tcx> Visitor<'tcx> for TypePrivacyVisitor<'tcx> {
         intravisit::walk_ty(self, hir_ty);
     }
 
-    fn visit_shared_ty_const(
+    fn visit_infer(
         &mut self,
         inf_id: rustc_hir::HirId,
         inf_span: Span,

src/librustdoc/visit_ast.rs

@@ -598,7 +598,7 @@ impl<'tcx> Visitor<'tcx> for RustdocVisitor<'_, 'tcx> {
         // Unneeded.
     }
 
-    fn visit_shared_ty_const(
+    fn visit_infer(
         &mut self,
         _inf_id: hir::HirId,
         _inf_span: Span,

src/tools/clippy/clippy_lints/src/box_default.rs

@@ -92,7 +92,7 @@ fn is_local_vec_expn(cx: &LateContext<'_>, expr: &Expr<'_>, ref_expr: &Expr<'_>)
 struct InferVisitor(bool);
 
 impl Visitor<'_> for InferVisitor {
-    fn visit_shared_ty_const(&mut self, inf_id: HirId, _inf_span: Span, _kind: InferKind<'_>) -> Self::Result {
+    fn visit_infer(&mut self, inf_id: HirId, _inf_span: Span, _kind: InferKind<'_>) -> Self::Result {
         self.0 = true;
         self.visit_id(inf_id);
     }

src/tools/clippy/clippy_lints/src/dereference.rs

@@ -889,7 +889,7 @@ impl TyCoercionStability {
 fn ty_contains_infer(ty: &hir::Ty<'_>) -> bool {
     struct V(bool);
     impl Visitor<'_> for V {
-        fn visit_shared_ty_const(&mut self, inf_id: HirId, _inf_span: Span, kind: InferKind<'_>) -> Self::Result {
+        fn visit_infer(&mut self, inf_id: HirId, _inf_span: Span, kind: InferKind<'_>) -> Self::Result {
             if let InferKind::Ty(_) | InferKind::Ambig(_) = kind {
                 self.0 = true;
             }