Fold visit into ty

Author: compiler-errors

compiler/rustc_borrowck/src/region_infer/opaque_types.rs

@@ -5,10 +5,9 @@ use rustc_hir::def_id::LocalDefId;
 use rustc_infer::infer::outlives::env::OutlivesEnvironment;
 use rustc_infer::infer::{InferCtxt,NllRegionVariableOrigin,TyCtxtInferExtas _};
 use rustc_macros::extension;
-use rustc_middle::ty::visit::TypeVisitableExt;
 use rustc_middle::ty::{
 self,GenericArgKind,GenericArgs,OpaqueHiddenType,OpaqueTypeKey,Ty,TyCtxt,TypeFoldable,
-TypingMode, fold_regions,
+TypeVisitableExt,TypingMode, fold_regions,
 };
 use rustc_span::Span;
 use rustc_trait_selection::regions::OutlivesEnvironmentBuildExt;

compiler/rustc_borrowck/src/type_check/liveness/mod.rs

@@ -4,8 +4,7 @@ use rustc_middle::mir::visit::{TyContext, Visitor};
 use rustc_middle::mir::{Body,Local,Location,SourceInfo};
 use rustc_middle::span_bug;
 use rustc_middle::ty::relate::Relate;
-use rustc_middle::ty::visit::TypeVisitable;
-use rustc_middle::ty::{GenericArgsRef,Region,RegionVid,Ty,TyCtxt};
+use rustc_middle::ty::{GenericArgsRef,Region,RegionVid,Ty,TyCtxt,TypeVisitable};
 use rustc_mir_dataflow::ResultsCursor;
 use rustc_mir_dataflow::impls::MaybeInitializedPlaces;
 use rustc_mir_dataflow::move_paths::MoveData;

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -24,11 +24,10 @@ use rustc_middle::mir::*;
 use rustc_middle::traits::query::NoSolution;
 use rustc_middle::ty::adjustment::PointerCoercion;
 use rustc_middle::ty::cast::CastTy;
-use rustc_middle::ty::visit::TypeVisitableExt;
 use rustc_middle::ty::{
 self,Binder,CanonicalUserTypeAnnotation,CanonicalUserTypeAnnotations,CoroutineArgsExt,
-Dynamic,GenericArgsRef,OpaqueHiddenType,OpaqueTypeKey,RegionVid,Ty,TyCtxt,UserArgs,
-UserTypeAnnotationIndex, fold_regions,
+Dynamic,GenericArgsRef,OpaqueHiddenType,OpaqueTypeKey,RegionVid,Ty,TyCtxt,
+TypeVisitableExt,UserArgs,UserTypeAnnotationIndex, fold_regions,
 };
 use rustc_middle::{bug, span_bug};
 use rustc_mir_dataflow::ResultsCursor;

compiler/rustc_hir_analysis/src/check/check.rs

@@ -1715,7 +1715,7 @@ fn opaque_type_cycle_error(tcx: TyCtxt<'_>, opaque_def_id: LocalDefId) -> ErrorG
 opaques:Vec<DefId>,
 closures:Vec<DefId>,
 }
-impl<'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>>forOpaqueTypeCollector{
+impl<'tcx> ty::TypeVisitor<TyCtxt<'tcx>>forOpaqueTypeCollector{
 fnvisit_ty(&mutself,t:Ty<'tcx>){
 match*t.kind(){
  ty::Alias(ty::Opaque, ty::AliasTy{def_id: def, .. }) => {

compiler/rustc_hir_analysis/src/check/wfcheck.rs

@@ -1520,7 +1520,7 @@ fn check_where_clauses<'tcx>(wfcx: &WfCheckingCtxt<'_, 'tcx>, span: Span, def_id
 structCountParams{
 params:FxHashSet<u32>,
 }
-impl<'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>>forCountParams{
+impl<'tcx> ty::TypeVisitor<TyCtxt<'tcx>>forCountParams{
 typeResult = ControlFlow<()>;
 fnvisit_ty(&mutself,t:Ty<'tcx>) -> Self::Result{
 iflet ty::Param(param) = t.kind(){

compiler/rustc_hir_analysis/src/constrained_generic_params.rs

@@ -1,7 +1,6 @@
 use rustc_data_structures::fx::FxHashSet;
 use rustc_middle::bug;
-use rustc_middle::ty::visit::{TypeSuperVisitable,TypeVisitor};
-use rustc_middle::ty::{self,Ty,TyCtxt};
+use rustc_middle::ty::{self,Ty,TyCtxt,TypeSuperVisitable,TypeVisitor};
 use rustc_span::Span;
 use rustc_type_ir::TypeFoldable;
 use tracing::debug;

compiler/rustc_hir_analysis/src/delegation.rs

@@ -9,7 +9,7 @@ use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId,LocalDefId};
 use rustc_middle::ty::{self,Ty,TyCtxt,TypeFoldable,TypeFolder,TypeSuperFoldable};
 use rustc_span::{ErrorGuaranteed,Span};
-use rustc_type_ir::visit::TypeVisitableExt;
+use rustc_type_ir::TypeVisitableExt;
 
 typeRemapTable = FxHashMap<u32,u32>;
 

compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs

@@ -11,7 +11,7 @@ use rustc_middle::bug;
 use rustc_middle::ty::{selfas ty,IsSuggestable,Ty,TyCtxt,Upcast};
 use rustc_span::{ErrorGuaranteed,Ident,Span,Symbol, kw, sym};
 use rustc_trait_selection::traits;
-use rustc_type_ir::visit::{TypeSuperVisitable,TypeVisitable,TypeVisitableExt,TypeVisitor};
+use rustc_type_ir::{TypeSuperVisitable,TypeVisitable,TypeVisitableExt,TypeVisitor};
 use smallvec::SmallVec;
 use tracing::{debug, instrument};
 

compiler/rustc_hir_typeck/src/closure.rs

@@ -12,8 +12,9 @@ use rustc_infer::infer::{BoundRegionConversionTime, DefineOpaqueTypes, InferOk,
 use rustc_infer::traits::{ObligationCauseCode,PredicateObligations};
 use rustc_macros::{TypeFoldable,TypeVisitable};
 use rustc_middle::span_bug;
-use rustc_middle::ty::visit::{TypeVisitable,TypeVisitableExt};
-use rustc_middle::ty::{self,GenericArgs,Ty,TyCtxt,TypeSuperVisitable,TypeVisitor};
+use rustc_middle::ty::{
+self,GenericArgs,Ty,TyCtxt,TypeSuperVisitable,TypeVisitable,TypeVisitableExt,TypeVisitor,
+};
 use rustc_span::def_id::LocalDefId;
 use rustc_span::{DUMMY_SP,Span};
 use rustc_trait_selection::error_reporting::traits::ArgKind;

compiler/rustc_hir_typeck/src/coercion.rs

@@ -55,8 +55,7 @@ use rustc_middle::ty::adjustment::{
 Adjust,Adjustment,AllowTwoPhase,AutoBorrow,AutoBorrowMutability,PointerCoercion,
 };
 use rustc_middle::ty::error::TypeError;
-use rustc_middle::ty::visit::TypeVisitableExt;
-use rustc_middle::ty::{self,AliasTy,GenericArgsRef,Ty,TyCtxt};
+use rustc_middle::ty::{self,AliasTy,GenericArgsRef,Ty,TyCtxt,TypeVisitableExt};
 use rustc_span::{BytePos,DUMMY_SP,DesugaringKind,Span};
 use rustc_trait_selection::infer::InferCtxtExtas _;
 use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt;