---

yaml
---
r: 35059
b: refs/heads/master
c: d115944
h: refs/heads/master
i:
  35057: 62bd98a
  35055: bff10e6
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 18a825bda0a6098d3d8982784f3dffb908df5e40
+refs/heads/master: d115944809467bd9011d769abbdfd326f8a9d619
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/libsyntax/codemap.rs

@@ -39,7 +39,11 @@ export loc;
 export get_filemap;
 export new_codemap;
 
-struct span {lo: uint, hi: uint, expn_info: expn_info}
+struct span {
+    lo: uint,
+    hi: uint,
+    expn_info: Option<@expn_info>
+}
 
 impl span : cmp::Eq {
     pure fn eq(other: &span) -> bool {
@@ -59,11 +63,10 @@ impl<D: Deserializer> span: Deserializable<D> {
     }
 }
 
-enum expn_info_ {
+enum expn_info {
     expanded_from({call_site: span,
                    callie: {name: ~str, span: Option<span>}})
 }
-type expn_info = Option<@expn_info_>;
 
 type filename = ~str;
 

trunk/src/libsyntax/ext/base.rs

@@ -129,11 +129,11 @@ trait ext_ctxt {
     fn parse_sess() -> parse::parse_sess;
     fn cfg() -> ast::crate_cfg;
     fn print_backtrace();
-    fn backtrace() -> expn_info;
+    fn backtrace() -> Option<@expn_info>;
     fn mod_push(mod_name: ast::ident);
     fn mod_pop();
     fn mod_path() -> ~[ast::ident];
-    fn bt_push(ei: codemap::expn_info_);
+    fn bt_push(ei: codemap::expn_info);
     fn bt_pop();
     fn span_fatal(sp: span, msg: &str) -> !;
     fn span_err(sp: span, msg: &str);
@@ -153,19 +153,19 @@ fn mk_ctxt(parse_sess: parse::parse_sess,
            cfg: ast::crate_cfg) -> ext_ctxt {
     type ctxt_repr = {parse_sess: parse::parse_sess,
                       cfg: ast::crate_cfg,
-                      mut backtrace: expn_info,
+                      mut backtrace: Option<@expn_info>,
                       mut mod_path: ~[ast::ident],
                       mut trace_mac: bool};
     impl ctxt_repr: ext_ctxt {
         fn codemap() -> @CodeMap { self.parse_sess.cm }
         fn parse_sess() -> parse::parse_sess { self.parse_sess }
         fn cfg() -> ast::crate_cfg { self.cfg }
         fn print_backtrace() { }
-        fn backtrace() -> expn_info { self.backtrace }
+        fn backtrace() -> Option<@expn_info> { self.backtrace }
         fn mod_push(i: ast::ident) { self.mod_path.push(i); }
         fn mod_pop() { self.mod_path.pop(); }
         fn mod_path() -> ~[ast::ident] { return self.mod_path; }
-        fn bt_push(ei: codemap::expn_info_) {
+        fn bt_push(ei: codemap::expn_info) {
             match ei {
               expanded_from({call_site: cs, callie: callie}) => {
                 self.backtrace =