Skip to content

Commit 098a450

Browse files
committed
---
yaml --- r: 89053 b: refs/heads/snap-stage3 c: f700cf3 h: refs/heads/master i: 89051: 999a2d2 v: v3
1 parent 6eacd15 commit 098a450

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: f19a9b96004d04ae885de30cbc4f88e214a87fb8
4+
refs/heads/snap-stage3: f700cf38724a4a9ab31850cf6a5b11c6dbe0524f
55
refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/borrowck/move_data.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,10 @@ impl MoveData {
181181
self.paths[*index].parent
182182
}
183183

184+
fn path_first_move(&self, index: MovePathIndex) -> MoveIndex {
185+
self.paths[*index].first_move
186+
}
187+
184188
fn path<'a>(&'a self, index: MovePathIndex) -> &'a MovePath {
185189
//! Type safe indexing operator
186190
&self.paths[*index]
@@ -319,7 +323,7 @@ impl MoveData {
319323
let path_index = self.move_path(tcx, lp);
320324
let move_index = MoveIndex(self.moves.len());
321325

322-
let next_move = self.path(path_index).first_move;
326+
let next_move = self.path_first_move(path_index);
323327
self.mut_path(path_index).first_move = move_index;
324328

325329
self.moves.push(Move {
@@ -456,7 +460,7 @@ impl MoveData {
456460
-> bool {
457461
let mut ret = true;
458462
self.each_extending_path(index0, |index| {
459-
let mut p = self.path(index).first_move;
463+
let mut p = self.path_first_move(index);
460464
while p != InvalidMoveIndex {
461465
if !f(p) {
462466
ret = false;

0 commit comments

Comments
 (0)