More record->struct conversions

src/libfuzzer/fuzzer.rc

@@ -77,7 +77,12 @@ fn find_rust_files(files: &mut ~[Path], path: &Path) {
 
 fn common_exprs() -> ~[ast::expr] {
     fn dse(e: ast::expr_) -> ast::expr {
-        { id: 0, callee_id: -1, node: e, span: ast_util::dummy_sp() }
+        ast::expr {
+            id: 0,
+            callee_id: -1,
+            node: e,
+            span: ast_util::dummy_sp(),
+        }
     }
 
     fn dsl(l: ast::lit_) -> ast::lit {

src/librustc/driver/session.rs

@@ -361,7 +361,7 @@ mod test {
         if with_bin { attrs += ~[make_crate_type_attr(~"bin")]; }
         if with_lib { attrs += ~[make_crate_type_attr(~"lib")]; }
         @ast_util::respan(ast_util::dummy_sp(), ast::crate_ {
-            module: {view_items: ~[], items: ~[]},
+            module: ast::_mod { view_items: ~[], items: ~[] },
             attrs: attrs,
             config: ~[]
         })

src/librustc/front/config.rs

@@ -67,15 +67,14 @@ fn filter_view_item(cx: ctxt, &&view_item: @ast::view_item
     }
 }
 
-fn fold_mod(cx: ctxt, m: ast::_mod, fld: fold::ast_fold) ->
-   ast::_mod {
+fn fold_mod(cx: ctxt, m: ast::_mod, fld: fold::ast_fold) -> ast::_mod {
     let filtered_items = vec::filter_map(m.items, |a| filter_item(cx, *a));
     let filtered_view_items = vec::filter_map(m.view_items,
                                               |a| filter_view_item(cx, *a));
-    return {
-        view_items: vec::map(filtered_view_items, |x| fld.fold_view_item(*x)),
-        items: vec::filter_map(filtered_items, |x| fld.fold_item(*x))
-    };
+    ast::_mod {
+        view_items: filtered_view_items.map(|x| fld.fold_view_item(*x)),
+        items: filtered_items.filter_map(|x| fld.fold_item(*x)),
+    }
 }
 
 fn filter_foreign_item(cx: ctxt, &&item: @ast::foreign_item) ->
@@ -85,18 +84,21 @@ fn filter_foreign_item(cx: ctxt, &&item: @ast::foreign_item) ->
     } else { option::None }
 }
 
-fn fold_foreign_mod(cx: ctxt, nm: ast::foreign_mod,
-                   fld: fold::ast_fold) -> ast::foreign_mod {
+fn fold_foreign_mod(
+    cx: ctxt,
+    nm: ast::foreign_mod,
+    fld: fold::ast_fold
+) -> ast::foreign_mod {
     let filtered_items = vec::filter_map(nm.items,
                                          |a| filter_foreign_item(cx, *a));
     let filtered_view_items = vec::filter_map(nm.view_items,
                                               |a| filter_view_item(cx, *a));
-    return {
+    ast::foreign_mod {
         sort: nm.sort,
         abi: nm.abi,
         view_items: vec::map(filtered_view_items, |x| fld.fold_view_item(*x)),
         items: filtered_items
-    };
+    }
 }
 
 fn fold_item_underscore(cx: ctxt, +item: ast::item_,

src/librustc/front/core_inject.rs

@@ -62,7 +62,7 @@ fn inject_libcore_ref(sess: Session,
             };
 
             let vis = vec::append(~[vi1], crate.module.view_items);
-            let mut new_module = {
+            let mut new_module = ast::_mod {
                 view_items: vis,
                 ../*bad*/copy crate.module
             };
@@ -95,7 +95,7 @@ fn inject_libcore_ref(sess: Session,
             let vis = vec::append(~[vi2], module.view_items);
 
             // XXX: Bad copy.
-            let new_module = { view_items: vis, ..copy module };
+            let new_module = ast::_mod { view_items: vis, ..copy module };
             fold::noop_fold_mod(new_module, fld)
         },
         ..*fold::default_ast_fold()

src/librustc/front/intrinsic_inject.rs

@@ -38,7 +38,7 @@ fn inject_intrinsic(sess: Session, crate: @ast::crate) -> @ast::crate {
 
     @ast::spanned {
         node: ast::crate_ {
-            module: {
+            module: ast::_mod {
                 items: items,
                 .. /*bad*/copy crate.node.module
             },