rustdoc: Rename util mod to par

brson · brson · commit 3bfa45703939 · 2012-02-26T23:10:12.000-08:00
diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
@@ -154,7 +154,7 @@ fn merge_arg_attrs(
     docs: [doc::argdoc],
     attrs: [attr_parser::arg_attrs]
 ) -> [doc::argdoc] {
-    util::anymap(docs) {|doc|
+    par::anymap(docs) {|doc|
         alt vec::find(attrs) {|attr|
             attr.name == doc.name
         } {
@@ -239,7 +239,7 @@ fn fold_enum(
     let doc = fold::default_seq_fold_enum(fold, doc);
 
     {
-        variants: util::anymap(doc.variants) {|variant|
+        variants: par::anymap(doc.variants) {|variant|
             let attrs = astsrv::exec(srv) {|ctxt|
                 alt check ctxt.ast_map.get(doc.id()) {
                   ast_map::node_item(@{
@@ -288,7 +288,7 @@ fn fold_res(
     let attrs = parse_item_attrs(srv, doc.id(), attr_parser::parse_res);
 
     {
-        args: util::anymap(doc.args) {|doc|
+        args: par::anymap(doc.args) {|doc|
             alt vec::find(attrs.args) {|attr|
                 attr.name == doc.name
             } {
@@ -349,7 +349,7 @@ fn merge_method_attrs(
           ast_map::node_item(@{
             node: ast::item_iface(_, methods), _
           }, _) {
-            util::seqmap(methods) {|method|
+            par::seqmap(methods) {|method|
                 (method.ident,
                  (attr_parser::parse_basic(method.attrs),
                   attr_parser::parse_method(method.attrs)
@@ -359,7 +359,7 @@ fn merge_method_attrs(
           ast_map::node_item(@{
             node: ast::item_impl(_, _, _, methods), _
           }, _) {
-            util::seqmap(methods) {|method|
+            par::seqmap(methods) {|method|
                 (method.ident,
                  (attr_parser::parse_basic(method.attrs),
                   attr_parser::parse_method(method.attrs)
diff --git a/src/rustdoc/desc_pass.rs b/src/rustdoc/desc_pass.rs
@@ -45,7 +45,7 @@ fn fold_fn(fold: fold::fold<op>, doc: doc::fndoc) -> doc::fndoc {
     let doc = fold::default_seq_fold_fn(fold, doc);
 
     {
-        args: util::anymap(doc.args) {|doc|
+        args: par::anymap(doc.args) {|doc|
             {
                 desc: maybe_apply_op(fold.ctxt, doc.desc)
                 with doc
@@ -64,7 +64,7 @@ fn fold_enum(fold: fold::fold<op>, doc: doc::enumdoc) -> doc::enumdoc {
     let doc = fold::default_seq_fold_enum(fold, doc);
 
     {
-        variants: util::anymap(doc.variants) {|variant|
+        variants: par::anymap(doc.variants) {|variant|
             {
                 desc: maybe_apply_op(fold.ctxt, variant.desc)
                 with variant
@@ -78,7 +78,7 @@ fn fold_res(fold: fold::fold<op>, doc: doc::resdoc) -> doc::resdoc {
     let doc = fold::default_seq_fold_res(fold, doc);
 
     {
-        args: util::anymap(doc.args) {|arg|
+        args: par::anymap(doc.args) {|arg|
             {
                 desc: maybe_apply_op(fold.ctxt, arg.desc)
                 with arg
@@ -98,11 +98,11 @@ fn fold_iface(fold: fold::fold<op>, doc: doc::ifacedoc) -> doc::ifacedoc {
 }
 
 fn apply_to_methods(op: op, docs: [doc::methoddoc]) -> [doc::methoddoc] {
-    util::anymap(docs) {|doc|
+    par::anymap(docs) {|doc|
         {
             brief: maybe_apply_op(op, doc.brief),
             desc: maybe_apply_op(op, doc.desc),
-            args: util::anymap(doc.args) {|doc|
+            args: par::anymap(doc.args) {|doc|
                 {
                     desc: maybe_apply_op(op, doc.desc)
                     with doc
diff --git a/src/rustdoc/desc_to_brief_pass.rs b/src/rustdoc/desc_to_brief_pass.rs
@@ -41,7 +41,7 @@ fn fold_iface(fold: fold::fold<()>, doc: doc::ifacedoc) -> doc::ifacedoc {
     let doc =fold::default_seq_fold_iface(fold, doc);
 
     {
-        methods: util::anymap(doc.methods) {|doc|
+        methods: par::anymap(doc.methods) {|doc|
             let (brief, desc) = modify(doc.brief, doc.desc);
 
             {
@@ -58,7 +58,7 @@ fn fold_impl(fold: fold::fold<()>, doc: doc::impldoc) -> doc::impldoc {
     let doc =fold::default_seq_fold_impl(fold, doc);
 
     {
-        methods: util::anymap(doc.methods) {|doc|
+        methods: par::anymap(doc.methods) {|doc|
             let (brief, desc) = modify(doc.brief, doc.desc);
 
             {
diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
@@ -112,7 +112,7 @@ fn nmoddoc_from_mod(
 ) -> doc::nmoddoc {
     {
         item: itemdoc,
-        fns: util::seqmap(module.items) {|item|
+        fns: par::seqmap(module.items) {|item|
             let itemdoc = mk_itemdoc(item.id, item.ident);
             alt item.node {
               ast::native_item_fn(decl, _) {
@@ -150,7 +150,7 @@ fn should_extract_fn_args() {
 }
 
 fn argdocs_from_args(args: [ast::arg]) -> [doc::argdoc] {
-    util::seqmap(args, argdoc_from_arg)
+    par::seqmap(args, argdoc_from_arg)
 }
 
 fn argdoc_from_arg(arg: ast::arg) -> doc::argdoc {
@@ -188,7 +188,7 @@ fn enumdoc_from_enum(
 fn variantdocs_from_variants(
     variants: [ast::variant]
 ) -> [doc::variantdoc] {
-    util::seqmap(variants, variantdoc_from_variant)
+    par::seqmap(variants, variantdoc_from_variant)
 }
 
 fn variantdoc_from_variant(variant: ast::variant) -> doc::variantdoc {
@@ -242,7 +242,7 @@ fn ifacedoc_from_iface(
 ) -> doc::ifacedoc {
     {
         item: itemdoc,
-        methods: util::seqmap(methods) {|method|
+        methods: par::seqmap(methods) {|method|
             {
                 name: method.ident,
                 brief: none,
@@ -285,7 +285,7 @@ fn impldoc_from_impl(
         item: itemdoc,
         iface_ty: none,
         self_ty: none,
-        methods: util::seqmap(methods) {|method|
+        methods: par::seqmap(methods) {|method|
             {
                 name: method.ident,
                 brief: none,
diff --git a/src/rustdoc/fold.rs b/src/rustdoc/fold.rs
@@ -153,7 +153,7 @@ fn default_any_fold_mod<T:send>(
 ) -> doc::moddoc {
     {
         item: fold.fold_item(fold, doc.item),
-        items: util::anymap(doc.items) {|itemtag|
+        items: par::anymap(doc.items) {|itemtag|
             fold_itemtag(fold, itemtag)
         }
         with doc
@@ -166,7 +166,7 @@ fn default_seq_fold_mod<T>(
 ) -> doc::moddoc {
     {
         item: fold.fold_item(fold, doc.item),
-        items: util::seqmap(doc.items) {|itemtag|
+        items: par::seqmap(doc.items) {|itemtag|
             fold_itemtag(fold, itemtag)
         }
         with doc
@@ -179,7 +179,7 @@ fn default_par_fold_mod<T:send>(
 ) -> doc::moddoc {
     {
         item: fold.fold_item(fold, doc.item),
-        items: util::parmap(doc.items) {|itemtag|
+        items: par::parmap(doc.items) {|itemtag|
             fold_itemtag(fold, itemtag)
         }
         with doc
@@ -192,7 +192,7 @@ fn default_any_fold_nmod<T:send>(
 ) -> doc::nmoddoc {
     {
         item: fold.fold_item(fold, doc.item),
-        fns: util::anymap(doc.fns) {|fndoc|
+        fns: par::anymap(doc.fns) {|fndoc|
             fold.fold_fn(fold, fndoc)
         }
         with doc
@@ -205,7 +205,7 @@ fn default_seq_fold_nmod<T>(
 ) -> doc::nmoddoc {
     {
         item: fold.fold_item(fold, doc.item),
-        fns: util::seqmap(doc.fns) {|fndoc|
+        fns: par::seqmap(doc.fns) {|fndoc|
             fold.fold_fn(fold, fndoc)
         }
         with doc
@@ -218,7 +218,7 @@ fn default_par_fold_nmod<T:send>(
 ) -> doc::nmoddoc {
     {
         item: fold.fold_item(fold, doc.item),
-        fns: util::parmap(doc.fns) {|fndoc|
+        fns: par::parmap(doc.fns) {|fndoc|
             fold.fold_fn(fold, fndoc)
         }
         with doc
diff --git a/src/rustdoc/markdown_pass.rs b/src/rustdoc/markdown_pass.rs
@@ -228,7 +228,7 @@ fn write_sig(ctxt: ctxt, sig: option<str>) {
 
 fn code_block_indent(s: str) -> str {
     let lines = str::lines_any(s);
-    let indented = util::anymap(lines, { |line| #fmt("    %s", line) });
+    let indented = par::anymap(lines, { |line| #fmt("    %s", line) });
     str::connect(indented, "\n")
 }
 
diff --git a/src/rustdoc/par.rs b/src/rustdoc/par.rs
diff --git a/src/rustdoc/prune_undoc_details_pass.rs b/src/rustdoc/prune_undoc_details_pass.rs
@@ -105,7 +105,7 @@ fn fold_iface(
 }
 
 fn prune_methods(docs: [doc::methoddoc]) -> [doc::methoddoc] {
-    util::anymap(docs) {|doc|
+    par::anymap(docs) {|doc|
         {
             args: prune_args(doc.args),
             return: prune_return(doc.return)
diff --git a/src/rustdoc/rustdoc.rc b/src/rustdoc/rustdoc.rc
@@ -35,4 +35,4 @@ mod sort_pass;
 mod sort_item_name_pass;
 mod sort_item_type_pass;
 mod reexport_pass;
-mod util;
+mod par;
diff --git a/src/rustdoc/tystr_pass.rs b/src/rustdoc/tystr_pass.rs
@@ -165,7 +165,7 @@ fn get_arg_tys(srv: astsrv::srv, fn_id: doc::ast_id) -> [(str, str)] {
 }
 
 fn decl_arg_tys(decl: ast::fn_decl) -> [(str, str)] {
-    util::seqmap(decl.inputs) {|arg|
+    par::seqmap(decl.inputs) {|arg|
         (arg.ident, pprust::ty_to_str(arg.ty))
     }
 }
@@ -217,7 +217,7 @@ fn fold_enum(
     let srv = fold.ctxt;
 
     {
-        variants: util::anymap(doc.variants) {|variant|
+        variants: par::anymap(doc.variants) {|variant|
             let sig = astsrv::exec(srv) {|ctxt|
                 alt check ctxt.ast_map.get(doc.id()) {
                   ast_map::node_item(@{
@@ -296,7 +296,7 @@ fn merge_methods(
     item_id: doc::ast_id,
     docs: [doc::methoddoc]
 ) -> [doc::methoddoc] {
-    util::anymap(docs) {|doc|
+    par::anymap(docs) {|doc|
         {
             args: merge_method_arg_tys(
                 srv,
diff --git a/src/rustdoc/unindent_pass.rs b/src/rustdoc/unindent_pass.rs
@@ -63,7 +63,7 @@ fn unindent(s: str) -> str {
 
     if check vec::is_not_empty(lines) {
         let unindented = [str::trim(vec::head(lines))]
-            + util::anymap(vec::tail(lines)) {|line|
+            + par::anymap(vec::tail(lines)) {|line|
             if str::is_whitespace(line) {
                 line
             } else {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ fn fold_fn(fold: fold::fold<op>, doc: doc::fndoc) -> doc::fndoc {`
`45`	`45`	`let doc = fold::default_seq_fold_fn(fold, doc);`
`46`	`46`
`47`	`47`	`{`
`48`		`- args: util::anymap(doc.args) {\|doc\|`
	`48`	`+ args: par::anymap(doc.args) {\|doc\|`
`49`	`49`	`{`
`50`	`50`	`desc: maybe_apply_op(fold.ctxt, doc.desc)`
`51`	`51`	`with doc`
`@@ -64,7 +64,7 @@ fn fold_enum(fold: fold::fold<op>, doc: doc::enumdoc) -> doc::enumdoc {`
`64`	`64`	`let doc = fold::default_seq_fold_enum(fold, doc);`
`65`	`65`
`66`	`66`	`{`
`67`		`- variants: util::anymap(doc.variants) {\|variant\|`
	`67`	`+ variants: par::anymap(doc.variants) {\|variant\|`
`68`	`68`	`{`
`69`	`69`	`desc: maybe_apply_op(fold.ctxt, variant.desc)`
`70`	`70`	`with variant`
`@@ -78,7 +78,7 @@ fn fold_res(fold: fold::fold<op>, doc: doc::resdoc) -> doc::resdoc {`
`78`	`78`	`let doc = fold::default_seq_fold_res(fold, doc);`
`79`	`79`
`80`	`80`	`{`
`81`		`- args: util::anymap(doc.args) {\|arg\|`
	`81`	`+ args: par::anymap(doc.args) {\|arg\|`
`82`	`82`	`{`
`83`	`83`	`desc: maybe_apply_op(fold.ctxt, arg.desc)`
`84`	`84`	`with arg`
`@@ -98,11 +98,11 @@ fn fold_iface(fold: fold::fold<op>, doc: doc::ifacedoc) -> doc::ifacedoc {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`fn apply_to_methods(op: op, docs: [doc::methoddoc]) -> [doc::methoddoc] {`
`101`		`- util::anymap(docs) {\|doc\|`
	`101`	`+ par::anymap(docs) {\|doc\|`
`102`	`102`	`{`
`103`	`103`	`brief: maybe_apply_op(op, doc.brief),`
`104`	`104`	`desc: maybe_apply_op(op, doc.desc),`
`105`		`- args: util::anymap(doc.args) {\|doc\|`
	`105`	`+ args: par::anymap(doc.args) {\|doc\|`
`106`	`106`	`{`
`107`	`107`	`desc: maybe_apply_op(op, doc.desc)`
`108`	`108`	`with doc`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ fn fold_iface(fold: fold::fold<()>, doc: doc::ifacedoc) -> doc::ifacedoc {`
`41`	`41`	`let doc =fold::default_seq_fold_iface(fold, doc);`
`42`	`42`
`43`	`43`	`{`
`44`		`- methods: util::anymap(doc.methods) {\|doc\|`
	`44`	`+ methods: par::anymap(doc.methods) {\|doc\|`
`45`	`45`	`let (brief, desc) = modify(doc.brief, doc.desc);`
`46`	`46`
`47`	`47`	`{`
`@@ -58,7 +58,7 @@ fn fold_impl(fold: fold::fold<()>, doc: doc::impldoc) -> doc::impldoc {`
`58`	`58`	`let doc =fold::default_seq_fold_impl(fold, doc);`
`59`	`59`
`60`	`60`	`{`
`61`		`- methods: util::anymap(doc.methods) {\|doc\|`
	`61`	`+ methods: par::anymap(doc.methods) {\|doc\|`
`62`	`62`	`let (brief, desc) = modify(doc.brief, doc.desc);`
`63`	`63`
`64`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ fn nmoddoc_from_mod(`
`112`	`112`	`) -> doc::nmoddoc {`
`113`	`113`	`{`
`114`	`114`	`item: itemdoc,`
`115`		`- fns: util::seqmap(module.items) {\|item\|`
	`115`	`+ fns: par::seqmap(module.items) {\|item\|`
`116`	`116`	`let itemdoc = mk_itemdoc(item.id, item.ident);`
`117`	`117`	`alt item.node {`
`118`	`118`	`ast::native_item_fn(decl, _) {`
`@@ -150,7 +150,7 @@ fn should_extract_fn_args() {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`fn argdocs_from_args(args: [ast::arg]) -> [doc::argdoc] {`
`153`		`- util::seqmap(args, argdoc_from_arg)`
	`153`	`+ par::seqmap(args, argdoc_from_arg)`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`fn argdoc_from_arg(arg: ast::arg) -> doc::argdoc {`
`@@ -188,7 +188,7 @@ fn enumdoc_from_enum(`
`188`	`188`	`fn variantdocs_from_variants(`
`189`	`189`	`variants: [ast::variant]`
`190`	`190`	`) -> [doc::variantdoc] {`
`191`		`- util::seqmap(variants, variantdoc_from_variant)`
	`191`	`+ par::seqmap(variants, variantdoc_from_variant)`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`fn variantdoc_from_variant(variant: ast::variant) -> doc::variantdoc {`
`@@ -242,7 +242,7 @@ fn ifacedoc_from_iface(`
`242`	`242`	`) -> doc::ifacedoc {`
`243`	`243`	`{`
`244`	`244`	`item: itemdoc,`
`245`		`- methods: util::seqmap(methods) {\|method\|`
	`245`	`+ methods: par::seqmap(methods) {\|method\|`
`246`	`246`	`{`
`247`	`247`	`name: method.ident,`
`248`	`248`	`brief: none,`
`@@ -285,7 +285,7 @@ fn impldoc_from_impl(`
`285`	`285`	`item: itemdoc,`
`286`	`286`	`iface_ty: none,`
`287`	`287`	`self_ty: none,`
`288`		`- methods: util::seqmap(methods) {\|method\|`
	`288`	`+ methods: par::seqmap(methods) {\|method\|`
`289`	`289`	`{`
`290`	`290`	`name: method.ident,`
`291`	`291`	`brief: none,`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ fn default_any_fold_mod<T:send>(`
`153`	`153`	`) -> doc::moddoc {`
`154`	`154`	`{`
`155`	`155`	`item: fold.fold_item(fold, doc.item),`
`156`		`- items: util::anymap(doc.items) {\|itemtag\|`
	`156`	`+ items: par::anymap(doc.items) {\|itemtag\|`
`157`	`157`	`fold_itemtag(fold, itemtag)`
`158`	`158`	`}`
`159`	`159`	`with doc`
`@@ -166,7 +166,7 @@ fn default_seq_fold_mod<T>(`
`166`	`166`	`) -> doc::moddoc {`
`167`	`167`	`{`
`168`	`168`	`item: fold.fold_item(fold, doc.item),`
`169`		`- items: util::seqmap(doc.items) {\|itemtag\|`
	`169`	`+ items: par::seqmap(doc.items) {\|itemtag\|`
`170`	`170`	`fold_itemtag(fold, itemtag)`
`171`	`171`	`}`
`172`	`172`	`with doc`
`@@ -179,7 +179,7 @@ fn default_par_fold_mod<T:send>(`
`179`	`179`	`) -> doc::moddoc {`
`180`	`180`	`{`
`181`	`181`	`item: fold.fold_item(fold, doc.item),`
`182`		`- items: util::parmap(doc.items) {\|itemtag\|`
	`182`	`+ items: par::parmap(doc.items) {\|itemtag\|`
`183`	`183`	`fold_itemtag(fold, itemtag)`
`184`	`184`	`}`
`185`	`185`	`with doc`
`@@ -192,7 +192,7 @@ fn default_any_fold_nmod<T:send>(`
`192`	`192`	`) -> doc::nmoddoc {`
`193`	`193`	`{`
`194`	`194`	`item: fold.fold_item(fold, doc.item),`
`195`		`- fns: util::anymap(doc.fns) {\|fndoc\|`
	`195`	`+ fns: par::anymap(doc.fns) {\|fndoc\|`
`196`	`196`	`fold.fold_fn(fold, fndoc)`
`197`	`197`	`}`
`198`	`198`	`with doc`
`@@ -205,7 +205,7 @@ fn default_seq_fold_nmod<T>(`
`205`	`205`	`) -> doc::nmoddoc {`
`206`	`206`	`{`
`207`	`207`	`item: fold.fold_item(fold, doc.item),`
`208`		`- fns: util::seqmap(doc.fns) {\|fndoc\|`
	`208`	`+ fns: par::seqmap(doc.fns) {\|fndoc\|`
`209`	`209`	`fold.fold_fn(fold, fndoc)`
`210`	`210`	`}`
`211`	`211`	`with doc`
`@@ -218,7 +218,7 @@ fn default_par_fold_nmod<T:send>(`
`218`	`218`	`) -> doc::nmoddoc {`
`219`	`219`	`{`
`220`	`220`	`item: fold.fold_item(fold, doc.item),`
`221`		`- fns: util::parmap(doc.fns) {\|fndoc\|`
	`221`	`+ fns: par::parmap(doc.fns) {\|fndoc\|`
`222`	`222`	`fold.fold_fn(fold, fndoc)`
`223`	`223`	`}`
`224`	`224`	`with doc`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ fn write_sig(ctxt: ctxt, sig: option<str>) {`
`228`	`228`
`229`	`229`	`fn code_block_indent(s: str) -> str {`
`230`	`230`	`let lines = str::lines_any(s);`
`231`		`- let indented = util::anymap(lines, { \|line\| #fmt(" %s", line) });`
	`231`	`+ let indented = par::anymap(lines, { \|line\| #fmt(" %s", line) });`
`232`	`232`	`str::connect(indented, "\n")`
`233`	`233`	`}`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ fn fold_iface(`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`fn prune_methods(docs: [doc::methoddoc]) -> [doc::methoddoc] {`
`108`		`- util::anymap(docs) {\|doc\|`
	`108`	`+ par::anymap(docs) {\|doc\|`
`109`	`109`	`{`
`110`	`110`	`args: prune_args(doc.args),`
`111`	`111`	`return: prune_return(doc.return)`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ fn get_arg_tys(srv: astsrv::srv, fn_id: doc::ast_id) -> [(str, str)] {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`fn decl_arg_tys(decl: ast::fn_decl) -> [(str, str)] {`
`168`		`- util::seqmap(decl.inputs) {\|arg\|`
	`168`	`+ par::seqmap(decl.inputs) {\|arg\|`
`169`	`169`	`(arg.ident, pprust::ty_to_str(arg.ty))`
`170`	`170`	`}`
`171`	`171`	`}`
`@@ -217,7 +217,7 @@ fn fold_enum(`
`217`	`217`	`let srv = fold.ctxt;`
`218`	`218`
`219`	`219`	`{`
`220`		`- variants: util::anymap(doc.variants) {\|variant\|`
	`220`	`+ variants: par::anymap(doc.variants) {\|variant\|`
`221`	`221`	`let sig = astsrv::exec(srv) {\|ctxt\|`
`222`	`222`	`alt check ctxt.ast_map.get(doc.id()) {`
`223`	`223`	`ast_map::node_item(@{`
`@@ -296,7 +296,7 @@ fn merge_methods(`
`296`	`296`	`item_id: doc::ast_id,`
`297`	`297`	`docs: [doc::methoddoc]`
`298`	`298`	`) -> [doc::methoddoc] {`
`299`		`- util::anymap(docs) {\|doc\|`
	`299`	`+ par::anymap(docs) {\|doc\|`
`300`	`300`	`{`
`301`	`301`	`args: merge_method_arg_tys(`
`302`	`302`	`srv,`