diff options
| author | bors <bors@rust-lang.org> | 2013-05-10 03:04:51 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-10 03:04:51 -0700 |
| commit | 6da2c989ba88dc4e6b49ddd086699404bf93916f (patch) | |
| tree | f7c55c4091ea7c5f05f52e2810ec3ec638bff2e5 /src/libsyntax | |
| parent | e9d0018abf8dd0c692db4cfe8f5d1bd1c150d643 (diff) | |
| parent | 4400bbd72a18b5f034a5c43c29af87e1e453c2cb (diff) | |
| download | rust-6da2c989ba88dc4e6b49ddd086699404bf93916f.tar.gz rust-6da2c989ba88dc4e6b49ddd086699404bf93916f.zip | |
auto merge of #6329 : sonwow/rust/issue-6306, r=ILyoan
Fix for #6306
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 5908d0c56f4..de59f2107cc 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -74,7 +74,7 @@ impl<S:Encoder> Encodable<S> for ident { fn encode(&self, s: &mut S) { unsafe { let intr = - match task::local_data::local_data_get(interner_key!()) { + match local_data::local_data_get(interner_key!()) { None => fail!(~"encode: TLS interner not set up"), Some(intr) => intr }; @@ -87,7 +87,7 @@ impl<S:Encoder> Encodable<S> for ident { impl<D:Decoder> Decodable<D> for ident { fn decode(d: &mut D) -> ident { let intr = match unsafe { - task::local_data::local_data_get(interner_key!()) + local_data::local_data_get(interner_key!()) } { None => fail!(~"decode: TLS interner not set up"), Some(intr) => intr diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 4483cc42361..43745bce1bf 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -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() |