user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address review comment: use .get instead of indexing to cope w/ terminators.

Browse source 
(Same net effect as code from before; just cleaner way to get there.)
This commit is contained in:
Felix S. Klock II 2017-12-13 18:07:02 -06:00
parent 5cae7a0469
commit 3c7d9ff90a
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustc_mir/borrow_check/error_reporting.rs
View file

@ -11,7 +11,7 @@
use syntax_pos::Span;
use rustc::middle::region::ScopeTree;
use rustc::mir::{BorrowKind, Field, Local, Location, Operand};
use rustc::mir::{Place, ProjectionElem, Rvalue, StatementKind};
use rustc::mir::{Place, ProjectionElem, Rvalue, Statement, StatementKind};
use rustc::ty::{self, RegionKind};
use rustc_data_structures::indexed_vec::Idx;
@ -143,18 +143,9 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
use rustc::hir::ExprClosure;
use rustc::mir::AggregateKind;
if location.statement_index == self.mir[location.block].statements.len() {
// Code below hasn't been written in a manner to deal with
// a terminator location.
return None;
}
let local = if let StatementKind::Assign(Place::Local(local), _) =
self.mir[location.block].statements[location.statement_index].kind
{
local
} else {
return None;
let local = match self.mir[location.block].statements.get(location.statement_index) {
Some(&Statement { kind: StatementKind::Assign(Place::Local(local), _), .. }) => local,
_ => return None,
};
for stmt in &self.mir[location.block].statements[location.statement_index + 1..] {