Skip to content

Commit 4f0a647

Browse files
committed
Update TypeVisitor paths
1 parent e9e5d06 commit 4f0a647

File tree

130 files changed

+161
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+161
-147
lines changed

compiler/rustc_borrowck/src/constraint_generation.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use rustc_middle::mir::{
55
BasicBlock, BasicBlockData, Body, Local, Location, Place, PlaceRef, ProjectionElem, Rvalue,
66
SourceInfo, Statement, StatementKind, Terminator, TerminatorKind, UserTypeProjection,
77
};
8-
use rustc_middle::ty::fold::TypeFoldable;
98
use rustc_middle::ty::subst::SubstsRef;
109
use rustc_middle::ty::visit::TypeVisitable;
1110
use rustc_middle::ty::{self, RegionVid, Ty};

compiler/rustc_borrowck/src/region_infer/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ use rustc_middle::mir::{
1919
};
2020
use rustc_middle::traits::ObligationCause;
2121
use rustc_middle::traits::ObligationCauseCode;
22-
use rustc_middle::ty::{self, subst::SubstsRef, RegionVid, Ty, TyCtxt, TypeFoldable};
22+
use rustc_middle::ty::{
23+
self, subst::SubstsRef, RegionVid, Ty, TyCtxt, TypeFoldable, TypeVisitable,
24+
};
2325
use rustc_span::Span;
2426

2527
use crate::{

compiler/rustc_borrowck/src/region_infer/opaque_types.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ use rustc_data_structures::vec_map::VecMap;
22
use rustc_hir::def_id::DefId;
33
use rustc_hir::OpaqueTyOrigin;
44
use rustc_infer::infer::InferCtxt;
5-
use rustc_middle::ty::{self, OpaqueHiddenType, OpaqueTypeKey, TyCtxt, TypeFoldable};
5+
use rustc_middle::ty::{
6+
self, OpaqueHiddenType, OpaqueTypeKey, TyCtxt, TypeFoldable, TypeVisitable,
7+
};
68
use rustc_trait_selection::opaque_types::InferCtxtExt;
79

810
use super::RegionInferenceContext;

compiler/rustc_borrowck/src/type_check/constraint_conversion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_infer::infer::region_constraints::{GenericKind, VerifyBound};
66
use rustc_infer::infer::{self, InferCtxt, SubregionOrigin};
77
use rustc_middle::mir::ConstraintCategory;
88
use rustc_middle::ty::subst::GenericArgKind;
9-
use rustc_middle::ty::TypeFoldable;
9+
use rustc_middle::ty::TypeVisitable;
1010
use rustc_middle::ty::{self, TyCtxt};
1111
use rustc_span::{Span, DUMMY_SP};
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use rustc_index::bit_set::HybridBitSet;
33
use rustc_index::interval::IntervalSet;
44
use rustc_infer::infer::canonical::QueryRegionConstraints;
55
use rustc_middle::mir::{BasicBlock, Body, ConstraintCategory, Local, Location};
6-
use rustc_middle::ty::{Ty, TypeFoldable, TypeVisitable};
6+
use rustc_middle::ty::{Ty, TypeVisitable};
77
use rustc_trait_selection::traits::query::dropck_outlives::DropckOutlivesResult;
88
use rustc_trait_selection::traits::query::type_op::outlives::DropckOutlives;
99
use rustc_trait_selection::traits::query::type_op::{TypeOp, TypeOpOutput};

compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ use rustc_middle::mir::AssertKind;
2727
use rustc_middle::mir::*;
2828
use rustc_middle::ty::adjustment::PointerCast;
2929
use rustc_middle::ty::cast::CastTy;
30-
use rustc_middle::ty::fold::TypeFoldable;
3130
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef, UserSubsts};
31+
use rustc_middle::ty::visit::TypeVisitable;
3232
use rustc_middle::ty::{
3333
self, CanonicalUserTypeAnnotation, CanonicalUserTypeAnnotations, OpaqueHiddenType,
3434
OpaqueTypeKey, RegionVid, ToPredicate, Ty, TyCtxt, UserType, UserTypeAnnotationIndex,

compiler/rustc_codegen_cranelift/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ mod prelude {
7979
pub(crate) use rustc_middle::ty::layout::{self, LayoutOf, TyAndLayout};
8080
pub(crate) use rustc_middle::ty::{
8181
self, FloatTy, Instance, InstanceDef, IntTy, ParamEnv, Ty, TyCtxt, TypeAndMut,
82-
TypeFoldable, UintTy,
82+
TypeFoldable, TypeVisitable, UintTy,
8383
};
8484
pub(crate) use rustc_target::abi::{Abi, Scalar, Size, VariantIdx};
8585

compiler/rustc_codegen_gcc/src/callee.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use gccjit::{FunctionType, RValue};
22
use rustc_codegen_ssa::traits::BaseTypeMethods;
3-
use rustc_middle::ty::{self, Instance, TypeFoldable};
3+
use rustc_middle::ty::{self, Instance, TypeVisitable};
44
use rustc_middle::ty::layout::{FnAbiOf, HasTyCtxt};
55

66
use crate::abi::FnAbiGccExt;

compiler/rustc_codegen_gcc/src/mono_item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_codegen_ssa::traits::PreDefineMethods;
22
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
33
use rustc_middle::mir::mono::{Linkage, Visibility};
4-
use rustc_middle::ty::{self, Instance, TypeFoldable};
4+
use rustc_middle::ty::{self, Instance, TypeVisitable};
55
use rustc_middle::ty::layout::{FnAbiOf, LayoutOf};
66
use rustc_span::def_id::DefId;
77

compiler/rustc_codegen_gcc/src/type_of.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::fmt::Write;
33
use gccjit::{Struct, Type};
44
use crate::rustc_codegen_ssa::traits::{BaseTypeMethods, DerivedTypeMethods, LayoutTypeMethods};
55
use rustc_middle::bug;
6-
use rustc_middle::ty::{self, Ty, TypeFoldable};
6+
use rustc_middle::ty::{self, Ty, TypeVisitable};
77
use rustc_middle::ty::layout::{FnAbiOf, LayoutOf, TyAndLayout};
88
use rustc_middle::ty::print::with_no_trimmed_paths;
99
use rustc_target::abi::{self, Abi, F32, F64, FieldsShape, Int, Integer, Pointer, PointeeInfo, Size, TyAbiInterface, Variants};

0 commit comments

Comments
 (0)