@@ -21,9 +21,9 @@ use rustc_middle::traits::EvaluationResult;
21
21
use rustc_middle:: ty:: adjustment:: { Adjust , Adjustment } ;
22
22
use rustc_middle:: ty:: layout:: ValidityRequirement ;
23
23
use rustc_middle:: ty:: {
24
- self , AdtDef , AliasTy , AssocItem , AssocTag , Binder , BoundRegion , FnSig , GenericArg , GenericArgKind , GenericArgsRef ,
25
- GenericParamDefKind , IntTy , Region , RegionKind , TraitRef , Ty , TyCtxt , TypeSuperVisitable , TypeVisitable ,
26
- TypeVisitableExt , TypeVisitor , UintTy , Upcast , VariantDef , VariantDiscr ,
24
+ self , AdtDef , AliasTy , AssocItem , AssocTag , Binder , BoundRegion , BoundVarIndexKind , FnSig , GenericArg ,
25
+ GenericArgKind , GenericArgsRef , GenericParamDefKind , IntTy , Region , RegionKind , TraitRef , Ty , TyCtxt ,
26
+ TypeSuperVisitable , TypeVisitable , TypeVisitableExt , TypeVisitor , UintTy , Upcast , VariantDef , VariantDiscr ,
27
27
} ;
28
28
use rustc_span:: symbol:: Ident ;
29
29
use rustc_span:: { DUMMY_SP , Span , Symbol , sym} ;
@@ -344,7 +344,7 @@ pub fn is_must_use_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
344
344
}
345
345
false
346
346
} ,
347
- ty:: Dynamic ( binder, _, _ ) => {
347
+ ty:: Dynamic ( binder, _) => {
348
348
for predicate in * binder {
349
349
if let ty:: ExistentialPredicate :: Trait ( ref trait_ref) = predicate. skip_binder ( )
350
350
&& find_attr ! ( cx. tcx. get_all_attrs( trait_ref. def_id) , AttributeKind :: MustUse { .. } )
@@ -655,7 +655,7 @@ pub fn ty_sig<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<ExprFnSig<'t
655
655
cx. tcx . opt_parent ( def_id) ,
656
656
) ,
657
657
ty:: FnPtr ( sig_tys, hdr) => Some ( ExprFnSig :: Sig ( sig_tys. with ( hdr) , None ) ) ,
658
- ty:: Dynamic ( bounds, _, _ ) => {
658
+ ty:: Dynamic ( bounds, _) => {
659
659
let lang_items = cx. tcx . lang_items ( ) ;
660
660
match bounds. principal ( ) {
661
661
Some ( bound)
@@ -826,7 +826,7 @@ pub fn for_each_top_level_late_bound_region<B>(
826
826
impl < ' tcx , B , F : FnMut ( BoundRegion ) -> ControlFlow < B > > TypeVisitor < TyCtxt < ' tcx > > for V < F > {
827
827
type Result = ControlFlow < B > ;
828
828
fn visit_region ( & mut self , r : Region < ' tcx > ) -> Self :: Result {
829
- if let RegionKind :: ReBound ( idx, bound) = r. kind ( )
829
+ if let RegionKind :: ReBound ( BoundVarIndexKind :: Bound ( idx) , bound) = r. kind ( )
830
830
&& idx. as_u32 ( ) == self . index
831
831
{
832
832
( self . f ) ( bound)
0 commit comments