bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Purge the last remnants of the old TLS api

Browse source 
Closes #3273
This commit is contained in:
Alex Crichton 2013-07-12 01:38:44 -07:00
parent 242606c793
commit e3211fa1f1
15 changed files with 290 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/libsyntax/parse/token.rs
View file

@ -15,7 +15,6 @@ use parse::token;
use util::interner::StrInterner;
use util::interner;
use std::cast;
use std::cmp::Equiv;
use std::local_data;
use std::rand;
@ -485,18 +484,16 @@ fn mk_fresh_ident_interner() -> @ident_interner {
// if an interner exists in TLS, return it. Otherwise, prepare a
// fresh one.
pub fn get_ident_interner() -> @ident_interner {
unsafe {
let key =
(cast::transmute::<(uint, uint),
&fn:Copy(v: @@::parse::token::ident_interner)>(
(-3 as uint, 0u)));
match local_data::get(key, |k| k.map(|&k| *k)) {
Some(interner) => *interner,
None => {
let interner = mk_fresh_ident_interner();
local_data::set(key, @interner);
interner
}
#[cfg(not(stage0))]
static key: local_data::Key<@@::parse::token::ident_interner> = &[];
#[cfg(stage0)]
fn key(_: @@::parse::token::ident_interner) {}
match local_data::get(key, |k| k.map(|&k| *k)) {
Some(interner) => *interner,
None => {
let interner = mk_fresh_ident_interner();
local_data::set(key, @interner);
interner
}
}
}