about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlan Egerton <eggyal@gmail.com>2023-02-09 14:02:47 +0000
committerAlan Egerton <eggyal@gmail.com>2023-02-13 10:24:46 +0000
commite8e9c32af94d0d38290f963fe4e8f28faab34dcc (patch)
tree8d9b5823f850ccb0b9ade4dbdfbefa04a5326742
parent863e96d62654e8919dfab9890f74ca67e8ab682e (diff)
downloadrust-e8e9c32af94d0d38290f963fe4e8f28faab34dcc.tar.gz
rust-e8e9c32af94d0d38290f963fe4e8f28faab34dcc.zip
Alias folding/visiting traits instead of re-export
-rw-r--r--clippy_utils/src/mir/possible_borrower.rs2
-rw-r--r--clippy_utils/src/ty.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/clippy_utils/src/mir/possible_borrower.rs b/clippy_utils/src/mir/possible_borrower.rs
index 5836eb73bd9..fd9c83759a9 100644
--- a/clippy_utils/src/mir/possible_borrower.rs
+++ b/clippy_utils/src/mir/possible_borrower.rs
@@ -4,7 +4,7 @@ use rustc_data_structures::fx::FxHashMap;
 use rustc_index::bit_set::{BitSet, HybridBitSet};
 use rustc_lint::LateContext;
 use rustc_middle::mir::{self, visit::Visitor as _, Mutability};
-use rustc_middle::ty::{self, visit::TypeVisitor};
+use rustc_middle::ty::{self, visit::ir::TypeVisitor};
 use rustc_mir_dataflow::{impls::MaybeStorageLive, Analysis, ResultsCursor};
 use std::borrow::Cow;
 use std::ops::ControlFlow;
diff --git a/clippy_utils/src/ty.rs b/clippy_utils/src/ty.rs
index c48d27b05f0..1635b75f718 100644
--- a/clippy_utils/src/ty.rs
+++ b/clippy_utils/src/ty.rs
@@ -17,7 +17,7 @@ use rustc_lint::LateContext;
 use rustc_middle::mir::interpret::{ConstValue, Scalar};
 use rustc_middle::ty::{
     self, AdtDef, AliasTy, AssocKind, Binder, BoundRegion, DefIdTree, FnSig, IntTy, List, ParamEnv, Predicate,
-    PredicateKind, Region, RegionKind, SubstsRef, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitor, UintTy,
+    PredicateKind, Region, RegionKind, SubstsRef, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, ir::TypeVisitor, UintTy,
     VariantDef, VariantDiscr,
 };
 use rustc_middle::ty::{GenericArg, GenericArgKind};