Skip to content

Commit 18bc439

Browse files
pcwaltonpcwalton
committed
---
yaml --- r: 39198 b: refs/heads/incoming c: 7eda4a5 h: refs/heads/master v: v3
1 parent b2a1cf0 commit 18bc439

File tree

11 files changed

+29
-29
lines changed

11 files changed

+29
-29
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: b6f1e3084fccac7bada780f285ea048ec8a56521
9+
refs/heads/incoming: 7eda4a567d30ecadc3f6bfa17e2911594ad6b1fa
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/incoming/src/librustdoc/desc_to_brief_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ mod test {
8585
fn mk_doc(source: ~str) -> doc::Doc {
8686
do astsrv::from_str(source) |srv| {
8787
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);
8989
run(srv, doc)
9090
}
9191
}

‎branches/incoming/src/librustdoc/markdown_index_pass.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ mod test {
239239
.. config::default_config(&Path("whatever"))
240240
};
241241
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);
245245
run(srv, doc, config)
246246
}
247247
}

‎branches/incoming/src/librustdoc/markdown_pass.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fn should_request_new_writer_for_each_page() {
115115
let (writer_factory, po) = markdown_writer::future_writer_factory();
116116
let (srv, doc) = test::create_doc_srv(~"mod a { }");
117117
// Split the document up into pages
118-
let doc = page_pass::mk_pass(config::DocPerMod).f(srv, doc);
118+
let doc = (page_pass::mk_pass(config::DocPerMod).f)(srv, doc);
119119
write_markdown(doc, move writer_factory);
120120
// We expect two pages to have been written
121121
for iter::repeat(2) {
@@ -147,7 +147,7 @@ fn should_write_title_for_each_page() {
147147
let (writer_factory, po) = markdown_writer::future_writer_factory();
148148
let (srv, doc) = test::create_doc_srv(
149149
~"#[link(name = \"core\")]; mod a { }");
150-
let doc = page_pass::mk_pass(config::DocPerMod).f(srv, doc);
150+
let doc = (page_pass::mk_pass(config::DocPerMod).f)(srv, doc);
151151
write_markdown(doc, move writer_factory);
152152
for iter::repeat(2) {
153153
let (page, markdown) = comm::recv(po);
@@ -814,21 +814,21 @@ mod test {
814814

815815
let doc = extract::from_srv(srv, ~"");
816816
debug!("doc (extract): %?", doc);
817-
let doc = tystr_pass::mk_pass().f(srv, doc);
817+
let doc = (tystr_pass::mk_pass().f)(srv, doc);
818818
debug!("doc (tystr): %?", doc);
819-
let doc = path_pass::mk_pass().f(srv, doc);
819+
let doc = (path_pass::mk_pass().f)(srv, doc);
820820
debug!("doc (path): %?", doc);
821-
let doc = attr_pass::mk_pass().f(srv, doc);
821+
let doc = (attr_pass::mk_pass().f)(srv, doc);
822822
debug!("doc (attr): %?", doc);
823-
let doc = desc_to_brief_pass::mk_pass().f(srv, doc);
823+
let doc = (desc_to_brief_pass::mk_pass().f)(srv, doc);
824824
debug!("doc (desc_to_brief): %?", doc);
825-
let doc = unindent_pass::mk_pass().f(srv, doc);
825+
let doc = (unindent_pass::mk_pass().f)(srv, doc);
826826
debug!("doc (unindent): %?", doc);
827-
let doc = sectionalize_pass::mk_pass().f(srv, doc);
827+
let doc = (sectionalize_pass::mk_pass().f)(srv, doc);
828828
debug!("doc (trim): %?", doc);
829-
let doc = trim_pass::mk_pass().f(srv, doc);
829+
let doc = (trim_pass::mk_pass().f)(srv, doc);
830830
debug!("doc (sectionalize): %?", doc);
831-
let doc = markdown_index_pass::mk_pass(config).f(srv, doc);
831+
let doc = (markdown_index_pass::mk_pass(config).f)(srv, doc);
832832
debug!("doc (index): %?", doc);
833833
(srv, doc)
834834
}
@@ -853,7 +853,7 @@ mod test {
853853
) -> ~str {
854854
let (writer_factory, po) = markdown_writer::future_writer_factory();
855855
let pass = mk_pass(move writer_factory);
856-
pass.f(srv, doc);
856+
(pass.f)(srv, doc);
857857
return comm::recv(po).second();
858858
}
859859

‎branches/incoming/src/librustdoc/markdown_writer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ mod test {
247247
fn mk_doc(+name: ~str, +source: ~str) -> doc::Doc {
248248
do astsrv::from_str(source) |srv| {
249249
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);
251251
doc
252252
}
253253
}

‎branches/incoming/src/librustdoc/sectionalize_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ mod test {
234234
fn mk_doc(source: ~str) -> doc::Doc {
235235
do astsrv::from_str(source) |srv| {
236236
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);
238238
run(srv, doc)
239239
}
240240
}

‎branches/incoming/src/librustdoc/sort_item_name_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn test() {
1414
let source = ~"mod z { } fn y() { }";
1515
do astsrv::from_str(source) |srv| {
1616
let doc = extract::from_srv(srv, ~"");
17-
let doc = mk_pass().f(srv, doc);
17+
let doc = (mk_pass().f)(srv, doc);
1818
assert doc.cratemod().items[0].name() == ~"y";
1919
assert doc.cratemod().items[1].name() == ~"z";
2020
}

‎branches/incoming/src/librustdoc/sort_item_type_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn test() {
3939
struct istruct { f: () }";
4040
do astsrv::from_str(source) |srv| {
4141
let doc = extract::from_srv(srv, ~"");
42-
let doc = mk_pass().f(srv, doc);
42+
let doc = (mk_pass().f)(srv, doc);
4343
assert doc.cratemod().items[0].name() == ~"iconst";
4444
assert doc.cratemod().items[1].name() == ~"itype";
4545
assert doc.cratemod().items[2].name() == ~"ienum";

‎branches/incoming/src/librustdoc/sort_pass.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fn test() {
5151
let source = ~"mod z { mod y { } fn x() { } } mod w { }";
5252
do astsrv::from_str(source) |srv| {
5353
let doc = extract::from_srv(srv, ~"");
54-
let doc = mk_pass(~"", name_lteq).f(srv, doc);
54+
let doc = (mk_pass(~"", name_lteq).f)(srv, doc);
5555
assert doc.cratemod().mods()[0].name() == ~"w";
5656
assert doc.cratemod().mods()[1].items[0].name() == ~"x";
5757
assert doc.cratemod().mods()[1].items[1].name() == ~"y";
@@ -68,10 +68,10 @@ fn should_be_stable() {
6868
let source = ~"mod a { mod b { } } mod c { mod d { } }";
6969
do astsrv::from_str(source) |srv| {
7070
let doc = extract::from_srv(srv, ~"");
71-
let doc = mk_pass(~"", always_eq).f(srv, doc);
71+
let doc = (mk_pass(~"", always_eq).f)(srv, doc);
7272
assert doc.cratemod().mods()[0].items[0].name() == ~"b";
7373
assert doc.cratemod().mods()[1].items[0].name() == ~"d";
74-
let doc = mk_pass(~"", always_eq).f(srv, doc);
74+
let doc = (mk_pass(~"", always_eq).f)(srv, doc);
7575
assert doc.cratemod().mods()[0].items[0].name() == ~"b";
7676
assert doc.cratemod().mods()[1].items[0].name() == ~"d";
7777
}

‎branches/incoming/src/librustdoc/text_pass.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@ mod test {
276276
fn mk_doc(source: ~str) -> doc::Doc {
277277
do astsrv::from_str(source) |srv| {
278278
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)
283283
}
284284
}
285285
}

‎branches/incoming/src/librustdoc/trim_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ mod test {
2525
fn mk_doc(source: ~str) -> doc::Doc {
2626
do astsrv::from_str(source) |srv| {
2727
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)
3030
}
3131
}
3232
}

0 commit comments

Comments
 (0)