From 128f744fd1ef30d8caa0d587a8c816870b4b3d11 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Wed, 20 May 2020 16:00:15 +0900 Subject: [PATCH] Rustup to the latest nightly --- src/translate.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/translate.rs b/src/translate.rs index bb99b264..1e65c086 100644 --- a/src/translate.rs +++ b/src/translate.rs @@ -362,8 +362,8 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> { predicate: Predicate<'tcx>, ) -> Option> { use rustc_middle::ty::{ - Binder, /*EquatePredicate,*/ OutlivesPredicate, ProjectionPredicate, ProjectionTy, - SubtypePredicate, TraitPredicate, + Binder, OutlivesPredicate, ProjectionPredicate, ProjectionTy, SubtypePredicate, + TraitPredicate, }; Some(match predicate { @@ -386,13 +386,6 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> { ), constness, ), - /*Predicate::Equate(equate_predicate) => { - Predicate::Equate(equate_predicate.map_bound(|e_pred| { - let l = self.translate(index_map, &e_pred.0); - let r = self.translate(index_map, &e_pred.1); - EquatePredicate(l, r) - })) - },*/ Predicate::RegionOutlives(region_outlives_predicate) => { Predicate::RegionOutlives(region_outlives_predicate.map_bound(|r_pred| { let l = self.translate_region(r_pred.0); @@ -451,6 +444,10 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> { return None; } } + Predicate::ConstEquate(c1, c2) => Predicate::ConstEquate( + self.translate(index_map, &c1), + self.translate(index_map, &c2), + ), }) }