about summary refs log tree commit diff
path: root/src/rustc/front
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-09-04 13:29:32 -0700
committerBrian Anderson <banderson@mozilla.com>2012-09-04 15:47:04 -0700
commit200959d7cef647b34e1d7cf7f4ed2c28b65fc7dc (patch)
treed2a2e790b95f73e30320d1e49b0566423ecb17a1 /src/rustc/front
parentef880f22450c4f7e455f431ff4603f90d443b545 (diff)
Remove 'with'
Diffstat (limited to 'src/rustc/front')
-rw-r--r--src/rustc/front/config.rs4
-rw-r--r--src/rustc/front/core_inject.rs4
-rw-r--r--src/rustc/front/intrinsic_inject.rs4
-rw-r--r--src/rustc/front/test.rs6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/rustc/front/config.rs b/src/rustc/front/config.rs
index 79b9baa77dd..ac970faf954 100644
--- a/src/rustc/front/config.rs
+++ b/src/rustc/front/config.rs
@@ -26,8 +26,8 @@ fn strip_items(crate: @ast::crate, in_cfg: in_cfg_pred)
     let precursor =
         @{fold_mod: |a,b| fold_mod(ctxt, a, b),
           fold_block: fold::wrap(|a,b| fold_block(ctxt, a, b) ),
-          fold_foreign_mod: |a,b| fold_foreign_mod(ctxt, a, b)
-          with *fold::default_ast_fold()};
+          fold_foreign_mod: |a,b| fold_foreign_mod(ctxt, a, b),
+          .. *fold::default_ast_fold()};
 
     let fold = fold::make_fold(precursor);
     let res = @fold.fold_crate(*crate);
diff --git a/src/rustc/front/core_inject.rs b/src/rustc/front/core_inject.rs
index e68a98f4ff5..7bdd2f06485 100644
--- a/src/rustc/front/core_inject.rs
+++ b/src/rustc/front/core_inject.rs
@@ -44,6 +44,6 @@ fn inject_libcore_ref(sess: session,
 
     let vis = vec::append(~[vi1, vi2], crate.node.module.view_items);
 
-    return @{node: {module: { view_items: vis with crate.node.module }
-                 with crate.node} with *crate }
+    return @{node: {module: { view_items: vis,.. crate.node.module },
+                 .. crate.node},.. *crate }
 }
diff --git a/src/rustc/front/intrinsic_inject.rs b/src/rustc/front/intrinsic_inject.rs
index cc184543b00..8fd885e8f8b 100644
--- a/src/rustc/front/intrinsic_inject.rs
+++ b/src/rustc/front/intrinsic_inject.rs
@@ -24,6 +24,6 @@ fn inject_intrinsic(sess: session,
 
     let items = vec::append(~[item], crate.node.module.items);
 
-    return @{node: {module: { items: items with crate.node.module }
-                 with crate.node} with *crate }
+    return @{node: {module: { items: items ,.. crate.node.module }
+                 ,.. crate.node} ,.. *crate }
 }
diff --git a/src/rustc/front/test.rs b/src/rustc/front/test.rs
index 62fed099e40..604a95a59b0 100644
--- a/src/rustc/front/test.rs
+++ b/src/rustc/front/test.rs
@@ -47,7 +47,7 @@ fn generate_test_harness(sess: session::session,
     let precursor =
         @{fold_crate: fold::wrap(|a,b| fold_crate(cx, a, b) ),
           fold_item: |a,b| fold_item(cx, a, b),
-          fold_mod: |a,b| fold_mod(cx, a, b) with *fold::default_ast_fold()};
+          fold_mod: |a,b| fold_mod(cx, a, b),.. *fold::default_ast_fold()};
 
     let fold = fold::make_fold(precursor);
     let res = @fold.fold_crate(*crate);
@@ -92,7 +92,7 @@ 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, folded.module) with folded};
+    return {module: add_test_module(cx, folded.module),.. folded};
 }
 
 
@@ -166,7 +166,7 @@ fn should_fail(i: @ast::item) -> bool {
 
 fn add_test_module(cx: test_ctxt, m: ast::_mod) -> ast::_mod {
     let testmod = mk_test_module(cx);
-    return {items: vec::append_one(m.items, testmod) with m};
+    return {items: vec::append_one(m.items, testmod),.. m};
 }
 
 /*