---

yaml
---
r: 27999
b: refs/heads/try
c: 129c4b6
h: refs/heads/master
i:
  27997: 030d39f
  27995: 7de42f8
  27991: 0291024
  27983: 10f223f
  27967: e43f852
v: v3

Author: paulstansifer

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 89bbaff84fed6e6796c82f5a9fd200e693d47beb
+refs/heads/try: 129c4b694b753ed3dbe67d5e2787e0ede01263e9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/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;