Skip to content

Commit 85e79a3

Browse files
z0w0eholk
z0w0
authored and
eholk
committed
Get rustdoc working with std::par instead of its own par library. Closes #2885.
1 parent c8739cb commit 85e79a3

12 files changed

+29
-60
lines changed

‎src/rustdoc/attr_pass.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ fn fold_enum(
143143
let doc = fold::default_seq_fold_enum(fold, doc);
144144

145145
{
146-
variants: do par::anymap(doc.variants) |variant| {
146+
variants: do par::map(doc.variants) |variant| {
147147
let desc = do astsrv::exec(srv) |ctxt| {
148148
alt check ctxt.ast_map.get(doc_id) {
149149
ast_map::node_item(@{
@@ -206,7 +206,7 @@ fn merge_method_attrs(
206206
ast_map::node_item(@{
207207
node: ast::item_trait(_, methods), _
208208
}, _) {
209-
par::seqmap(methods, |method| {
209+
vec::map(methods, |method| {
210210
alt method {
211211
ast::required(ty_m) {
212212
(*ty_m.ident, attr_parser::parse_desc(ty_m.attrs))
@@ -220,7 +220,7 @@ fn merge_method_attrs(
220220
ast_map::node_item(@{
221221
node: ast::item_impl(_, _, _, methods), _
222222
}, _) {
223-
par::seqmap(methods, |method| {
223+
vec::map(methods, |method| {
224224
(*method.ident, attr_parser::parse_desc(method.attrs))
225225
})
226226
}

‎src/rustdoc/desc_to_brief_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn fold_trait(fold: fold::fold<()>, doc: doc::traitdoc) -> doc::traitdoc {
4040
let doc =fold::default_seq_fold_trait(fold, doc);
4141

4242
{
43-
methods: par::anymap(doc.methods, |doc| {
43+
methods: par::map(doc.methods, |doc| {
4444
brief: extract(doc.desc)
4545
with doc
4646
})
@@ -52,7 +52,7 @@ fn fold_impl(fold: fold::fold<()>, doc: doc::impldoc) -> doc::impldoc {
5252
let doc =fold::default_seq_fold_impl(fold, doc);
5353

5454
{
55-
methods: par::anymap(doc.methods, |doc| {
55+
methods: par::map(doc.methods, |doc| {
5656
brief: extract(doc.desc)
5757
with doc
5858
})

‎src/rustdoc/extract.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fn nmoddoc_from_mod(
113113
) -> doc::nmoddoc {
114114
{
115115
item: itemdoc,
116-
fns: do par::seqmap(module.items) |item| {
116+
fns: do vec::map(module.items) |item| {
117117
let itemdoc = mk_itemdoc(item.id, item.ident);
118118
alt item.node {
119119
ast::foreign_item_fn(_, _) {
@@ -159,7 +159,7 @@ fn enumdoc_from_enum(
159159
fn variantdocs_from_variants(
160160
variants: ~[ast::variant]
161161
) -> ~[doc::variantdoc] {
162-
par::seqmap(variants, variantdoc_from_variant)
162+
vec::map(variants, variantdoc_from_variant)
163163
}
164164

165165
fn variantdoc_from_variant(variant: ast::variant) -> doc::variantdoc {
@@ -189,7 +189,7 @@ fn traitdoc_from_trait(
189189
) -> doc::traitdoc {
190190
{
191191
item: itemdoc,
192-
methods: do par::seqmap(methods) |method| {
192+
methods: do vec::map(methods) |method| {
193193
alt method {
194194
ast::required(ty_m) {
195195
{
@@ -236,7 +236,7 @@ fn impldoc_from_impl(
236236
item: itemdoc,
237237
trait_ty: none,
238238
self_ty: none,
239-
methods: do par::seqmap(methods) |method| {
239+
methods: do vec::map(methods) |method| {
240240
{
241241
name: *method.ident,
242242
brief: none,

‎src/rustdoc/fold.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ fn default_par_fold<T:send copy>(ctxt: T) -> fold<T> {
133133

134134
fn default_seq_fold_doc<T>(fold: fold<T>, doc: doc::doc) -> doc::doc {
135135
{
136-
pages: do par::seqmap(doc.pages) |page| {
136+
pages: do vec::map(doc.pages) |page| {
137137
alt page {
138138
doc::cratepage(doc) {
139139
doc::cratepage(fold.fold_crate(fold, doc))
@@ -169,7 +169,7 @@ fn default_any_fold_mod<T:send copy>(
169169
) -> doc::moddoc {
170170
{
171171
item: fold.fold_item(fold, doc.item),
172-
items: par::anymap(doc.items, |itemtag, copy fold| {
172+
items: par::map(doc.items, |itemtag, copy fold| {
173173
fold_itemtag(fold, itemtag)
174174
})
175175
with doc
@@ -182,7 +182,7 @@ fn default_seq_fold_mod<T>(
182182
) -> doc::moddoc {
183183
{
184184
item: fold.fold_item(fold, doc.item),
185-
items: par::seqmap(doc.items, |itemtag| {
185+
items: vec::map(doc.items, |itemtag| {
186186
fold_itemtag(fold, itemtag)
187187
})
188188
with doc
@@ -195,7 +195,7 @@ fn default_par_fold_mod<T:send copy>(
195195
) -> doc::moddoc {
196196
{
197197
item: fold.fold_item(fold, doc.item),
198-
items: par::parmap(doc.items, |itemtag, copy fold| {
198+
items: par::map(doc.items, |itemtag, copy fold| {
199199
fold_itemtag(fold, itemtag)
200200
})
201201
with doc
@@ -208,7 +208,7 @@ fn default_any_fold_nmod<T:send copy>(
208208
) -> doc::nmoddoc {
209209
{
210210
item: fold.fold_item(fold, doc.item),
211-
fns: par::anymap(doc.fns, |fndoc, copy fold| {
211+
fns: par::map(doc.fns, |fndoc, copy fold| {
212212
fold.fold_fn(fold, fndoc)
213213
})
214214
with doc
@@ -221,7 +221,7 @@ fn default_seq_fold_nmod<T>(
221221
) -> doc::nmoddoc {
222222
{
223223
item: fold.fold_item(fold, doc.item),
224-
fns: par::seqmap(doc.fns, |fndoc| {
224+
fns: vec::map(doc.fns, |fndoc| {
225225
fold.fold_fn(fold, fndoc)
226226
})
227227
with doc
@@ -234,7 +234,7 @@ fn default_par_fold_nmod<T:send copy>(
234234
) -> doc::nmoddoc {
235235
{
236236
item: fold.fold_item(fold, doc.item),
237-
fns: par::parmap(doc.fns, |fndoc, copy fold| {
237+
fns: par::map(doc.fns, |fndoc, copy fold| {
238238
fold.fold_fn(fold, fndoc)
239239
})
240240
with doc

‎src/rustdoc/markdown_index_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn build_mod_index(
5555
config: config::config
5656
) -> doc::index {
5757
{
58-
entries: par::anymap(doc.items, |doc| {
58+
entries: par::map(doc.items, |doc| {
5959
item_to_entry(doc, config)
6060
})
6161
}
@@ -66,7 +66,7 @@ fn build_nmod_index(
6666
config: config::config
6767
) -> doc::index {
6868
{
69-
entries: par::anymap(doc.fns, |doc| {
69+
entries: par::map(doc.fns, |doc| {
7070
item_to_entry(doc::fntag(doc), config)
7171
})
7272
}

‎src/rustdoc/markdown_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ fn write_markdown(
8282
doc: doc::doc,
8383
+writer_factory: writer_factory
8484
) {
85-
do par::anymap(doc.pages) |page| {
85+
do par::map(doc.pages) |page| {
8686
let ctxt = {
8787
w: writer_factory(page)
8888
};
@@ -488,7 +488,7 @@ fn write_sig(ctxt: ctxt, sig: option<~str>) {
488488

489489
fn code_block_indent(s: ~str) -> ~str {
490490
let lines = str::lines_any(s);
491-
let indented = par::seqmap(lines, |line| #fmt(" %s", line) );
491+
let indented = vec::map(lines, |line| #fmt(" %s", line) );
492492
str::connect(indented, ~"\n")
493493
}
494494

‎src/rustdoc/par.rs

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎src/rustdoc/rustdoc.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use rustc(vers = "0.3");
1919
use syntax(vers = "0.3");
2020

2121
import core::*;
22+
import std::par;
2223

2324
mod config;
2425
mod parse;
@@ -44,7 +45,6 @@ mod sort_pass;
4445
mod sort_item_name_pass;
4546
mod sort_item_type_pass;
4647
mod reexport_pass;
47-
mod par;
4848
mod page_pass;
4949
mod sectionalize_pass;
5050
mod escape_pass;

‎src/rustdoc/sectionalize_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn fold_trait(fold: fold::fold<()>, doc: doc::traitdoc) -> doc::traitdoc {
3434
let doc = fold::default_seq_fold_trait(fold, doc);
3535

3636
{
37-
methods: do par::anymap(doc.methods) |method| {
37+
methods: do par::map(doc.methods) |method| {
3838
let (desc, sections) = sectionalize(method.desc);
3939

4040
{
@@ -51,7 +51,7 @@ fn fold_impl(fold: fold::fold<()>, doc: doc::impldoc) -> doc::impldoc {
5151
let doc = fold::default_seq_fold_impl(fold, doc);
5252

5353
{
54-
methods: do par::anymap(doc.methods) |method| {
54+
methods: do par::map(doc.methods) |method| {
5555
let (desc, sections) = sectionalize(method.desc);
5656

5757
{

‎src/rustdoc/text_pass.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn fold_item(fold: fold::fold<op>, doc: doc::itemdoc) -> doc::itemdoc {
4545
}
4646

4747
fn apply_to_sections(op: op, sections: ~[doc::section]) -> ~[doc::section] {
48-
par::anymap(sections, |section, copy op| {
48+
par::map(sections, |section, copy op| {
4949
header: op(section.header),
5050
body: op(section.body)
5151
})
@@ -55,7 +55,7 @@ fn fold_enum(fold: fold::fold<op>, doc: doc::enumdoc) -> doc::enumdoc {
5555
let doc = fold::default_seq_fold_enum(fold, doc);
5656

5757
{
58-
variants: do par::anymap(doc.variants) |variant, copy fold| {
58+
variants: do par::map(doc.variants) |variant, copy fold| {
5959
{
6060
desc: maybe_apply_op(fold.ctxt, variant.desc)
6161
with variant
@@ -75,7 +75,7 @@ fn fold_trait(fold: fold::fold<op>, doc: doc::traitdoc) -> doc::traitdoc {
7575
}
7676

7777
fn apply_to_methods(op: op, docs: ~[doc::methoddoc]) -> ~[doc::methoddoc] {
78-
do par::anymap(docs) |doc, copy op| {
78+
do par::map(docs) |doc, copy op| {
7979
{
8080
brief: maybe_apply_op(op, doc.brief),
8181
desc: maybe_apply_op(op, doc.desc),

‎src/rustdoc/tystr_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fn fold_enum(
106106
let srv = fold.ctxt;
107107

108108
{
109-
variants: do par::anymap(doc.variants) |variant| {
109+
variants: do par::map(doc.variants) |variant| {
110110
let sig = do astsrv::exec(srv) |ctxt| {
111111
alt check ctxt.ast_map.get(doc_id) {
112112
ast_map::node_item(@{
@@ -152,7 +152,7 @@ fn merge_methods(
152152
item_id: doc::ast_id,
153153
docs: ~[doc::methoddoc]
154154
) -> ~[doc::methoddoc] {
155-
do par::anymap(docs) |doc| {
155+
do par::map(docs) |doc| {
156156
{
157157
sig: get_method_sig(srv, item_id, doc.name)
158158
with doc

‎src/rustdoc/unindent_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fn unindent(s: ~str) -> ~str {
6262

6363
if vec::is_not_empty(lines) {
6464
let unindented = ~[str::trim(vec::head(lines))]
65-
+ do par::anymap(vec::tail(lines)) |line| {
65+
+ do par::map(vec::tail(lines)) |line| {
6666
if str::is_whitespace(line) {
6767
line
6868
} else {

0 commit comments

Comments
 (0)