Remove 'with'

15 files changed, 162 insertions, 162 deletions

diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index 33ff45a7d92..7e4d89e5bb4 100644
--- a/src/rustdoc/attr_pass.rs
+++ b/src/rustdoc/attr_pass.rs
@@ -30,8 +30,8 @@ fn run(
         fold_item: fold_item,
         fold_enum: fold_enum,
         fold_trait: fold_trait,
-        fold_impl: fold_impl
-        with *fold::default_any_fold(srv)
+        fold_impl: fold_impl,
+        .. *fold::default_any_fold(srv)
     });
     fold.fold_doc(fold, doc)
 }
@@ -52,10 +52,10 @@ fn fold_crate(
     {
         topmod: doc::moddoc_({
             item: {
-                name: option::get_default(attrs.name, doc.topmod.name())
-                with doc.topmod.item
-            }
-            with *doc.topmod
+                name: option::get_default(attrs.name, doc.topmod.name()),
+                .. doc.topmod.item
+            },
+            .. *doc.topmod
         })
     }
 }
@@ -84,8 +84,8 @@ fn fold_item(
     };
 
     {
-        desc: desc
-        with doc
+        desc: desc,
+        .. doc
     }
 }
 
@@ -162,11 +162,11 @@ fn fold_enum(
             };
 
             {
-                desc: desc
-                with variant
+                desc: desc,
+                .. variant
             }
-        }
-        with doc
+        },
+        .. doc
     }
 }
 
@@ -191,8 +191,8 @@ fn fold_trait(
     let doc = fold::default_seq_fold_trait(fold, doc);
 
     {
-        methods: merge_method_attrs(srv, doc.id(), doc.methods)
-        with doc
+        methods: merge_method_attrs(srv, doc.id(), doc.methods),
+        .. doc
     }
 }
 
@@ -235,8 +235,8 @@ fn merge_method_attrs(
         let desc = attrs.second();
 
         {
-            desc: desc
-            with doc
+            desc: desc,
+            .. doc
         }
     }
 }
@@ -266,8 +266,8 @@ fn fold_impl(
     let doc = fold::default_seq_fold_impl(fold, doc);
 
     {
-        methods: merge_method_attrs(srv, doc.id(), doc.methods)
-        with doc
+        methods: merge_method_attrs(srv, doc.id(), doc.methods),
+        .. doc
     }
 }
 
diff --git a/src/rustdoc/config.rs b/src/rustdoc/config.rs
index 165077e8160..d30e41590f7 100644
--- a/src/rustdoc/config.rs
+++ b/src/rustdoc/config.rs
@@ -141,8 +141,8 @@ fn config_from_opts(
         let output_dir = getopts::opt_maybe_str(matches, opt_output_dir());
         let output_dir = option::map(output_dir, |s| Path(s));
         result::Ok({
-            output_dir: option::get_default(output_dir, config.output_dir)
-            with config
+            output_dir: option::get_default(output_dir, config.output_dir),
+            .. config
         })
     };
     let result = do result::chain(result) |config| {
@@ -154,8 +154,8 @@ fn config_from_opts(
                 |output_format| {
 
                 result::Ok({
-                    output_format: output_format
-                    with config
+                    output_format: output_format,
+                    .. config
                 })
             }
         }
@@ -168,8 +168,8 @@ fn config_from_opts(
             do result::chain(parse_output_style(output_style))
                 |output_style| {
                 result::Ok({
-                    output_style: output_style
-                    with config
+                    output_style: output_style,
+                    .. config
                 })
             }
         }
@@ -180,8 +180,8 @@ fn config_from_opts(
             config, pandoc_cmd, program_output);
         do result::chain(pandoc_cmd) |pandoc_cmd| {
             result::Ok({
-                pandoc_cmd: pandoc_cmd
-                with config
+                pandoc_cmd: pandoc_cmd,
+                .. config
             })
         }
     };
@@ -241,8 +241,8 @@ fn maybe_find_pandoc(
 #[test]
 fn should_find_pandoc() {
     let config = {
-        output_format: pandoc_html
-        with default_config(&Path("test"))
+        output_format: pandoc_html,
+        .. default_config(&Path("test"))
     };
     let mock_program_output = fn~(_prog: &str, _args: &[~str]) -> {
         status: int, out: ~str, err: ~str
@@ -258,8 +258,8 @@ fn should_find_pandoc() {
 #[test]
 fn should_error_with_no_pandoc() {
     let config = {
-        output_format: pandoc_html
-        with default_config(&Path("test"))
+        output_format: pandoc_html,
+        .. default_config(&Path("test"))
     };
     let mock_program_output = fn~(_prog: &str, _args: &[~str]) -> {
         status: int, out: ~str, err: ~str
diff --git a/src/rustdoc/desc_to_brief_pass.rs b/src/rustdoc/desc_to_brief_pass.rs
index a04772097e2..cfccae19833 100644
--- a/src/rustdoc/desc_to_brief_pass.rs
+++ b/src/rustdoc/desc_to_brief_pass.rs
@@ -23,8 +23,8 @@ fn run(
     let fold = fold::fold({
         fold_item: fold_item,
         fold_trait: fold_trait,
-        fold_impl: fold_impl
-        with *fold::default_any_fold(())
+        fold_impl: fold_impl,
+        .. *fold::default_any_fold(())
     });
     fold.fold_doc(fold, doc)
 }
@@ -33,8 +33,8 @@ fn fold_item(fold: fold::fold<()>, doc: doc::itemdoc) -> doc::itemdoc {
     let doc = fold::default_seq_fold_item(fold, doc);
 
     {
-        brief: extract(doc.desc)
-        with doc
+        brief: extract(doc.desc),
+        .. doc
     }
 }
 
@@ -43,10 +43,10 @@ fn fold_trait(fold: fold::fold<()>, doc: doc::traitdoc) -> doc::traitdoc {
 
     {
         methods: par::map(doc.methods, |doc| {
-            brief: extract(doc.desc)
-            with doc
-        })
-        with doc
+            brief: extract(doc.desc),
+            .. doc
+        }),
+        .. doc
     }
 }
 
@@ -55,10 +55,10 @@ fn fold_impl(fold: fold::fold<()>, doc: doc::impldoc) -> doc::impldoc {
 
     {
         methods: par::map(doc.methods, |doc| {
-            brief: extract(doc.desc)
-            with doc
-        })
-        with doc
+            brief: extract(doc.desc),
+            .. doc
+        }),
+        .. doc
     }
 }
 
diff --git a/src/rustdoc/fold.rs b/src/rustdoc/fold.rs
index 45d4882a87b..5dcbfb664ea 100644
--- a/src/rustdoc/fold.rs
+++ b/src/rustdoc/fold.rs
@@ -142,8 +142,8 @@ fn default_seq_fold_doc<T>(fold: fold<T>, doc: doc::doc) -> doc::doc {
                 doc::itempage(fold_itemtag(fold, doc))
               }
             }
-        }
-        with *doc
+        },
+        .. *doc
     })
 }
 
@@ -171,8 +171,8 @@ fn default_any_fold_mod<T:send copy>(
         item: fold.fold_item(fold, doc.item),
         items: par::map(doc.items, |itemtag, copy fold| {
             fold_itemtag(fold, itemtag)
-        })
-        with *doc
+        }),
+        .. *doc
     })
 }
 
@@ -184,8 +184,8 @@ fn default_seq_fold_mod<T>(
         item: fold.fold_item(fold, doc.item),
         items: vec::map(doc.items, |itemtag| {
             fold_itemtag(fold, itemtag)
-        })
-        with *doc
+        }),
+        .. *doc
     })
 }
 
@@ -197,8 +197,8 @@ fn default_par_fold_mod<T:send copy>(
         item: fold.fold_item(fold, doc.item),
         items: par::map(doc.items, |itemtag, copy fold| {
             fold_itemtag(fold, itemtag)
-        })
-        with *doc
+        }),
+        .. *doc
     })
 }
 
@@ -210,8 +210,8 @@ fn default_any_fold_nmod<T:send copy>(
         item: fold.fold_item(fold, doc.item),
         fns: par::map(doc.fns, |fndoc, copy fold| {
             fold.fold_fn(fold, fndoc)
-        })
-        with doc
+        }),
+        .. doc
     }
 }
 
@@ -223,8 +223,8 @@ fn default_seq_fold_nmod<T>(
         item: fold.fold_item(fold, doc.item),
         fns: vec::map(doc.fns, |fndoc| {
             fold.fold_fn(fold, fndoc)
-        })
-        with doc
+        }),
+        .. doc
     }
 }
 
@@ -236,8 +236,8 @@ fn default_par_fold_nmod<T:send copy>(
         item: fold.fold_item(fold, doc.item),
         fns: par::map(doc.fns, |fndoc, copy fold| {
             fold.fold_fn(fold, fndoc)
-        })
-        with doc
+        }),
+        .. doc
     }
 }
 
@@ -275,8 +275,8 @@ fn default_seq_fold_fn<T>(
     doc: doc::fndoc
 ) -> doc::fndoc {
     {
-        item: fold.fold_item(fold, doc.item)
-        with doc
+        item: fold.fold_item(fold, doc.item),
+        .. doc
     }
 }
 
@@ -285,8 +285,8 @@ fn default_seq_fold_const<T>(
     doc: doc::constdoc
 ) -> doc::constdoc {
     {
-        item: fold.fold_item(fold, doc.item)
-        with doc
+        item: fold.fold_item(fold, doc.item),
+        .. doc
     }
 }
 
@@ -295,8 +295,8 @@ fn default_seq_fold_enum<T>(
     doc: doc::enumdoc
 ) -> doc::enumdoc {
     {
-        item: fold.fold_item(fold, doc.item)
-        with doc
+        item: fold.fold_item(fold, doc.item),
+        .. doc
     }
 }
 
@@ -305,8 +305,8 @@ fn default_seq_fold_trait<T>(
     doc: doc::traitdoc
 ) -> doc::traitdoc {
     {
-        item: fold.fold_item(fold, doc.item)
-        with doc
+        item: fold.fold_item(fold, doc.item),
+        .. doc
     }
 }
 
@@ -315,8 +315,8 @@ fn default_seq_fold_impl<T>(
     doc: doc::impldoc
 ) -> doc::impldoc {
     {
-        item: fold.fold_item(fold, doc.item)
-        with doc
+        item: fold.fold_item(fold, doc.item),
+        .. doc
     }
 }
 
@@ -325,8 +325,8 @@ fn default_seq_fold_type<T>(
     doc: doc::tydoc
 ) -> doc::tydoc {
     {
-        item: fold.fold_item(fold, doc.item)
-        with doc
+        item: fold.fold_item(fold, doc.item),
+        .. doc
     }
 }
 
diff --git a/src/rustdoc/markdown_index_pass.rs b/src/rustdoc/markdown_index_pass.rs
index 8bc62aaf422..6897f3b2938 100644
--- a/src/rustdoc/markdown_index_pass.rs
+++ b/src/rustdoc/markdown_index_pass.rs
@@ -20,8 +20,8 @@ fn run(
 ) -> doc::doc {
     let fold = fold::fold({
         fold_mod: fold_mod,
-        fold_nmod: fold_nmod
-        with *fold::default_any_fold(config)
+        fold_nmod: fold_nmod,
+        .. *fold::default_any_fold(config)
     });
     fold.fold_doc(fold, doc)
 }
@@ -34,8 +34,8 @@ fn fold_mod(
     let doc = fold::default_any_fold_mod(fold, doc);
 
     doc::moddoc_({
-        index: Some(build_mod_index(doc, fold.ctxt))
-        with *doc
+        index: Some(build_mod_index(doc, fold.ctxt)),
+        .. *doc
     })
 }
 
@@ -47,8 +47,8 @@ fn fold_nmod(
     let doc = fold::default_any_fold_nmod(fold, doc);
 
     {
-        index: Some(build_nmod_index(doc, fold.ctxt))
-        with doc
+        index: Some(build_nmod_index(doc, fold.ctxt)),
+        .. doc
     }
 }
 
@@ -229,8 +229,8 @@ mod test {
     fn mk_doc(output_style: config::output_style, source: ~str) -> doc::doc {
         do astsrv::from_str(source) |srv| {
             let config = {
-                output_style: output_style
-                with config::default_config(&Path("whatever"))
+                output_style: output_style,
+                .. config::default_config(&Path("whatever"))
             };
             let doc = extract::from_srv(srv, ~"");
             let doc = attr_pass::mk_pass().f(srv, doc);
diff --git a/src/rustdoc/markdown_pass.rs b/src/rustdoc/markdown_pass.rs
index 850f78c8fa4..cd743e5609d 100644
--- a/src/rustdoc/markdown_pass.rs
+++ b/src/rustdoc/markdown_pass.rs
@@ -537,12 +537,12 @@ fn should_correctly_indent_fn_signature() {
             doc::cratepage({
                 topmod: doc::moddoc_({
                     items: ~[doc::fntag({
-                        sig: Some(~"line 1\nline 2")
-                        with doc.cratemod().fns()[0]
-                    })]
-                    with *doc.cratemod()
-                })
-                with doc.cratedoc()
+                        sig: Some(~"line 1\nline 2"),
+                        .. doc.cratemod().fns()[0]
+                    })],
+                    .. *doc.cratemod()
+                }),
+                .. doc.cratedoc()
             })
         ]
     });
@@ -784,8 +784,8 @@ mod test {
         do astsrv::from_str(source) |srv| {
 
             let config = {
-                output_style: config::doc_per_crate
-                with config::default_config(&Path("whatever"))
+                output_style: config::doc_per_crate,
+                .. config::default_config(&Path("whatever"))
             };
 
             let doc = extract::from_srv(srv, ~"");
diff --git a/src/rustdoc/markdown_writer.rs b/src/rustdoc/markdown_writer.rs
index 7b856d69e2d..b44ba7bcb44 100644
--- a/src/rustdoc/markdown_writer.rs
+++ b/src/rustdoc/markdown_writer.rs
@@ -205,8 +205,8 @@ fn should_use_markdown_file_name_based_off_crate() {
     let config = {
         output_dir: Path("output/dir"),
         output_format: config::markdown,
-        output_style: config::doc_per_crate
-        with config::default_config(&Path("input/test.rc"))
+        output_style: config::doc_per_crate,
+        .. config::default_config(&Path("input/test.rc"))
     };
     let doc = test::mk_doc(~"test", ~"");
     let page = doc::cratepage(doc.cratedoc());
@@ -219,8 +219,8 @@ fn should_name_html_crate_file_name_index_html_when_doc_per_mod() {
     let config = {
         output_dir: Path("output/dir"),
         output_format: config::pandoc_html,
-        output_style: config::doc_per_mod
-        with config::default_config(&Path("input/test.rc"))
+        output_style: config::doc_per_mod,
+        .. config::default_config(&Path("input/test.rc"))
     };
     let doc = test::mk_doc(~"", ~"");
     let page = doc::cratepage(doc.cratedoc());
@@ -233,8 +233,8 @@ fn should_name_mod_file_names_by_path() {
     let config = {
         output_dir: Path("output/dir"),
         output_format: config::pandoc_html,
-        output_style: config::doc_per_mod
-        with config::default_config(&Path("input/test.rc"))
+        output_style: config::doc_per_mod,
+        .. config::default_config(&Path("input/test.rc"))
     };
     let doc = test::mk_doc(~"", ~"mod a { mod b { } }");
     let modb = doc.cratemod().mods()[0].mods()[0];
diff --git a/src/rustdoc/page_pass.rs b/src/rustdoc/page_pass.rs
index ea2843707db..a8500c8e400 100644
--- a/src/rustdoc/page_pass.rs
+++ b/src/rustdoc/page_pass.rs
@@ -60,8 +60,8 @@ fn find_pages(doc: doc::doc, page_chan: page_chan) {
     let fold = fold::fold({
         fold_crate: fold_crate,
         fold_mod: fold_mod,
-        fold_nmod: fold_nmod
-        with *fold::default_any_fold(page_chan)
+        fold_nmod: fold_nmod,
+        .. *fold::default_any_fold(page_chan)
     });
     fold.fold_doc(fold, doc);
 
@@ -76,8 +76,8 @@ fn fold_crate(
     let doc = fold::default_seq_fold_crate(fold, doc);
 
     let page = doc::cratepage({
-        topmod: strip_mod(doc.topmod)
-        with doc
+        topmod: strip_mod(doc.topmod),
+        .. doc
     });
 
     comm::send(fold.ctxt, Some(page));
@@ -110,8 +110,8 @@ fn strip_mod(doc: doc::moddoc) -> doc::moddoc {
               doc::nmodtag(_) => false,
               _ => true
             }
-        }
-        with *doc
+        },
+        .. *doc
     })
 }
 
diff --git a/src/rustdoc/path_pass.rs b/src/rustdoc/path_pass.rs
index f1a882ab7cb..23cd67cf875 100644
--- a/src/rustdoc/path_pass.rs
+++ b/src/rustdoc/path_pass.rs
@@ -26,16 +26,16 @@ fn run(srv: astsrv::srv, doc: doc::doc) -> doc::doc {
     let fold = fold::fold({
         fold_item: fold_item,
         fold_mod: fold_mod,
-        fold_nmod: fold_nmod
-        with *fold::default_any_fold(ctxt)
+        fold_nmod: fold_nmod,
+        .. *fold::default_any_fold(ctxt)
     });
     fold.fold_doc(fold, doc)
 }
 
 fn fold_item(fold: fold::fold<ctxt>, doc: doc::itemdoc) -> doc::itemdoc {
     {
-        path: fold.ctxt.path
-        with doc
+        path: fold.ctxt.path,
+        .. doc
     }
 }
 
@@ -48,8 +48,8 @@ fn fold_mod(fold: fold::fold<ctxt>, doc: doc::moddoc) -> doc::moddoc {
     if !is_topmod { vec::pop(fold.ctxt.path); }
 
     doc::moddoc_({
-        item: fold.fold_item(fold, doc.item)
-        with *doc
+        item: fold.fold_item(fold, doc.item),
+        .. *doc
     })
 }
 
@@ -59,8 +59,8 @@ fn fold_nmod(fold: fold::fold<ctxt>, doc: doc::nmoddoc) -> doc::nmoddoc {
     vec::pop(fold.ctxt.path);
 
     {
-        item: fold.fold_item(fold, doc.item)
-        with doc
+        item: fold.fold_item(fold, doc.item),
+        .. doc
     }
 }
 
diff --git a/src/rustdoc/prune_hidden_pass.rs b/src/rustdoc/prune_hidden_pass.rs
index 970c081903a..af0c8a19702 100644
--- a/src/rustdoc/prune_hidden_pass.rs
+++ b/src/rustdoc/prune_hidden_pass.rs
@@ -13,8 +13,8 @@ fn mk_pass() -> pass {
 
 fn run(srv: astsrv::srv, doc: doc::doc) -> doc::doc {
     let fold = fold::fold({
-        fold_mod: fold_mod
-        with *fold::default_any_fold(srv)
+        fold_mod: fold_mod,
+        .. *fold::default_any_fold(srv)
     });
     fold.fold_doc(fold, doc)
 }
@@ -28,8 +28,8 @@ fn fold_mod(
     doc::moddoc_({
         items: vec::filter(doc.items, |itemtag| {
             !is_hidden(fold.ctxt, itemtag.item())
-        })
-        with *doc
+        }),
+        .. *doc
     })
 }
 
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index c55579adb41..c3f6bc476c1 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -53,8 +53,8 @@ fn test_run_passes() {
                 doc::cratepage({
                     topmod: doc::moddoc_({
                         item: {
-                            name: doc.cratemod().name() + ~"two"
-                            with doc.cratemod().item
+                            name: doc.cratemod().name() + ~"two",
+                            .. doc.cratemod().item
                         },
                         items: ~[],
                         index: None
@@ -72,8 +72,8 @@ fn test_run_passes() {
                 doc::cratepage({
                     topmod: doc::moddoc_({
                         item: {
-                            name: doc.cratemod().name() + ~"three"
-                            with doc.cratemod().item
+                            name: doc.cratemod().name() + ~"three",
+                            .. doc.cratemod().item
                         },
                         items: ~[],
                         index: None
diff --git a/src/rustdoc/sectionalize_pass.rs b/src/rustdoc/sectionalize_pass.rs
index 72869a6a7c4..1a156b9d2a3 100644
--- a/src/rustdoc/sectionalize_pass.rs
+++ b/src/rustdoc/sectionalize_pass.rs
@@ -15,8 +15,8 @@ fn run(_srv: astsrv::srv, doc: doc::doc) -> doc::doc {
     let fold = fold::fold({
         fold_item: fold_item,
         fold_trait: fold_trait,
-        fold_impl: fold_impl
-        with *fold::default_any_fold(())
+        fold_impl: fold_impl,
+        .. *fold::default_any_fold(())
     });
     fold.fold_doc(fold, doc)
 }
@@ -27,8 +27,8 @@ fn fold_item(fold: fold::fold<()>, doc: doc::itemdoc) -> doc::itemdoc {
 
     {
         desc: desc,
-        sections: sections
-        with doc
+        sections: sections,
+        .. doc
     }
 }
 
@@ -41,11 +41,11 @@ fn fold_trait(fold: fold::fold<()>, doc: doc::traitdoc) -> doc::traitdoc {
 
             {
                 desc: desc,
-                sections: sections
-                with method
+                sections: sections,
+                ..method
             }
-        }
-        with doc
+        },
+        .. doc
     }
 }
 
@@ -58,11 +58,11 @@ fn fold_impl(fold: fold::fold<()>, doc: doc::impldoc) -> doc::impldoc {
 
             {
                 desc: desc,
-                sections: sections
-                with method
+                sections: sections,
+                .. method
             }
-        }
-        with doc
+        },
+        .. doc
     }
 }
 
@@ -109,8 +109,8 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::section]) {
             match copy current_section {
               Some(section) => {
                 current_section = Some({
-                    body: section.body + ~"\n" + line
-                    with section
+                    body: section.body + ~"\n" + line,
+                    .. section
                 });
               }
               None => {
diff --git a/src/rustdoc/sort_pass.rs b/src/rustdoc/sort_pass.rs
index 895c98707d1..971b3200be1 100644
--- a/src/rustdoc/sort_pass.rs
+++ b/src/rustdoc/sort_pass.rs
@@ -23,8 +23,8 @@ fn run(
     lteq: item_lteq
 ) -> doc::doc {
     let fold = fold::fold({
-        fold_mod: fold_mod
-        with *fold::default_any_fold(lteq)
+        fold_mod: fold_mod,
+        .. *fold::default_any_fold(lteq)
     });
     fold.fold_doc(fold, doc)
 }
@@ -36,8 +36,8 @@ fn fold_mod(
 ) -> doc::moddoc {
     let doc = fold::default_any_fold_mod(fold, doc);
     doc::moddoc_({
-        items: sort::merge_sort(fold.ctxt, doc.items)
-        with *doc
+        items: sort::merge_sort(fold.ctxt, doc.items),
+        .. *doc
     })
 }
 
diff --git a/src/rustdoc/text_pass.rs b/src/rustdoc/text_pass.rs
index 58285f6d857..e82abf46795 100644
--- a/src/rustdoc/text_pass.rs
+++ b/src/rustdoc/text_pass.rs
@@ -25,8 +25,8 @@ fn run(
         fold_item: fold_item,
         fold_enum: fold_enum,
         fold_trait: fold_trait,
-        fold_impl: fold_impl
-        with *fold::default_any_fold(op)
+        fold_impl: fold_impl,
+        .. *fold::default_any_fold(op)
     });
     fold.fold_doc(fold, doc)
 }
@@ -41,8 +41,8 @@ fn fold_item(fold: fold::fold<op>, doc: doc::itemdoc) -> doc::itemdoc {
     {
         brief: maybe_apply_op(fold.ctxt, doc.brief),
         desc: maybe_apply_op(fold.ctxt, doc.desc),
-        sections: apply_to_sections(fold.ctxt, doc.sections)
-        with doc
+        sections: apply_to_sections(fold.ctxt, doc.sections),
+        .. doc
     }
 }
 
@@ -59,11 +59,11 @@ fn fold_enum(fold: fold::fold<op>, doc: doc::enumdoc) -> doc::enumdoc {
     {
         variants: do par::map(doc.variants) |variant, copy fold| {
             {
-                desc: maybe_apply_op(fold.ctxt, variant.desc)
-                with variant
+                desc: maybe_apply_op(fold.ctxt, variant.desc),
+                .. variant
             }
-        }
-        with doc
+        },
+        .. doc
     }
 }
 
@@ -71,8 +71,8 @@ fn fold_trait(fold: fold::fold<op>, doc: doc::traitdoc) -> doc::traitdoc {
     let doc = fold::default_seq_fold_trait(fold, doc);
 
     {
-        methods: apply_to_methods(fold.ctxt, doc.methods)
-        with doc
+        methods: apply_to_methods(fold.ctxt, doc.methods),
+        .. doc
     }
 }
 
@@ -81,8 +81,8 @@ fn apply_to_methods(op: op, docs: ~[doc::methoddoc]) -> ~[doc::methoddoc] {
         {
             brief: maybe_apply_op(op, doc.brief),
             desc: maybe_apply_op(op, doc.desc),
-            sections: apply_to_sections(op, doc.sections)
-            with doc
+            sections: apply_to_sections(op, doc.sections),
+            .. doc
         }
     }
 }
@@ -91,8 +91,8 @@ fn fold_impl(fold: fold::fold<op>, doc: doc::impldoc) -> doc::impldoc {
     let doc = fold::default_seq_fold_impl(fold, doc);
 
     {
-        methods: apply_to_methods(fold.ctxt, doc.methods)
-        with doc
+        methods: apply_to_methods(fold.ctxt, doc.methods),
+        .. doc
     }
 }
 
diff --git a/src/rustdoc/tystr_pass.rs b/src/rustdoc/tystr_pass.rs
index 2be025f9846..518d0ae565f 100644
--- a/src/rustdoc/tystr_pass.rs
+++ b/src/rustdoc/tystr_pass.rs
@@ -26,8 +26,8 @@ fn run(
         fold_enum: fold_enum,
         fold_trait: fold_trait,
         fold_impl: fold_impl,
-        fold_type: fold_type
-        with *fold::default_any_fold(srv)
+        fold_type: fold_type,
+        .. *fold::default_any_fold(srv)
     });
     fold.fold_doc(fold, doc)
 }
@@ -40,8 +40,8 @@ fn fold_fn(
     let srv = fold.ctxt;
 
     {
-        sig: get_fn_sig(srv, doc.id())
-        with doc
+        sig: get_fn_sig(srv, doc.id()),
+        .. doc
     }
 }
 
@@ -91,8 +91,8 @@ fn fold_const(
               }
               _ => fail ~"fold_const: id not bound to a const item"
             }
-        })
-        with doc
+        }),
+        .. doc
     }
 }
 
@@ -128,11 +128,11 @@ fn fold_enum(
             };
 
             {
-                sig: Some(sig)
-                with variant
+                sig: Some(sig),
+                .. variant
             }
-        }
-        with doc
+        },
+        .. doc
     }
 }
 
@@ -147,8 +147,8 @@ fn fold_trait(
     doc: doc::traitdoc
 ) -> doc::traitdoc {
     {
-        methods: merge_methods(fold.ctxt, doc.id(), doc.methods)
-        with doc
+        methods: merge_methods(fold.ctxt, doc.id(), doc.methods),
+        .. doc
     }
 }
 
@@ -159,8 +159,8 @@ fn merge_methods(
 ) -> ~[doc::methoddoc] {
     do par::map(docs) |doc| {
         {
-            sig: get_method_sig(srv, item_id, doc.name)
-            with doc
+            sig: get_method_sig(srv, item_id, doc.name),
+            .. doc
         }
     }
 }
@@ -258,8 +258,8 @@ fn fold_impl(
     {
         trait_types: trait_types,
         self_ty: self_ty,
-        methods: merge_methods(fold.ctxt, doc.id(), doc.methods)
-        with doc
+        methods: merge_methods(fold.ctxt, doc.id(), doc.methods),
+        .. doc
     }
 }
 
@@ -311,8 +311,8 @@ fn fold_type(
               }
               _ => fail ~"expected type"
             }
-        }
-        with doc
+        },
+        .. doc
     }
 }