Skip to content

Commit e5a2220

Browse files
compiler-errorscompiler-errors
committed
Fold visit into ty
1 parent dc0cdfd commit e5a2220

File tree

56 files changed

+100
-117
lines changed

Some content is hidden

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

56 files changed

+100
-117
lines changed

‎compiler/rustc_borrowck/src/region_infer/opaque_types.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ use rustc_hir::def_id::LocalDefId;
55
use rustc_infer::infer::outlives::env::OutlivesEnvironment;
66
use rustc_infer::infer::{InferCtxt, NllRegionVariableOrigin, TyCtxtInferExt as _};
77
use rustc_macros::extension;
8-
use rustc_middle::ty::visit::TypeVisitableExt;
98
use rustc_middle::ty::{
109
self, GenericArgKind, GenericArgs, OpaqueHiddenType, OpaqueTypeKey, Ty, TyCtxt, TypeFoldable,
11-
TypingMode, fold_regions,
10+
TypeVisitableExt, TypingMode, fold_regions,
1211
};
1312
use rustc_span::Span;
1413
use rustc_trait_selection::regions::OutlivesEnvironmentBuildExt;

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ use rustc_middle::mir::visit::{TyContext, Visitor};
44
use rustc_middle::mir::{Body, Local, Location, SourceInfo};
55
use rustc_middle::span_bug;
66
use rustc_middle::ty::relate::Relate;
7-
use rustc_middle::ty::visit::TypeVisitable;
8-
use rustc_middle::ty::{GenericArgsRef, Region, RegionVid, Ty, TyCtxt};
7+
use rustc_middle::ty::{GenericArgsRef, Region, RegionVid, Ty, TyCtxt, TypeVisitable};
98
use rustc_mir_dataflow::ResultsCursor;
109
use rustc_mir_dataflow::impls::MaybeInitializedPlaces;
1110
use rustc_mir_dataflow::move_paths::MoveData;

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ use rustc_middle::mir::*;
2424
use rustc_middle::traits::query::NoSolution;
2525
use rustc_middle::ty::adjustment::PointerCoercion;
2626
use rustc_middle::ty::cast::CastTy;
27-
use rustc_middle::ty::visit::TypeVisitableExt;
2827
use rustc_middle::ty::{
2928
self, Binder, CanonicalUserTypeAnnotation, CanonicalUserTypeAnnotations, CoroutineArgsExt,
30-
Dynamic, GenericArgsRef, OpaqueHiddenType, OpaqueTypeKey, RegionVid, Ty, TyCtxt, UserArgs,
31-
UserTypeAnnotationIndex, fold_regions,
29+
Dynamic, GenericArgsRef, OpaqueHiddenType, OpaqueTypeKey, RegionVid, Ty, TyCtxt,
30+
TypeVisitableExt, UserArgs, UserTypeAnnotationIndex, fold_regions,
3231
};
3332
use rustc_middle::{bug, span_bug};
3433
use rustc_mir_dataflow::ResultsCursor;

‎compiler/rustc_hir_analysis/src/check/check.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1715,7 +1715,7 @@ fn opaque_type_cycle_error(tcx: TyCtxt<'_>, opaque_def_id: LocalDefId) -> ErrorG
17151715
opaques: Vec<DefId>,
17161716
closures: Vec<DefId>,
17171717
}
1718-
impl<'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>> for OpaqueTypeCollector {
1718+
impl<'tcx> ty::TypeVisitor<TyCtxt<'tcx>> for OpaqueTypeCollector {
17191719
fn visit_ty(&mut self, t: Ty<'tcx>) {
17201720
match *t.kind() {
17211721
ty::Alias(ty::Opaque, ty::AliasTy { def_id: def, .. }) => {

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1520,7 +1520,7 @@ fn check_where_clauses<'tcx>(wfcx: &WfCheckingCtxt<'_, 'tcx>, span: Span, def_id
15201520
struct CountParams {
15211521
params: FxHashSet<u32>,
15221522
}
1523-
impl<'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>> for CountParams {
1523+
impl<'tcx> ty::TypeVisitor<TyCtxt<'tcx>> for CountParams {
15241524
type Result = ControlFlow<()>;
15251525
fn visit_ty(&mut self, t: Ty<'tcx>) -> Self::Result {
15261526
if let ty::Param(param) = t.kind() {

‎compiler/rustc_hir_analysis/src/constrained_generic_params.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use rustc_data_structures::fx::FxHashSet;
22
use rustc_middle::bug;
3-
use rustc_middle::ty::visit::{TypeSuperVisitable, TypeVisitor};
4-
use rustc_middle::ty::{self, Ty, TyCtxt};
3+
use rustc_middle::ty::{self, Ty, TyCtxt, TypeSuperVisitable, TypeVisitor};
54
use rustc_span::Span;
65
use rustc_type_ir::TypeFoldable;
76
use tracing::debug;

‎compiler/rustc_hir_analysis/src/delegation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_hir::def::DefKind;
99
use rustc_hir::def_id::{DefId, LocalDefId};
1010
use rustc_middle::ty::{self, Ty, TyCtxt, TypeFoldable, TypeFolder, TypeSuperFoldable};
1111
use rustc_span::{ErrorGuaranteed, Span};
12-
use rustc_type_ir::visit::TypeVisitableExt;
12+
use rustc_type_ir::TypeVisitableExt;
1313

1414
type RemapTable = FxHashMap<u32, u32>;
1515

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_middle::bug;
1111
use rustc_middle::ty::{self as ty, IsSuggestable, Ty, TyCtxt, Upcast};
1212
use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, sym};
1313
use rustc_trait_selection::traits;
14-
use rustc_type_ir::visit::{TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor};
14+
use rustc_type_ir::{TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor};
1515
use smallvec::SmallVec;
1616
use tracing::{debug, instrument};
1717

‎compiler/rustc_hir_typeck/src/closure.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ use rustc_infer::infer::{BoundRegionConversionTime, DefineOpaqueTypes, InferOk,
1212
use rustc_infer::traits::{ObligationCauseCode, PredicateObligations};
1313
use rustc_macros::{TypeFoldable, TypeVisitable};
1414
use rustc_middle::span_bug;
15-
use rustc_middle::ty::visit::{TypeVisitable, TypeVisitableExt};
16-
use rustc_middle::ty::{self, GenericArgs, Ty, TyCtxt, TypeSuperVisitable, TypeVisitor};
15+
use rustc_middle::ty::{
16+
self, GenericArgs, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor,
17+
};
1718
use rustc_span::def_id::LocalDefId;
1819
use rustc_span::{DUMMY_SP, Span};
1920
use rustc_trait_selection::error_reporting::traits::ArgKind;

‎compiler/rustc_hir_typeck/src/coercion.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ use rustc_middle::ty::adjustment::{
5555
Adjust, Adjustment, AllowTwoPhase, AutoBorrow, AutoBorrowMutability, PointerCoercion,
5656
};
5757
use rustc_middle::ty::error::TypeError;
58-
use rustc_middle::ty::visit::TypeVisitableExt;
59-
use rustc_middle::ty::{self, AliasTy, GenericArgsRef, Ty, TyCtxt};
58+
use rustc_middle::ty::{self, AliasTy, GenericArgsRef, Ty, TyCtxt, TypeVisitableExt};
6059
use rustc_span::{BytePos, DUMMY_SP, DesugaringKind, Span};
6160
use rustc_trait_selection::infer::InferCtxtExt as _;
6261
use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt;

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ use rustc_infer::infer::canonical::{Canonical, OriginalQueryValues, QueryRespons
2121
use rustc_infer::infer::{DefineOpaqueTypes, InferResult};
2222
use rustc_lint::builtin::SELF_CONSTRUCTOR_FROM_OUTER_ITEM;
2323
use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow, AutoBorrowMutability};
24-
use rustc_middle::ty::visit::{TypeVisitable, TypeVisitableExt};
2524
use rustc_middle::ty::{
2625
self, AdtKind, CanonicalUserType, GenericArgKind, GenericArgsRef, GenericParamDefKind,
27-
IsIdentity, Ty, TyCtxt, TypeFoldable, UserArgs, UserSelfTy,
26+
IsIdentity, Ty, TyCtxt, TypeFoldable, TypeVisitable, TypeVisitableExt, UserArgs, UserSelfTy,
2827
};
2928
use rustc_middle::{bug, span_bug};
3029
use rustc_session::lint;

‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ use rustc_index::IndexVec;
1515
use rustc_infer::infer::{DefineOpaqueTypes, InferOk, TypeTrace};
1616
use rustc_middle::ty::adjustment::AllowTwoPhase;
1717
use rustc_middle::ty::error::TypeError;
18-
use rustc_middle::ty::visit::TypeVisitableExt;
19-
use rustc_middle::ty::{self, IsSuggestable, Ty, TyCtxt};
18+
use rustc_middle::ty::{self, IsSuggestable, Ty, TyCtxt, TypeVisitableExt};
2019
use rustc_middle::{bug, span_bug};
2120
use rustc_session::Session;
2221
use rustc_span::{DUMMY_SP, Ident, Span, kw, sym};

‎compiler/rustc_hir_typeck/src/typeck_root_ctxt.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ use rustc_hir::def_id::LocalDefId;
77
use rustc_hir::{HirId, HirIdMap};
88
use rustc_infer::infer::{InferCtxt, InferOk, TyCtxtInferExt};
99
use rustc_middle::span_bug;
10-
use rustc_middle::ty::visit::TypeVisitableExt;
11-
use rustc_middle::ty::{self, Ty, TyCtxt, TypingMode};
10+
use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt, TypingMode};
1211
use rustc_span::Span;
1312
use rustc_span::def_id::LocalDefIdMap;
1413
use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt;

‎compiler/rustc_hir_typeck/src/writeback.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ use rustc_hir::{self as hir, AmbigArg, HirId};
1111
use rustc_middle::span_bug;
1212
use rustc_middle::traits::ObligationCause;
1313
use rustc_middle::ty::adjustment::{Adjust, Adjustment, PointerCoercion};
14-
use rustc_middle::ty::visit::TypeVisitableExt;
1514
use rustc_middle::ty::{
16-
self, Ty, TyCtxt, TypeFoldable, TypeFolder, TypeSuperFoldable, fold_regions,
15+
self, Ty, TyCtxt, TypeFoldable, TypeFolder, TypeSuperFoldable, TypeVisitableExt, fold_regions,
1716
};
1817
use rustc_span::{Span, sym};
1918
use rustc_trait_selection::error_reporting::infer::need_type_info::TypeAnnotationNeeded;

‎compiler/rustc_infer/src/infer/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ use rustc_middle::infer::canonical::{CanonicalQueryInput, CanonicalVarValues};
2828
use rustc_middle::mir::ConstraintCategory;
2929
use rustc_middle::traits::select;
3030
use rustc_middle::ty::error::{ExpectedFound, TypeError};
31-
use rustc_middle::ty::visit::TypeVisitableExt;
3231
use rustc_middle::ty::{
3332
self, BoundVarReplacerDelegate, ConstVid, FloatVid, GenericArg, GenericArgKind, GenericArgs,
3433
GenericArgsRef, GenericParamDefKind, InferConst, IntVid, PseudoCanonicalInput, Ty, TyCtxt,
35-
TyVid, TypeFoldable, TypeFolder, TypeSuperFoldable, TypeVisitable, TypingEnv, TypingMode,
36-
fold_regions,
34+
TyVid, TypeFoldable, TypeFolder, TypeSuperFoldable, TypeVisitable, TypeVisitableExt, TypingEnv,
35+
TypingMode, fold_regions,
3736
};
3837
use rustc_span::{Span, Symbol};
3938
use snapshot::undo_log::InferCtxtUndoLogs;

‎compiler/rustc_infer/src/infer/relate/generalize.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ use rustc_data_structures::stack::ensure_sufficient_stack;
55
use rustc_hir::def_id::DefId;
66
use rustc_middle::bug;
77
use rustc_middle::ty::error::TypeError;
8-
use rustc_middle::ty::visit::MaxUniverse;
98
use rustc_middle::ty::{
10-
self, AliasRelationDirection, InferConst, Term, Ty, TyCtxt, TypeVisitable, TypeVisitableExt,
11-
TypingMode,
9+
self, AliasRelationDirection, InferConst, MaxUniverse, Term, Ty, TyCtxt, TypeVisitable,
10+
TypeVisitableExt, TypingMode,
1211
};
1312
use rustc_span::Span;
1413
use tracing::{debug, instrument, warn};

‎compiler/rustc_infer/src/infer/relate/higher_ranked.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
//! Helper routines for higher-ranked things. See the `doc` module at
22
//! the end of the file for details.
33
4-
use rustc_middle::ty::visit::TypeVisitableExt;
5-
use rustc_middle::ty::{self, FnMutDelegate, Ty, TyCtxt, TypeFoldable};
4+
use rustc_middle::ty::{self, FnMutDelegate, Ty, TyCtxt, TypeFoldable, TypeVisitableExt};
65
use tracing::{debug, instrument};
76

87
use super::RelateResult;

‎compiler/rustc_infer/src/infer/resolve.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use rustc_middle::bug;
2-
use rustc_middle::ty::visit::TypeVisitableExt;
32
use rustc_middle::ty::{
43
self, Const, FallibleTypeFolder, InferConst, Ty, TyCtxt, TypeFoldable, TypeFolder,
5-
TypeSuperFoldable,
4+
TypeSuperFoldable, TypeVisitableExt,
65
};
76
use rustc_type_ir::data_structures::DelayedMap;
87

‎compiler/rustc_infer/src/infer/snapshot/fudge.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc_middle::ty::{
55
self, ConstVid, FloatVid, IntVid, RegionVid, Ty, TyCtxt, TyVid, TypeFoldable, TypeFolder,
66
TypeSuperFoldable,
77
};
8-
use rustc_type_ir::visit::TypeVisitableExt;
8+
use rustc_type_ir::TypeVisitableExt;
99
use tracing::instrument;
1010
use ut::UnifyKey;
1111

‎compiler/rustc_infer/src/traits/structural_impls.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use std::fmt;
22

3-
use rustc_middle::ty::visit::{TypeVisitable, TypeVisitor, try_visit};
4-
use rustc_middle::ty::{self, FallibleTypeFolder, TyCtxt, TypeFoldable};
3+
use rustc_middle::ty::{
4+
self, FallibleTypeFolder, TyCtxt, TypeFoldable, TypeVisitable, TypeVisitor, try_visit,
5+
};
56

67
use crate::traits;
78
use crate::traits::project::Normalized;

‎compiler/rustc_lint/src/enum_intrinsics_non_enums.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use rustc_hir as hir;
2-
use rustc_middle::ty::Ty;
3-
use rustc_middle::ty::visit::TypeVisitableExt;
2+
use rustc_middle::ty::{Ty, TypeVisitableExt};
43
use rustc_session::{declare_lint, declare_lint_pass};
54
use rustc_span::{Span, sym};
65

‎compiler/rustc_lint/src/types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1422,7 +1422,7 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
14221422

14231423
fn check_for_opaque_ty(&mut self, sp: Span, ty: Ty<'tcx>) -> bool {
14241424
struct ProhibitOpaqueTypes;
1425-
impl<'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>> for ProhibitOpaqueTypes {
1425+
impl<'tcx> ty::TypeVisitor<TyCtxt<'tcx>> for ProhibitOpaqueTypes {
14261426
type Result = ControlFlow<Ty<'tcx>>;
14271427

14281428
fn visit_ty(&mut self, ty: Ty<'tcx>) -> Self::Result {
@@ -1564,7 +1564,7 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
15641564
}
15651565
}
15661566

1567-
impl<'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>> for FnPtrFinder<'tcx> {
1567+
impl<'tcx> ty::TypeVisitor<TyCtxt<'tcx>> for FnPtrFinder<'tcx> {
15681568
type Result = ();
15691569

15701570
fn visit_ty(&mut self, ty: Ty<'tcx>) -> Self::Result {

‎compiler/rustc_macros/src/type_visitable.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,27 @@ pub(super) fn type_visitable_derive(
3636
s.add_bounds(synstructure::AddBounds::Generics);
3737
let body_visit = s.each(|bind| {
3838
quote! {
39-
match ::rustc_middle::ty::visit::VisitorResult::branch(
40-
::rustc_middle::ty::visit::TypeVisitable::visit_with(#bind, __visitor)
39+
match ::rustc_middle::ty::VisitorResult::branch(
40+
::rustc_middle::ty::TypeVisitable::visit_with(#bind, __visitor)
4141
) {
4242
::core::ops::ControlFlow::Continue(()) => {},
4343
::core::ops::ControlFlow::Break(r) => {
44-
return ::rustc_middle::ty::visit::VisitorResult::from_residual(r);
44+
return ::rustc_middle::ty::VisitorResult::from_residual(r);
4545
},
4646
}
4747
}
4848
});
4949
s.bind_with(|_| synstructure::BindStyle::Move);
5050

5151
s.bound_impl(
52-
quote!(::rustc_middle::ty::visit::TypeVisitable<::rustc_middle::ty::TyCtxt<'tcx>>),
52+
quote!(::rustc_middle::ty::TypeVisitable<::rustc_middle::ty::TyCtxt<'tcx>>),
5353
quote! {
54-
fn visit_with<__V: ::rustc_middle::ty::visit::TypeVisitor<::rustc_middle::ty::TyCtxt<'tcx>>>(
54+
fn visit_with<__V: ::rustc_middle::ty::TypeVisitor<::rustc_middle::ty::TyCtxt<'tcx>>>(
5555
&self,
5656
__visitor: &mut __V
5757
) -> __V::Result {
5858
match *self { #body_visit }
59-
<__V::Result as ::rustc_middle::ty::visit::VisitorResult>::output()
59+
<__V::Result as ::rustc_middle::ty::VisitorResult>::output()
6060
}
6161
},
6262
)

‎compiler/rustc_middle/src/macros.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ macro_rules! TrivialTypeTraversalImpls {
7676
}
7777
}
7878

79-
impl<'tcx> $crate::ty::visit::TypeVisitable<$crate::ty::TyCtxt<'tcx>> for $ty {
79+
impl<'tcx> $crate::ty::TypeVisitable<$crate::ty::TyCtxt<'tcx>> for $ty {
8080
#[inline]
81-
fn visit_with<F: $crate::ty::visit::TypeVisitor<$crate::ty::TyCtxt<'tcx>>>(
81+
fn visit_with<F: $crate::ty::TypeVisitor<$crate::ty::TyCtxt<'tcx>>>(
8282
&self,
8383
_: &mut F)
8484
-> F::Result
8585
{
86-
<F::Result as ::rustc_middle::ty::visit::VisitorResult>::output()
86+
<F::Result as ::rustc_middle::ty::VisitorResult>::output()
8787
}
8888
}
8989
)+

‎compiler/rustc_middle/src/mir/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_macros::{HashStable, Lift, TyDecodable, TyEncodable, TypeFoldable, Typ
66
use rustc_session::RemapFileNameExt;
77
use rustc_session::config::RemapPathScopeComponents;
88
use rustc_span::{DUMMY_SP, Span, Symbol};
9-
use rustc_type_ir::visit::TypeVisitableExt;
9+
use rustc_type_ir::TypeVisitableExt;
1010

1111
use super::interpret::ReportedErrorInfo;
1212
use crate::mir::interpret::{AllocId, ConstAllocation, ErrorHandled, Scalar, alloc_range};

‎compiler/rustc_middle/src/mir/interpret/queries.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ use super::{
1010
};
1111
use crate::mir;
1212
use crate::query::TyCtxtEnsureOk;
13-
use crate::ty::visit::TypeVisitableExt;
14-
use crate::ty::{self, GenericArgs, TyCtxt};
13+
use crate::ty::{self, GenericArgs, TyCtxt, TypeVisitableExt};
1514

1615
impl<'tcx> TyCtxt<'tcx> {
1716
/// Evaluates a constant without providing any generic parameters. This is useful to evaluate consts

‎compiler/rustc_middle/src/mir/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ pub use self::query::*;
3232
use crate::mir::interpret::{AllocRange, Scalar};
3333
use crate::ty::codec::{TyDecoder, TyEncoder};
3434
use crate::ty::print::{FmtPrinter, Printer, pretty_print_const, with_no_trimmed_paths};
35-
use crate::ty::visit::TypeVisitableExt;
3635
use crate::ty::{
37-
self, AdtDef, GenericArg, GenericArgsRef, Instance, InstanceKind, List, Ty, TyCtxt, TypingEnv,
38-
UserTypeAnnotationIndex,
36+
self, AdtDef, GenericArg, GenericArgsRef, Instance, InstanceKind, List, Ty, TyCtxt,
37+
TypeVisitableExt, TypingEnv, UserTypeAnnotationIndex,
3938
};
4039

4140
mod basic_blocks;

‎compiler/rustc_middle/src/traits/solve.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ use rustc_macros::HashStable;
33
use rustc_type_ir as ir;
44
pub use rustc_type_ir::solve::*;
55

6-
use crate::ty::visit::try_visit;
76
use crate::ty::{
87
self, FallibleTypeFolder, TyCtxt, TypeFoldable, TypeFolder, TypeVisitable, TypeVisitor,
8+
try_visit,
99
};
1010

1111
pub type Goal<'tcx, P> = ir::solve::Goal<TyCtxt<'tcx>, P>;

‎compiler/rustc_middle/src/traits/specialization_graph.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ use rustc_span::sym;
66

77
use crate::error::StrictCoherenceNeedsNegativeCoherence;
88
use crate::ty::fast_reject::SimplifiedType;
9-
use crate::ty::visit::TypeVisitableExt;
10-
use crate::ty::{self, TyCtxt};
9+
use crate::ty::{self, TyCtxt, TypeVisitableExt};
1110

1211
/// A per-trait graph of impls in specialization order. At the moment, this
1312
/// graph forms a tree rooted with the trait itself, with all other nodes

‎compiler/rustc_middle/src/ty/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl<'tcx> rustc_type_ir::inherent::IntoKind for Const<'tcx> {
3434
}
3535
}
3636

37-
impl<'tcx> rustc_type_ir::visit::Flags for Const<'tcx> {
37+
impl<'tcx> rustc_type_ir::Flags for Const<'tcx> {
3838
fn flags(&self) -> TypeFlags {
3939
self.0.flags
4040
}

‎compiler/rustc_middle/src/ty/generic_args.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ use std::ptr::NonNull;
88
use rustc_data_structures::intern::Interned;
99
use rustc_errors::{DiagArgValue, IntoDiagArg};
1010
use rustc_hir::def_id::DefId;
11-
use rustc_macros::{HashStable, TyDecodable, TyEncodable, TypeVisitable, extension};
11+
use rustc_macros::{HashStable, TyDecodable, TyEncodable, extension};
1212
use rustc_serialize::{Decodable, Encodable};
1313
use rustc_type_ir::WithCachedTypeInfo;
1414
use smallvec::SmallVec;
1515

1616
use crate::ty::codec::{TyDecoder, TyEncoder};
17-
use crate::ty::visit::{TypeVisitable, TypeVisitor, VisitorResult, walk_visitable_list};
1817
use crate::ty::{
1918
self, ClosureArgs, CoroutineArgs, CoroutineClosureArgs, FallibleTypeFolder, InlineConstArgs,
20-
Lift, List, Ty, TyCtxt, TypeFoldable,
19+
Lift, List, Ty, TyCtxt, TypeFoldable, TypeVisitable, TypeVisitor, VisitorResult,
20+
walk_visitable_list,
2121
};
2222

2323
pub type GenericArgKind<'tcx> = rustc_type_ir::GenericArgKind<TyCtxt<'tcx>>;

0 commit comments

Comments
 (0)