OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix other cases of registering obligations in a snapshot

Browse Source 
No test cases for these ones, but they would all ICE if they ever run
with a non-empty set of obligations.
This commit is contained in:
Ariel Ben-Yehuda 2017-08-21 14:26:33 +03:00
parent e00263438c
commit b47bcc2ee8
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc_typeck/check/coercion.rs
View File

@ -883,8 +883,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
return self.commit_if_ok(|_| {
self.at(cause, self.param_env)
.lub(prev_ty, new_ty)
.map(|ok| self.register_infer_ok_obligations(ok))
});
}).map(|ok| self.register_infer_ok_obligations(ok));
}
}
@ -897,8 +896,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
self.commit_if_ok(|_| {
self.at(cause, self.param_env)
.lub(prev_ty, new_ty)
.map(|ok| self.register_infer_ok_obligations(ok))
})
}).map(|ok| self.register_infer_ok_obligations(ok))
}
}
Ok(ok) => {

10
src/librustc_typeck/check/regionck.rs
View File

@ -1815,12 +1815,12 @@ impl<'a, 'gcx, 'tcx> RegionCtxt<'a, 'gcx, 'tcx> {
// check whether this predicate applies to our current projection
let cause = self.fcx.misc(span);
match self.at(&cause, self.fcx.param_env).eq(outlives.0, ty) {
Ok(ok) => {
self.register_infer_ok_obligations(ok);
Ok(outlives.1)
}
Err(_) => { Err(()) }
Ok(ok) => Ok((ok, outlives.1)),
Err(_) => Err(())
}
}).map(|(ok, result)| {
self.register_infer_ok_obligations(ok);
result
});
debug!("projection_bounds: region_result={:?}",