bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Refactor matches to use Result::err

Browse source
This commit is contained in:
Josh Leeb-du Toit 2017-10-30 08:20:52 +11:00
parent 975ff7b7a0
commit 014e61094a
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_borrowck/borrowck/check_loans.rs
View file

@ -395,19 +395,12 @@ impl<'a, 'tcx> CheckLoanCtxt<'a, 'tcx> {
assert!(self.bccx.region_scope_tree.scopes_intersect(old_loan.kill_scope,
new_loan.kill_scope));
let err_old_new = match self.report_error_if_loan_conflicts_with_restriction(
let err_old_new = Result::err(self.report_error_if_loan_conflicts_with_restriction(
old_loan, new_loan, old_loan, new_loan
) {
Err(err) => Some(err),
Ok(_) => None
};
let err_new_old = match self.report_error_if_loan_conflicts_with_restriction(
));
let err_new_old = Result::err(self.report_error_if_loan_conflicts_with_restriction(
new_loan, old_loan, old_loan, new_loan
) {
Err(err) => Some(err),
Ok(_) => None
};
));
if let Some(mut err_old) = err_old_new {
err_old.emit();