---

yaml
---
r: 23421
b: refs/heads/master
c: 129c4b6
h: refs/heads/master
i:
  23419: dbddaf7
v: v3

Author: paulstansifer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 89bbaff84fed6e6796c82f5a9fd200e693d47beb
+refs/heads/master: 129c4b694b753ed3dbe67d5e2787e0ede01263e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/ast.rs

@@ -31,14 +31,20 @@ fn deserialize_span<D>(_d: D) -> span {
 type spanned<T> = {node: T, span: span};
 
 fn serialize_ident<S: serializer>(s: S, i: ident) {
-    let intr = unsafe{ task::local_data_get(parse::token::interner_key) };
+    let intr = match unsafe{task::local_data_get(parse::token::interner_key)}{
+        none => fail ~"serialization: TLS interner not set up",
+        some(intr) => intr
+    };
 
-    s.emit_str(*(*intr.get()).get(i));
+    s.emit_str(*(*intr).get(i));
 }
 fn deserialize_ident<D: deserializer>(d: D) -> ident  {
-    let intr = unsafe{ task::local_data_get(parse::token::interner_key) };
+    let intr = match unsafe{task::local_data_get(parse::token::interner_key)}{
+        none => fail ~"deserialization: TLS interner not set up",
+        some(intr) => intr
+    };
 
-    (*intr.get()).intern(@d.read_str())
+    (*intr).intern(@d.read_str())
 }
 
 type ident = token::str_num;