auto merge of #6329 : sonwow/rust/issue-6306, r=ILyoan

Fix for #6306
This commit is contained in:
bors 2013-05-10 03:04:51 -07:00
commit 6da2c989ba
16 changed files with 24 additions and 23 deletions

View file

@ -462,7 +462,7 @@ pub fn mk_fresh_ident_interner() -> @ident_interner {
interner: interner::StrInterner::prefill(init_vec)
};
unsafe {
task::local_data::local_data_set(interner_key!(), @rv);
local_data::local_data_set(interner_key!(), @rv);
}
rv
}
@ -471,7 +471,7 @@ pub fn mk_fresh_ident_interner() -> @ident_interner {
// fresh one.
pub fn mk_ident_interner() -> @ident_interner {
unsafe {
match task::local_data::local_data_get(interner_key!()) {
match local_data::local_data_get(interner_key!()) {
Some(interner) => *interner,
None => {
mk_fresh_ident_interner()