mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

review comments

Browse Source
This commit is contained in:
Esteban Küber 2019-11-14 11:34:46 -08:00
parent bc1bd95e5a
commit b884205cf4
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/librustc_typeck/check/mod.rs
View File

@ -705,14 +705,9 @@ fn register_predicate(&self, obligation: traits::PredicateObligation<'tcx>) {
span_bug!(obligation.cause.span, "escaping bound vars in predicate {:?}",
obligation);
}
let _ = self.fulfillment_cx
.try_borrow_mut()
.map_err(|e| self.tcx.sess.delay_span_bug(obligation.cause.span, &format!(
"fullfillment context already borrowed: {:?} - {:?}",
e,
obligation,
)))
.map(|mut cx| cx.register_predicate_obligation(self, obligation));
self.fulfillment_cx
.borrow_mut()
.register_predicate_obligation(self, obligation);
}
fn register_predicates<I>(&self, obligations: I)
@ -3111,7 +3106,8 @@ fn select_obligations_where_possible(
fallback_has_occurred: bool,
mutate_fullfillment_errors: impl Fn(&mut Vec<traits::FulfillmentError<'tcx>>),
) {
if let Err(mut errors) = self.fulfillment_cx.borrow_mut().select_where_possible(self) {
let result = self.fulfillment_cx.borrow_mut().select_where_possible(self);
if let Err(mut errors) = result {
mutate_fullfillment_errors(&mut errors);
self.report_fulfillment_errors(&errors, self.inh.body_id, fallback_has_occurred);
}