librustdoc: Parenthesize closure calls in tests to attempt to put out burning tinderbox. rs=rustbot

pcwalton · pcwalton · commit 7eda4a567d30 · 2012-12-03T17:08:52.000-08:00
diff --git a/src/librustdoc/desc_to_brief_pass.rs b/src/librustdoc/desc_to_brief_pass.rs
@@ -85,7 +85,7 @@ mod test {
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
-            let doc = attr_pass::mk_pass().f(srv, doc);
+            let doc = (attr_pass::mk_pass().f)(srv, doc);
             run(srv, doc)
         }
     }
diff --git a/src/librustdoc/markdown_index_pass.rs b/src/librustdoc/markdown_index_pass.rs
@@ -239,9 +239,9 @@ mod test {
                 .. config::default_config(&Path("whatever"))
             };
             let doc = extract::from_srv(srv, ~"");
-            let doc = attr_pass::mk_pass().f(srv, doc);
-            let doc = desc_to_brief_pass::mk_pass().f(srv, doc);
-            let doc = path_pass::mk_pass().f(srv, doc);
+            let doc = (attr_pass::mk_pass().f)(srv, doc);
+            let doc = (desc_to_brief_pass::mk_pass().f)(srv, doc);
+            let doc = (path_pass::mk_pass().f)(srv, doc);
             run(srv, doc, config)
         }
     }
diff --git a/src/librustdoc/markdown_pass.rs b/src/librustdoc/markdown_pass.rs
@@ -115,7 +115,7 @@ fn should_request_new_writer_for_each_page() {
     let (writer_factory, po) = markdown_writer::future_writer_factory();
     let (srv, doc) = test::create_doc_srv(~"mod a { }");
     // Split the document up into pages
-    let doc = page_pass::mk_pass(config::DocPerMod).f(srv, doc);
+    let doc = (page_pass::mk_pass(config::DocPerMod).f)(srv, doc);
     write_markdown(doc, move writer_factory);
     // We expect two pages to have been written
     for iter::repeat(2) {
@@ -147,7 +147,7 @@ fn should_write_title_for_each_page() {
     let (writer_factory, po) = markdown_writer::future_writer_factory();
     let (srv, doc) = test::create_doc_srv(
         ~"#[link(name = \"core\")]; mod a { }");
-    let doc = page_pass::mk_pass(config::DocPerMod).f(srv, doc);
+    let doc = (page_pass::mk_pass(config::DocPerMod).f)(srv, doc);
     write_markdown(doc, move writer_factory);
     for iter::repeat(2) {
         let (page, markdown) = comm::recv(po);
@@ -814,21 +814,21 @@ mod test {
 
             let doc = extract::from_srv(srv, ~"");
             debug!("doc (extract): %?", doc);
-            let doc = tystr_pass::mk_pass().f(srv, doc);
+            let doc = (tystr_pass::mk_pass().f)(srv, doc);
             debug!("doc (tystr): %?", doc);
-            let doc = path_pass::mk_pass().f(srv, doc);
+            let doc = (path_pass::mk_pass().f)(srv, doc);
             debug!("doc (path): %?", doc);
-            let doc = attr_pass::mk_pass().f(srv, doc);
+            let doc = (attr_pass::mk_pass().f)(srv, doc);
             debug!("doc (attr): %?", doc);
-            let doc = desc_to_brief_pass::mk_pass().f(srv, doc);
+            let doc = (desc_to_brief_pass::mk_pass().f)(srv, doc);
             debug!("doc (desc_to_brief): %?", doc);
-            let doc = unindent_pass::mk_pass().f(srv, doc);
+            let doc = (unindent_pass::mk_pass().f)(srv, doc);
             debug!("doc (unindent): %?", doc);
-            let doc = sectionalize_pass::mk_pass().f(srv, doc);
+            let doc = (sectionalize_pass::mk_pass().f)(srv, doc);
             debug!("doc (trim): %?", doc);
-            let doc = trim_pass::mk_pass().f(srv, doc);
+            let doc = (trim_pass::mk_pass().f)(srv, doc);
             debug!("doc (sectionalize): %?", doc);
-            let doc = markdown_index_pass::mk_pass(config).f(srv, doc);
+            let doc = (markdown_index_pass::mk_pass(config).f)(srv, doc);
             debug!("doc (index): %?", doc);
             (srv, doc)
         }
@@ -853,7 +853,7 @@ mod test {
     ) -> ~str {
         let (writer_factory, po) = markdown_writer::future_writer_factory();
         let pass = mk_pass(move writer_factory);
-        pass.f(srv, doc);
+        (pass.f)(srv, doc);
         return comm::recv(po).second();
     }
 
diff --git a/src/librustdoc/markdown_writer.rs b/src/librustdoc/markdown_writer.rs
@@ -247,7 +247,7 @@ mod test {
     fn mk_doc(+name: ~str, +source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, name);
-            let doc = path_pass::mk_pass().f(srv, doc);
+            let doc = (path_pass::mk_pass().f)(srv, doc);
             doc
         }
     }
diff --git a/src/librustdoc/sectionalize_pass.rs b/src/librustdoc/sectionalize_pass.rs
@@ -234,7 +234,7 @@ mod test {
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
-            let doc = attr_pass::mk_pass().f(srv, doc);
+            let doc = (attr_pass::mk_pass().f)(srv, doc);
             run(srv, doc)
         }
     }
diff --git a/src/librustdoc/sort_item_name_pass.rs b/src/librustdoc/sort_item_name_pass.rs
@@ -14,7 +14,7 @@ fn test() {
     let source = ~"mod z { } fn y() { }";
     do astsrv::from_str(source) |srv| {
         let doc = extract::from_srv(srv, ~"");
-        let doc = mk_pass().f(srv, doc);
+        let doc = (mk_pass().f)(srv, doc);
         assert doc.cratemod().items[0].name() == ~"y";
         assert doc.cratemod().items[1].name() == ~"z";
     }
diff --git a/src/librustdoc/sort_item_type_pass.rs b/src/librustdoc/sort_item_type_pass.rs
@@ -39,7 +39,7 @@ fn test() {
          struct istruct { f: () }";
     do astsrv::from_str(source) |srv| {
         let doc = extract::from_srv(srv, ~"");
-        let doc = mk_pass().f(srv, doc);
+        let doc = (mk_pass().f)(srv, doc);
         assert doc.cratemod().items[0].name() == ~"iconst";
         assert doc.cratemod().items[1].name() == ~"itype";
         assert doc.cratemod().items[2].name() == ~"ienum";
diff --git a/src/librustdoc/sort_pass.rs b/src/librustdoc/sort_pass.rs
@@ -51,7 +51,7 @@ fn test() {
     let source = ~"mod z { mod y { } fn x() { } } mod w { }";
     do astsrv::from_str(source) |srv| {
         let doc = extract::from_srv(srv, ~"");
-        let doc = mk_pass(~"", name_lteq).f(srv, doc);
+        let doc = (mk_pass(~"", name_lteq).f)(srv, doc);
         assert doc.cratemod().mods()[0].name() == ~"w";
         assert doc.cratemod().mods()[1].items[0].name() == ~"x";
         assert doc.cratemod().mods()[1].items[1].name() == ~"y";
@@ -68,10 +68,10 @@ fn should_be_stable() {
     let source = ~"mod a { mod b { } } mod c { mod d { } }";
     do astsrv::from_str(source) |srv| {
         let doc = extract::from_srv(srv, ~"");
-        let doc = mk_pass(~"", always_eq).f(srv, doc);
+        let doc = (mk_pass(~"", always_eq).f)(srv, doc);
         assert doc.cratemod().mods()[0].items[0].name() == ~"b";
         assert doc.cratemod().mods()[1].items[0].name() == ~"d";
-        let doc = mk_pass(~"", always_eq).f(srv, doc);
+        let doc = (mk_pass(~"", always_eq).f)(srv, doc);
         assert doc.cratemod().mods()[0].items[0].name() == ~"b";
         assert doc.cratemod().mods()[1].items[0].name() == ~"d";
     }
diff --git a/src/librustdoc/text_pass.rs b/src/librustdoc/text_pass.rs
@@ -276,10 +276,10 @@ mod test {
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
-            let doc = attr_pass::mk_pass().f(srv, doc);
-            let doc = desc_to_brief_pass::mk_pass().f(srv, doc);
-            let doc = sectionalize_pass::mk_pass().f(srv, doc);
-            mk_pass(~"", |s| str::trim(s) ).f(srv, doc)
+            let doc = (attr_pass::mk_pass().f)(srv, doc);
+            let doc = (desc_to_brief_pass::mk_pass().f)(srv, doc);
+            let doc = (sectionalize_pass::mk_pass().f)(srv, doc);
+            (mk_pass(~"", |s| str::trim(s) ).f)(srv, doc)
         }
     }
 }
diff --git a/src/librustdoc/trim_pass.rs b/src/librustdoc/trim_pass.rs
@@ -25,8 +25,8 @@ mod test {
     fn mk_doc(source: ~str) -> doc::Doc {
         do astsrv::from_str(source) |srv| {
             let doc = extract::from_srv(srv, ~"");
-            let doc = attr_pass::mk_pass().f(srv, doc);
-            mk_pass().f(srv, doc)
+            let doc = (attr_pass::mk_pass().f)(srv, doc);
+            (mk_pass().f)(srv, doc)
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ mod test {`
`85`	`85`	`fn mk_doc(source: ~str) -> doc::Doc {`
`86`	`86`	`do astsrv::from_str(source) \|srv\| {`
`87`	`87`	`let doc = extract::from_srv(srv, ~"");`
`88`		`- let doc = attr_pass::mk_pass().f(srv, doc);`
	`88`	`+ let doc = (attr_pass::mk_pass().f)(srv, doc);`
`89`	`89`	`run(srv, doc)`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,9 +239,9 @@ mod test {`
`239`	`239`	`.. config::default_config(&Path("whatever"))`
`240`	`240`	`};`
`241`	`241`	`let doc = extract::from_srv(srv, ~"");`
`242`		`- let doc = attr_pass::mk_pass().f(srv, doc);`
`243`		`- let doc = desc_to_brief_pass::mk_pass().f(srv, doc);`
`244`		`- let doc = path_pass::mk_pass().f(srv, doc);`
	`242`	`+ let doc = (attr_pass::mk_pass().f)(srv, doc);`
	`243`	`+ let doc = (desc_to_brief_pass::mk_pass().f)(srv, doc);`
	`244`	`+ let doc = (path_pass::mk_pass().f)(srv, doc);`
`245`	`245`	`run(srv, doc, config)`
`246`	`246`	`}`
`247`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ mod test {`
`247`	`247`	`fn mk_doc(+name: ~str, +source: ~str) -> doc::Doc {`
`248`	`248`	`do astsrv::from_str(source) \|srv\| {`
`249`	`249`	`let doc = extract::from_srv(srv, name);`
`250`		`- let doc = path_pass::mk_pass().f(srv, doc);`
	`250`	`+ let doc = (path_pass::mk_pass().f)(srv, doc);`
`251`	`251`	`doc`
`252`	`252`	`}`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ mod test {`
`234`	`234`	`fn mk_doc(source: ~str) -> doc::Doc {`
`235`	`235`	`do astsrv::from_str(source) \|srv\| {`
`236`	`236`	`let doc = extract::from_srv(srv, ~"");`
`237`		`- let doc = attr_pass::mk_pass().f(srv, doc);`
	`237`	`+ let doc = (attr_pass::mk_pass().f)(srv, doc);`
`238`	`238`	`run(srv, doc)`
`239`	`239`	`}`
`240`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ fn test() {`
`14`	`14`	`let source = ~"mod z { } fn y() { }";`
`15`	`15`	`do astsrv::from_str(source) \|srv\| {`
`16`	`16`	`let doc = extract::from_srv(srv, ~"");`
`17`		`- let doc = mk_pass().f(srv, doc);`
	`17`	`+ let doc = (mk_pass().f)(srv, doc);`
`18`	`18`	`assert doc.cratemod().items[0].name() == ~"y";`
`19`	`19`	`assert doc.cratemod().items[1].name() == ~"z";`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,10 +276,10 @@ mod test {`
`276`	`276`	`fn mk_doc(source: ~str) -> doc::Doc {`
`277`	`277`	`do astsrv::from_str(source) \|srv\| {`
`278`	`278`	`let doc = extract::from_srv(srv, ~"");`
`279`		`- let doc = attr_pass::mk_pass().f(srv, doc);`
`280`		`- let doc = desc_to_brief_pass::mk_pass().f(srv, doc);`
`281`		`- let doc = sectionalize_pass::mk_pass().f(srv, doc);`
`282`		`- mk_pass(~"", \|s\| str::trim(s) ).f(srv, doc)`
	`279`	`+ let doc = (attr_pass::mk_pass().f)(srv, doc);`
	`280`	`+ let doc = (desc_to_brief_pass::mk_pass().f)(srv, doc);`
	`281`	`+ let doc = (sectionalize_pass::mk_pass().f)(srv, doc);`
	`282`	`+ (mk_pass(~"", \|s\| str::trim(s) ).f)(srv, doc)`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ mod test {`
`25`	`25`	`fn mk_doc(source: ~str) -> doc::Doc {`
`26`	`26`	`do astsrv::from_str(source) \|srv\| {`
`27`	`27`	`let doc = extract::from_srv(srv, ~"");`
`28`		`- let doc = attr_pass::mk_pass().f(srv, doc);`
`29`		`- mk_pass().f(srv, doc)`
	`28`	`+ let doc = (attr_pass::mk_pass().f)(srv, doc);`
	`29`	`+ (mk_pass().f)(srv, doc)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`