@@ -13,9 +13,9 @@ use rustc_infer::infer::TyCtxtInferExt;
13
13
use rustc_lint:: LateContext ;
14
14
use rustc_middle:: mir:: interpret:: { ConstValue , Scalar } ;
15
15
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 ,
19
19
} ;
20
20
use rustc_middle:: ty:: { GenericArg , GenericArgKind } ;
21
21
use rustc_span:: symbol:: Ident ;
@@ -1011,7 +1011,7 @@ pub fn make_projection<'tcx>(
1011
1011
assoc_item. def_id,
1012
1012
substs. len( ) ,
1013
1013
generic_count,
1014
- params. map( GenericParamDefKind :: descr) . collect:: <Vec <_>>( ) ,
1014
+ params. map( ty :: GenericParamDefKind :: descr) . collect:: <Vec <_>>( ) ,
1015
1015
substs,
1016
1016
) ;
1017
1017
@@ -1022,9 +1022,9 @@ pub fn make_projection<'tcx>(
1022
1022
. find ( |( _, ( param, arg) ) | {
1023
1023
!matches ! (
1024
1024
( 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 ( _) )
1028
1028
)
1029
1029
} )
1030
1030
{
@@ -1036,7 +1036,7 @@ pub fn make_projection<'tcx>(
1036
1036
idx,
1037
1037
param. descr( ) ,
1038
1038
arg,
1039
- params. map( GenericParamDefKind :: descr) . collect:: <Vec <_>>( ) ,
1039
+ params. map( ty :: GenericParamDefKind :: descr) . collect:: <Vec <_>>( ) ,
1040
1040
substs,
1041
1041
) ;
1042
1042
}
0 commit comments