Skip to content

Commit 2422802

Browse files
committed
Clippy: Don't import GenericParamDefKind
1 parent b4c90ab commit 2422802

File tree

1 file changed

+8
-8
lines changed
  • src/tools/clippy/clippy_utils/src

1 file changed

+8
-8
lines changed

src/tools/clippy/clippy_utils/src/ty.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ use rustc_infer::infer::TyCtxtInferExt;
1313
use rustc_lint::LateContext;
1414
use rustc_middle::mir::interpret::{ConstValue, Scalar};
1515
use rustc_middle::ty::{
16-
self, AdtDef, AssocKind, Binder, BoundRegion, DefIdTree, FnSig, GenericParamDefKind, IntTy, List, ParamEnv,
17-
Predicate, PredicateKind, ProjectionTy, Region, RegionKind, SubstsRef, Ty, TyCtxt, TypeSuperVisitable,
18-
TypeVisitable, TypeVisitor, UintTy, VariantDef, VariantDiscr,
16+
self, AdtDef, AssocKind, Binder, BoundRegion, DefIdTree, FnSig, IntTy, List, ParamEnv, Predicate, PredicateKind,
17+
ProjectionTy, Region, RegionKind, SubstsRef, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitor, UintTy,
18+
VariantDef, VariantDiscr,
1919
};
2020
use rustc_middle::ty::{GenericArg, GenericArgKind};
2121
use rustc_span::symbol::Ident;
@@ -1011,7 +1011,7 @@ pub fn make_projection<'tcx>(
10111011
assoc_item.def_id,
10121012
substs.len(),
10131013
generic_count,
1014-
params.map(GenericParamDefKind::descr).collect::<Vec<_>>(),
1014+
params.map(ty::GenericParamDefKind::descr).collect::<Vec<_>>(),
10151015
substs,
10161016
);
10171017

@@ -1022,9 +1022,9 @@ pub fn make_projection<'tcx>(
10221022
.find(|(_, (param, arg))| {
10231023
!matches!(
10241024
(param, arg),
1025-
(GenericParamDefKind::Lifetime, GenericArgKind::Lifetime(_))
1026-
| (GenericParamDefKind::Type { .. }, GenericArgKind::Type(_))
1027-
| (GenericParamDefKind::Const { .. }, GenericArgKind::Const(_))
1025+
(ty::GenericParamDefKind::Lifetime, GenericArgKind::Lifetime(_))
1026+
| (ty::GenericParamDefKind::Type { .. }, GenericArgKind::Type(_))
1027+
| (ty::GenericParamDefKind::Const { .. }, GenericArgKind::Const(_))
10281028
)
10291029
})
10301030
{
@@ -1036,7 +1036,7 @@ pub fn make_projection<'tcx>(
10361036
idx,
10371037
param.descr(),
10381038
arg,
1039-
params.map(GenericParamDefKind::descr).collect::<Vec<_>>(),
1039+
params.map(ty::GenericParamDefKind::descr).collect::<Vec<_>>(),
10401040
substs,
10411041
);
10421042
}

0 commit comments

Comments
 (0)