diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-19 17:29:54 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-19 19:08:32 -0700 |
| commit | 1397dca2dd07b93789226a22b2ccc456d0a5317a (patch) | |
| tree | f12c69d4b48ee5a1630feedc9c3ad48538938255 /src/libsyntax | |
| parent | 1643794e0190ed2284bedcdd3fcbc44187a4a98f (diff) | |
| download | rust-1397dca2dd07b93789226a22b2ccc456d0a5317a.tar.gz rust-1397dca2dd07b93789226a22b2ccc456d0a5317a.zip | |
core: Move TLS to task::local_data
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 15b025420db..f7aa0f7555e 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -39,7 +39,9 @@ macro_rules! interner_key ( ) fn serialize_ident<S: Serializer>(s: S, i: ident) { - let intr = match unsafe{task::local_data_get(interner_key!())}{ + let intr = match unsafe{ + task::local_data::local_data_get(interner_key!()) + } { None => fail ~"serialization: TLS interner not set up", Some(intr) => intr }; @@ -47,7 +49,9 @@ fn serialize_ident<S: Serializer>(s: S, i: ident) { s.emit_str(*(*intr).get(i)); } fn deserialize_ident<D: Deserializer>(d: D) -> ident { - let intr = match unsafe{task::local_data_get(interner_key!())}{ + let intr = match unsafe{ + task::local_data::local_data_get(interner_key!()) + } { None => fail ~"deserialization: TLS interner not set up", Some(intr) => intr }; diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 570915e657f..5629907ff14 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -348,8 +348,12 @@ fn mk_ident_interner() -> ident_interner { let rv = interner::mk_prefill::<@~str>(init_vec); /* having multiple interners will just confuse the serializer */ - unsafe{ assert task::local_data_get(interner_key!()).is_none() }; - unsafe{ task::local_data_set(interner_key!(), @rv) }; + unsafe { + assert task::local_data::local_data_get(interner_key!()).is_none() + }; + unsafe { + task::local_data::local_data_set(interner_key!(), @rv) + }; rv } |