@@ -21,9 +21,9 @@ use rustc_middle::traits::EvaluationResult;
2121use rustc_middle:: ty:: adjustment:: { Adjust , Adjustment } ;
2222use rustc_middle:: ty:: layout:: ValidityRequirement ;
2323use 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 ,
2727} ;
2828use rustc_span:: symbol:: Ident ;
2929use 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 {
344344 }
345345 false
346346 } ,
347- ty:: Dynamic ( binder, _, _ ) => {
347+ ty:: Dynamic ( binder, _) => {
348348 for predicate in * binder {
349349 if let ty:: ExistentialPredicate :: Trait ( ref trait_ref) = predicate. skip_binder ( )
350350 && 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
655655 cx. tcx . opt_parent ( def_id) ,
656656 ) ,
657657 ty:: FnPtr ( sig_tys, hdr) => Some ( ExprFnSig :: Sig ( sig_tys. with ( hdr) , None ) ) ,
658- ty:: Dynamic ( bounds, _, _ ) => {
658+ ty:: Dynamic ( bounds, _) => {
659659 let lang_items = cx. tcx . lang_items ( ) ;
660660 match bounds. principal ( ) {
661661 Some ( bound)
@@ -826,7 +826,7 @@ pub fn for_each_top_level_late_bound_region<B>(
826826 impl < ' tcx , B , F : FnMut ( BoundRegion ) -> ControlFlow < B > > TypeVisitor < TyCtxt < ' tcx > > for V < F > {
827827 type Result = ControlFlow < B > ;
828828 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 ( )
830830 && idx. as_u32 ( ) == self . index
831831 {
832832 ( self . f ) ( bound)
0 commit comments