mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix elaborate for predicates with unbound variables

Browse source
This commit is contained in:
Bastian Kauschke 2020-06-19 19:19:21 +02:00
parent 8d4c99ad88
commit bbd581c583
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/librustc_infer/traits/util.rs
View file

@ -151,15 +151,11 @@ impl Elaborator<'tcx> {
fn elaborate(&mut self, obligation: &PredicateObligation<'tcx>) {
let tcx = self.visited.tcx;
let pred = match obligation.predicate.kind() {
// We have to be careful and rebind this when
// dealing with a predicate further down.
ty::PredicateKind::ForAll(binder) => binder.skip_binder().kind(),
pred => pred,
};
match pred {
ty::PredicateKind::ForAll(_) => bug!("unexpected predicate: {:?}", pred),
match obligation.predicate.ignore_qualifiers(tcx).skip_binder().kind() {
ty::PredicateKind::ForAll(_) => {
bug!("unexpected predicate: {:?}", obligation.predicate)
}
ty::PredicateKind::Trait(data, _) => {
// Get predicates declared on the trait.
let predicates = tcx.super_predicates_of(data.def_id());

2
src/librustc_trait_selection/traits/auto_trait.rs
View file

@ -763,7 +763,7 @@ impl AutoTraitFinder<'tcx> {
}
}
Ok(None) => {
// It's ok not to make progress when hvave no inference variables -
// It's ok not to make progress when have no inference variables -
// in that case, we were only performing unifcation to check if an
// error occurred (which would indicate that it's impossible for our
// type to implement the auto trait).