---

yaml
---
r: 39871
b: refs/heads/incoming
c: 0b9e231
h: refs/heads/master
i:
  39869: 10cec46
  39867: 2cb4fe5
  39863: 659b821
  39855: 434c3e8
  39839: e07944f
  39807: 594ad2b
v: v3

Author: erickt

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
+refs/heads/incoming: 0b9e23146b75c02dd9059dc754070884595f3104
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/front/core_inject.rs

@@ -69,7 +69,7 @@ fn inject_libcore_ref(sess: Session,
             new_module = fld.fold_mod(new_module);
 
             // XXX: Bad copy.
-            let new_crate = { module: new_module, ..copy crate };
+            let new_crate = ast::crate_ { module: new_module, ..copy crate };
             (new_crate, span)
         },
         fold_mod: |module, fld| {

branches/incoming/src/librustc/front/intrinsic_inject.rs

@@ -37,8 +37,13 @@ fn inject_intrinsic(sess: Session, crate: @ast::crate) -> @ast::crate {
     let items = vec::append(~[item], crate.node.module.items);
 
     @ast::spanned {
-        node: { module: { items: items ,.. /*bad*/copy crate.node.module },
-                .. /*bad*/copy crate.node},
+        node: ast::crate_ {
+            module: {
+                items: items,
+                .. /*bad*/copy crate.node.module
+            },
+            .. /*bad*/copy crate.node
+        },
         .. /*bad*/copy *crate
     }
 }

branches/incoming/src/librustc/front/test.rs

@@ -113,7 +113,8 @@ fn fold_crate(cx: test_ctxt, c: ast::crate_, fld: fold::ast_fold) ->
 
     // Add a special __test module to the crate that will contain code
     // generated for the test harness
-    return {module: add_test_module(cx, /*bad*/copy folded.module),.. folded};
+    ast::crate_ { module: add_test_module(cx, /*bad*/copy folded.module),
+                  .. folded }
 }
 
 

branches/incoming/src/libsyntax/ast.rs

@@ -293,10 +293,11 @@ type crate_cfg = ~[@meta_item];
 
 type crate = spanned<crate_>;
 
-type crate_ =
-    {module: _mod,
-     attrs: ~[attribute],
-     config: crate_cfg};
+struct crate_ {
+    module: _mod,
+    attrs: ~[attribute],
+    config: crate_cfg,
+}
 
 type meta_item = spanned<meta_item_>;
 

branches/incoming/src/libsyntax/fold.rs

@@ -165,11 +165,11 @@ fn noop_fold_crate(c: crate_, fld: ast_fold) -> crate_ {
     let fold_meta_item = |x| fold_meta_item_(x, fld);
     let fold_attribute = |x| fold_attribute_(x, fld);
 
-    return {
+    crate_ {
         module: fld.fold_mod(c.module),
-        attrs: vec::map(c.attrs, |x| fold_attribute(*x)),
-        config: vec::map(c.config, |x| fold_meta_item(*x))
-    };
+        attrs: c.attrs.map(|x| fold_attribute(*x)),
+        config: c.config.map(|x| fold_meta_item(*x)),
+    }
 }
 
 fn noop_fold_view_item(vi: view_item_, _fld: ast_fold) -> view_item_ {

branches/incoming/src/libsyntax/parse/parser.rs

@@ -3855,10 +3855,10 @@ impl Parser {
         let crate_attrs = self.parse_inner_attrs_and_next();
         let first_item_outer_attrs = crate_attrs.next;
         let m = self.parse_mod_items(token::EOF, first_item_outer_attrs);
-        return @spanned(lo, self.span.lo,
-                     {module: m,
-                      attrs: crate_attrs.inner,
-                      config: self.cfg});
+        @spanned(lo, self.span.lo,
+                 ast::crate_ { module: m,
+                               attrs: crate_attrs.inner,
+                               config: self.cfg })
     }
 
     fn parse_str() -> @~str {