bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

librustc: De-@mut node_id in the session

Browse source
This commit is contained in:
Patrick Walton 2013-12-22 14:36:50 -08:00
parent eaf69494a5
commit c56bac7f40
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/driver/driver.rs
View file

@ -881,7 +881,7 @@ pub fn build_session_(sopts: @session::options,
building_library: @mut false, building_library: @mut false,
working_dir: os::getcwd(), working_dir: os::getcwd(),
lints: RefCell::new(HashMap::new()), lints: RefCell::new(HashMap::new()),
node_id: @mut 1, node_id: Cell::new(1),
outputs: @mut ~[], outputs: @mut ~[],
} }
} }

6
src/librustc/driver/session.rs
View file

@ -214,7 +214,7 @@ pub struct Session_ {
working_dir: Path, working_dir: Path,
lints: RefCell<HashMap<ast::NodeId, lints: RefCell<HashMap<ast::NodeId,
~[(lint::lint, codemap::Span, ~str)]>>, ~[(lint::lint, codemap::Span, ~str)]>>,
node_id: @mut ast::NodeId, node_id: Cell<ast::NodeId>,
outputs: @mut ~[OutputStyle], outputs: @mut ~[OutputStyle],
} }
@ -282,10 +282,10 @@ impl Session_ {
self.reserve_node_ids(1) self.reserve_node_ids(1)
} }
pub fn reserve_node_ids(&self, count: ast::NodeId) -> ast::NodeId { pub fn reserve_node_ids(&self, count: ast::NodeId) -> ast::NodeId {
let v = *self.node_id; let v = self.node_id.get();
match v.checked_add(&count) { match v.checked_add(&count) {
Some(next) => { *self.node_id = next; } Some(next) => { self.node_id.set(next); }
None => self.bug("Input too large, ran out of node ids!") None => self.bug("Input too large, ran out of node ids!")
} }