flip walk_x_ty function names

Author: BoxyUwU

compiler/rustc_ast_lowering/src/index.rs

@@ -284,7 +284,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
         self.insert(ty.span, ty.hir_id, Node::Ty(ty.as_unambig_ty()));
 
         self.with_parent(ty.hir_id, |this| {
-            intravisit::walk_ambig_ty(this, ty);
+            intravisit::walk_ty(this, ty);
         });
     }
 

compiler/rustc_hir/src/hir.rs

@@ -2963,7 +2963,7 @@ impl<'hir> Ty<'hir> {
                     self.0.push(t.span);
                     return;
                 }
-                crate::intravisit::walk_ambig_ty(self, t);
+                crate::intravisit::walk_ty(self, t);
             }
         }
 

compiler/rustc_hir/src/intravisit.rs

@@ -354,7 +354,7 @@ pub trait Visitor<'v>: Sized {
     }
 
     fn visit_ty(&mut self, t: &'v Ty<'v, AmbigArg>) -> Self::Result {
-        walk_ambig_ty(self, t)
+        walk_ty(self, t)
     }
     fn visit_const_arg(&mut self, c: &'v ConstArg<'v, AmbigArg>) -> Self::Result {
         walk_ambig_const_arg(self, c)
@@ -496,7 +496,7 @@ pub trait Visitor<'v>: Sized {
 
 pub trait VisitorExt<'v>: Visitor<'v> {
     fn visit_unambig_ty(&mut self, t: &'v Ty<'v>) -> Self::Result {
-        walk_ty(self, t)
+        walk_unambig_ty(self, t)
     }
     fn visit_unambig_const_arg(&mut self, c: &'v ConstArg<'v>) -> Self::Result {
         walk_const_arg(self, c)
@@ -900,7 +900,7 @@ pub fn walk_generic_arg<'v, V: Visitor<'v>>(
     }
 }
 
-pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) -> V::Result {
+pub fn walk_unambig_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) -> V::Result {
     if let TyKind::Infer(()) = typ.kind {
         try_visit!(visitor.visit_id(typ.hir_id));
         return visitor.visit_shared_ty_const(typ.hir_id, typ.span, InferKind::Ty(typ));
@@ -909,7 +909,7 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) -> V::Resul
     visitor.visit_ty(typ.as_ambig_ty())
 }
 
-pub fn walk_ambig_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v, AmbigArg>) -> V::Result {
+pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v, AmbigArg>) -> V::Result {
     try_visit!(visitor.visit_id(typ.hir_id));
 
     match typ.kind {

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

@@ -1617,7 +1617,7 @@ fn compare_synthetic_generics<'tcx>(
                             {
                                 ControlFlow::Break(ty.span)
                             } else {
-                                intravisit::walk_ambig_ty(self, ty)
+                                intravisit::walk_ty(self, ty)
                             }
                         }
                     }

compiler/rustc_hir_analysis/src/check/wfcheck.rs

@@ -2208,7 +2208,7 @@ impl<'tcx> Visitor<'tcx> for CollectUsageSpans<'_> {
                 return;
             }
         }
-        intravisit::walk_ambig_ty(self, t);
+        intravisit::walk_ty(self, t);
     }
 }
 

compiler/rustc_hir_analysis/src/collect/generics_of.rs

@@ -466,17 +466,17 @@ fn has_late_bound_regions<'tcx>(tcx: TyCtxt<'tcx>, node: Node<'tcx>) -> Option<S
             match ty.kind {
                 hir::TyKind::BareFn(..) => {
                     self.outer_index.shift_in(1);
-                    let res = intravisit::walk_ambig_ty(self, ty);
+                    let res = intravisit::walk_ty(self, ty);
                     self.outer_index.shift_out(1);
                     res
                 }
                 hir::TyKind::UnsafeBinder(_) => {
                     self.outer_index.shift_in(1);
-                    let res = intravisit::walk_ambig_ty(self, ty);
+                    let res = intravisit::walk_ty(self, ty);
                     self.outer_index.shift_out(1);
                     res
                 }
-                _ => intravisit::walk_ambig_ty(self, ty),
+                _ => intravisit::walk_ty(self, ty),
             }
         }
 

compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

@@ -779,7 +779,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                 self.with(scope, |this| {
                     // a bare fn has no bounds, so everything
                     // contained within is scoped within its binder.
-                    intravisit::walk_ambig_ty(this, ty);
+                    intravisit::walk_ty(this, ty);
                 });
             }
             hir::TyKind::UnsafeBinder(binder) => {
@@ -809,7 +809,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                 self.with(scope, |this| {
                     // a bare fn has no bounds, so everything
                     // contained within is scoped within its binder.
-                    intravisit::walk_ambig_ty(this, ty);
+                    intravisit::walk_ty(this, ty);
                 });
             }
             hir::TyKind::TraitObject(bounds, lifetime) => {
@@ -870,7 +870,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                     })
                 });
             }
-            _ => intravisit::walk_ambig_ty(self, ty),
+            _ => intravisit::walk_ty(self, ty),
         }
     }
 
@@ -2484,7 +2484,7 @@ fn is_late_bound_map(
                 }
 
                 _ => {
-                    intravisit::walk_ambig_ty(self, ty);
+                    intravisit::walk_ty(self, ty);
                 }
             }
         }

compiler/rustc_hir_analysis/src/collect/type_of.rs

@@ -528,7 +528,7 @@ pub(crate) fn type_alias_is_lazy<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) ->
             if let hir::TyKind::OpaqueDef(..) = t.kind {
                 ControlFlow::Break(())
             } else {
-                hir::intravisit::walk_ambig_ty(self, t)
+                hir::intravisit::walk_ty(self, t)
             }
         }
     }

compiler/rustc_hir_analysis/src/hir_wf_check.rs

@@ -106,7 +106,7 @@ fn diagnostic_hir_wf_check<'tcx>(
             }
 
             self.depth += 1;
-            intravisit::walk_ambig_ty(self, ty);
+            intravisit::walk_ty(self, ty);
             self.depth -= 1;
         }
     }

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

@@ -475,7 +475,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 {
                     self.clauses.extend(clauses.iter().cloned());
                 }
-                intravisit::walk_ambig_ty(self, ty)
+                intravisit::walk_ty(self, ty)
             }
         }