Squash fold into ty

Author: compiler-errors

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

@@ -14,9 +14,8 @@ use rustc_infer::infer::{NllRegionVariableOrigin, RelateParamBound};
 use rustc_middle::bug;
 use rustc_middle::hir::place::PlaceBase;
 use rustc_middle::mir::{AnnotationSource,ConstraintCategory,ReturnConstraint};
-use rustc_middle::ty::fold::fold_regions;
 use rustc_middle::ty::{
-self,GenericArgs,Region,RegionVid,Ty,TyCtxt,TypeFoldable,TypeVisitor,
+self,GenericArgs,Region,RegionVid,Ty,TyCtxt,TypeFoldable,TypeVisitor, fold_regions,
 };
 use rustc_span::{Ident,Span, kw};
 use rustc_trait_selection::error_reporting::InferCtxtErrorExt;

compiler/rustc_borrowck/src/lib.rs

@@ -35,8 +35,7 @@ use rustc_infer::infer::{
 };
 use rustc_middle::mir::*;
 use rustc_middle::query::Providers;
-use rustc_middle::ty::fold::fold_regions;
-use rustc_middle::ty::{self,ParamEnv,RegionVid,TyCtxt,TypingMode};
+use rustc_middle::ty::{self,ParamEnv,RegionVid,TyCtxt,TypingMode, fold_regions};
 use rustc_middle::{bug, span_bug};
 use rustc_mir_dataflow::impls::{
 EverInitializedPlaces,MaybeInitializedPlaces,MaybeUninitializedPlaces,

compiler/rustc_borrowck/src/region_infer/mod.rs

@@ -18,8 +18,7 @@ use rustc_middle::mir::{
 ReturnConstraint,TerminatorKind,
 };
 use rustc_middle::traits::{ObligationCause,ObligationCauseCode};
-use rustc_middle::ty::fold::fold_regions;
-use rustc_middle::ty::{self,RegionVid,Ty,TyCtxt,TypeFoldable,UniverseIndex};
+use rustc_middle::ty::{self,RegionVid,Ty,TyCtxt,TypeFoldable,UniverseIndex, fold_regions};
 use rustc_mir_dataflow::points::DenseLocationMap;
 use rustc_span::hygiene::DesugaringKind;
 use rustc_span::{DUMMY_SP,Span};

compiler/rustc_borrowck/src/region_infer/opaque_types.rs

@@ -5,11 +5,10 @@ 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::fold::fold_regions;
 use rustc_middle::ty::visit::TypeVisitableExt;
 use rustc_middle::ty::{
 self,GenericArgKind,GenericArgs,OpaqueHiddenType,OpaqueTypeKey,Ty,TyCtxt,TypeFoldable,
-TypingMode,
+TypingMode, fold_regions,
 };
 use rustc_span::Span;
 use rustc_trait_selection::regions::OutlivesEnvironmentBuildExt;

compiler/rustc_borrowck/src/renumber.rs

@@ -2,8 +2,7 @@ use rustc_index::IndexSlice;
 use rustc_infer::infer::NllRegionVariableOrigin;
 use rustc_middle::mir::visit::{MutVisitor,TyContext};
 use rustc_middle::mir::{Body,ConstOperand,Location,Promoted};
-use rustc_middle::ty::fold::fold_regions;
-use rustc_middle::ty::{self,GenericArgsRef,Ty,TyCtxt,TypeFoldable};
+use rustc_middle::ty::{self,GenericArgsRef,Ty,TyCtxt,TypeFoldable, fold_regions};
 use rustc_span::Symbol;
 use tracing::{debug, instrument};
 

compiler/rustc_borrowck/src/type_check/constraint_conversion.rs

@@ -7,8 +7,9 @@ use rustc_infer::infer::{self, InferCtxt, SubregionOrigin};
 use rustc_infer::traits::query::type_op::DeeplyNormalize;
 use rustc_middle::bug;
 use rustc_middle::mir::{ClosureOutlivesSubject,ClosureRegionRequirements,ConstraintCategory};
-use rustc_middle::ty::fold::fold_regions;
-use rustc_middle::ty::{self,GenericArgKind,Ty,TyCtxt,TypeFoldable,TypeVisitableExt};
+use rustc_middle::ty::{
+self,GenericArgKind,Ty,TyCtxt,TypeFoldable,TypeVisitableExt, fold_regions,
+};
 use rustc_span::Span;
 use rustc_trait_selection::traits::query::type_op::{TypeOp,TypeOpOutput};
 use tracing::{debug, instrument};

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -24,12 +24,11 @@ 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::fold::fold_regions;
 use rustc_middle::ty::visit::TypeVisitableExt;
 use rustc_middle::ty::{
 self,Binder,CanonicalUserTypeAnnotation,CanonicalUserTypeAnnotations,CoroutineArgsExt,
 Dynamic,GenericArgsRef,OpaqueHiddenType,OpaqueTypeKey,RegionVid,Ty,TyCtxt,UserArgs,
-UserTypeAnnotationIndex,
+UserTypeAnnotationIndex, fold_regions,
 };
 use rustc_middle::{bug, span_bug};
 use rustc_mir_dataflow::ResultsCursor;

compiler/rustc_borrowck/src/type_check/opaque_types.rs

@@ -2,10 +2,9 @@ use std::iter;
 
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_middle::span_bug;
-use rustc_middle::ty::fold::fold_regions;
 use rustc_middle::ty::{
 self,GenericArgKind,OpaqueHiddenType,OpaqueTypeKey,Ty,TyCtxt,TypeSuperVisitable,
-TypeVisitable,TypeVisitableExt,TypeVisitor,
+TypeVisitable,TypeVisitableExt,TypeVisitor, fold_regions,
 };
 use tracing::{debug, trace};
 

compiler/rustc_borrowck/src/type_check/relate_tys.rs

@@ -10,9 +10,8 @@ use rustc_middle::mir::ConstraintCategory;
 use rustc_middle::span_bug;
 use rustc_middle::traits::ObligationCause;
 use rustc_middle::traits::query::NoSolution;
-use rustc_middle::ty::fold::FnMutDelegate;
 use rustc_middle::ty::relate::combine::{super_combine_consts, super_combine_tys};
-use rustc_middle::ty::{self,Ty,TyCtxt,TypeVisitableExt};
+use rustc_middle::ty::{self,FnMutDelegate,Ty,TyCtxt,TypeVisitableExt};
 use rustc_span::{Span,Symbol, sym};
 use tracing::{debug, instrument};
 

compiler/rustc_borrowck/src/universal_regions.rs

@@ -27,11 +27,10 @@ use rustc_hir::lang_items::LangItem;
 use rustc_index::IndexVec;
 use rustc_infer::infer::NllRegionVariableOrigin;
 use rustc_macros::extension;
-use rustc_middle::ty::fold::{TypeFoldable, fold_regions};
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_middle::ty::{
 self,GenericArgs,GenericArgsRef,InlineConstArgs,InlineConstArgsParts,RegionVid,Ty,
-TyCtxt,TypeVisitableExt,
+TyCtxt,TypeFoldable,TypeVisitableExt, fold_regions,
 };
 use rustc_middle::{bug, span_bug};
 use rustc_span::{ErrorGuaranteed, kw, sym};