Skip to content

Commit 026364c

Browse files
committed
librustc: Change mut_path into mutators for specific fields in the
borrow check move data
1 parent fcb4781 commit 026364c

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

src/librustc/middle/borrowck/move_data.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,18 @@ impl MoveData {
193193
self.paths[*index].next_sibling
194194
}
195195

196-
fn mut_path<'a>(&'a mut self, index: MovePathIndex) -> &'a mut MovePath {
197-
//! Type safe indexing operator
198-
&mut self.paths[*index]
196+
fn set_path_first_move(&mut self,
197+
index: MovePathIndex,
198+
first_move: MoveIndex) {
199+
self.paths[*index].first_move = first_move
200+
}
201+
202+
fn set_path_first_child(&mut self,
203+
index: MovePathIndex,
204+
first_child: MovePathIndex) {
205+
self.paths[*index].first_child = first_child
199206
}
207+
200208

201209
fn move<'a>(&'a self, index: MoveIndex) -> &'a Move {
202210
//! Type safe indexing operator
@@ -244,7 +252,7 @@ impl MoveData {
244252
let index = MovePathIndex(self.paths.len());
245253

246254
let next_sibling = self.path_first_child(parent_index);
247-
self.mut_path(parent_index).first_child = index;
255+
self.set_path_first_child(parent_index, index);
248256

249257
self.paths.push(MovePath {
250258
loan_path: lp,
@@ -327,7 +335,7 @@ impl MoveData {
327335
let move_index = MoveIndex(self.moves.len());
328336

329337
let next_move = self.path_first_move(path_index);
330-
self.mut_path(path_index).first_move = move_index;
338+
self.set_path_first_move(path_index, move_index);
331339

332340
self.moves.push(Move {
333341
path: path_index,

0 commit comments

Comments
 (0)