Inline visit_spanned into visit and use the latter everywhere

Author: oli-obk

compiler/rustc_ty_utils/src/opaque_types.rs

@@ -11,6 +11,7 @@ use rustc_trait_selection::traits::check_args_compatible;
 use std::ops::ControlFlow;
 
 use crate::errors::{DuplicateArg, NotParam};
+use crate::sig_types::SpannedTypeVisitor;
 
 struct OpaqueTypeCollector<'tcx> {
     tcx: TyCtxt<'tcx>,
@@ -35,13 +36,6 @@ impl<'tcx> OpaqueTypeCollector<'tcx> {
         })
     }
 
-    fn visit_spanned(&mut self, span: Span, value: impl TypeVisitable<TyCtxt<'tcx>>) {
-        let old = self.span;
-        self.span = Some(span);
-        value.visit_with(self);
-        self.span = old;
-    }
-
     fn parent_trait_ref(&self) -> Option<ty::TraitRef<'tcx>> {
         let parent = self.parent()?;
         if matches!(self.tcx.def_kind(parent), DefKind::Impl { .. }) {
@@ -162,7 +156,7 @@ impl<'tcx> OpaqueTypeCollector<'tcx> {
                     .instantiate_identity_iter_copied()
                 {
                     trace!(?pred);
-                    self.visit_spanned(span, pred);
+                    self.visit(span, pred);
                 }
             }
             Err(NotUniqueParam::NotParam(arg)) => {
@@ -183,10 +177,13 @@ impl<'tcx> OpaqueTypeCollector<'tcx> {
     }
 }
 
-impl<'tcx> super::sig_types::SpannedTypeVisitor<'tcx> for OpaqueTypeCollector<'tcx> {
+impl<'tcx> SpannedTypeVisitor<'tcx> for OpaqueTypeCollector<'tcx> {
     #[instrument(skip(self), ret, level = "trace")]
     fn visit(&mut self, span: Span, value: impl TypeVisitable<TyCtxt<'tcx>>) -> ControlFlow<!> {
-        self.visit_spanned(span, value);
+        let old = self.span;
+        self.span = Some(span);
+        value.visit_with(self);
+        self.span = old;
         ControlFlow::Continue(())
     }
 }
@@ -265,7 +262,7 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for OpaqueTypeCollector<'tcx> {
                         // would have to walk all generic parameters of an Adt, which can quickly
                         // degenerate into looking at an exponential number of types.
                         let ty = self.tcx.type_of(field.did).instantiate_identity();
-                        self.visit_spanned(self.tcx.def_span(field.did), ty);
+                        self.visit(self.tcx.def_span(field.did), ty);
                     }
                 }
             }
@@ -277,7 +274,7 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for OpaqueTypeCollector<'tcx> {
 
 struct ImplTraitInAssocTypeCollector<'tcx>(OpaqueTypeCollector<'tcx>);
 
-impl<'tcx> super::sig_types::SpannedTypeVisitor<'tcx> for ImplTraitInAssocTypeCollector<'tcx> {
+impl<'tcx> SpannedTypeVisitor<'tcx> for ImplTraitInAssocTypeCollector<'tcx> {
     #[instrument(skip(self), ret, level = "trace")]
     fn visit(&mut self, span: Span, value: impl TypeVisitable<TyCtxt<'tcx>>) -> ControlFlow<!> {
         let old = self.0.span;