Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Rustup to the latest nightly #122

Merged
merged 1 commit into from
May 20, 2020
Merged

Rustup to the latest nightly #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/translate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
predicate: Predicate<'tcx>,
) -> Option<Predicate<'tcx>> {
use rustc_middle::ty::{
Binder, /*EquatePredicate,*/ OutlivesPredicate, ProjectionPredicate, ProjectionTy,
SubtypePredicate, TraitPredicate,
Binder, OutlivesPredicate, ProjectionPredicate, ProjectionTy, SubtypePredicate,
TraitPredicate,
};

Some(match predicate {
Expand All @@ -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);
Expand Down Expand Up @@ -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),
),
})
}

Expand Down