Skip to content

Commit 52c3b9c

Browse files
committed
---
yaml --- r: 92774 b: refs/heads/auto c: c56bac7 h: refs/heads/master v: v3
1 parent 1f94efc commit 52c3b9c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: eaf69494a5a126189b052102e1b36d1d8bced953
16+
refs/heads/auto: c56bac7f409f0e555120894b12f3d4448ec07fe5
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ pub fn build_session_(sopts: @session::options,
881881
building_library: @mut false,
882882
working_dir: os::getcwd(),
883883
lints: RefCell::new(HashMap::new()),
884-
node_id: @mut 1,
884+
node_id: Cell::new(1),
885885
outputs: @mut ~[],
886886
}
887887
}

branches/auto/src/librustc/driver/session.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ pub struct Session_ {
214214
working_dir: Path,
215215
lints: RefCell<HashMap<ast::NodeId,
216216
~[(lint::lint, codemap::Span, ~str)]>>,
217-
node_id: @mut ast::NodeId,
217+
node_id: Cell<ast::NodeId>,
218218
outputs: @mut ~[OutputStyle],
219219
}
220220

@@ -282,10 +282,10 @@ impl Session_ {
282282
self.reserve_node_ids(1)
283283
}
284284
pub fn reserve_node_ids(&self, count: ast::NodeId) -> ast::NodeId {
285-
let v = *self.node_id;
285+
let v = self.node_id.get();
286286

287287
match v.checked_add(&count) {
288-
Some(next) => { *self.node_id = next; }
288+
Some(next) => { self.node_id.set(next); }
289289
None => self.bug("Input too large, ran out of node ids!")
290290
}
291291

0 commit comments

Comments
 (0)