about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-02-20 22:16:25 -0800
committerBrian Anderson <banderson@mozilla.com>2012-02-21 16:14:02 -0800
commit1ee139ae1f61309fee44b37034ee1f2a42aba8f1 (patch)
tree5cc6c1f292ad8242c3568eaae9cf9cececa8827b
parentd4f57620ae3a221d94a893f57fc31f96a8a3a0ae (diff)
rustdoc: Convert most passes to parallel folds
-rw-r--r--src/rustdoc/attr_pass.rs2
-rw-r--r--src/rustdoc/desc_pass.rs2
-rw-r--r--src/rustdoc/desc_to_brief_pass.rs2
-rw-r--r--src/rustdoc/path_pass.rs4
-rw-r--r--src/rustdoc/prune_undoc_details_pass.rs2
-rw-r--r--src/rustdoc/prune_undoc_items_pass.rs4
-rw-r--r--src/rustdoc/prune_unexported_pass.rs4
-rw-r--r--src/rustdoc/reexport_pass.rs1
-rw-r--r--src/rustdoc/sort_pass.rs4
-rw-r--r--src/rustdoc/tystr_pass.rs2
10 files changed, 14 insertions, 13 deletions
diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index f95d32b6cc7..8d77dc6b055 100644
--- a/src/rustdoc/attr_pass.rs
+++ b/src/rustdoc/attr_pass.rs
@@ -27,7 +27,7 @@ fn run(
         fold_res: fold_res,
         fold_iface: fold_iface,
         fold_impl: fold_impl
-        with *fold::default_seq_fold(srv)
+        with *fold::default_par_fold(srv)
     });
     fold.fold_crate(fold, doc)
 }
diff --git a/src/rustdoc/desc_pass.rs b/src/rustdoc/desc_pass.rs
index 4e64c29b295..be6bc708e67 100644
--- a/src/rustdoc/desc_pass.rs
+++ b/src/rustdoc/desc_pass.rs
@@ -22,7 +22,7 @@ fn run(
         fold_res: fold_res,
         fold_iface: fold_iface,
         fold_impl: fold_impl
-        with *fold::default_seq_fold(op)
+        with *fold::default_par_fold(op)
     });
     fold.fold_crate(fold, doc)
 }
diff --git a/src/rustdoc/desc_to_brief_pass.rs b/src/rustdoc/desc_to_brief_pass.rs
index 5bf983d43eb..0ea14c3bff2 100644
--- a/src/rustdoc/desc_to_brief_pass.rs
+++ b/src/rustdoc/desc_to_brief_pass.rs
@@ -21,7 +21,7 @@ fn run(
         fold_item: fold_item,
         fold_iface: fold_iface,
         fold_impl: fold_impl
-        with *fold::default_seq_fold(())
+        with *fold::default_par_fold(())
     });
     fold.fold_crate(fold, doc)
 }
diff --git a/src/rustdoc/path_pass.rs b/src/rustdoc/path_pass.rs
index 01d3d6b731d..bdd7709a3c4 100644
--- a/src/rustdoc/path_pass.rs
+++ b/src/rustdoc/path_pass.rs
@@ -17,7 +17,7 @@ fn run(srv: astsrv::srv, doc: doc::cratedoc) -> doc::cratedoc {
     let fold = fold::fold({
         fold_item: fold_item,
         fold_mod: fold_mod
-        with *fold::default_seq_fold(ctxt)
+        with *fold::default_par_fold(ctxt)
     });
     fold.fold_crate(fold, doc)
 }
@@ -33,7 +33,7 @@ fn fold_mod(fold: fold::fold<ctxt>, doc: doc::moddoc) -> doc::moddoc {
     let is_topmod = doc.id() == rustc::syntax::ast::crate_node_id;
 
     if !is_topmod { vec::push(fold.ctxt.path, doc.name()); }
-    let doc = fold::default_seq_fold_mod(fold, doc);
+    let doc = fold::default_par_fold_mod(fold, doc);
     if !is_topmod { vec::pop(fold.ctxt.path); }
 
     {
diff --git a/src/rustdoc/prune_undoc_details_pass.rs b/src/rustdoc/prune_undoc_details_pass.rs
index 1a1c55bdf68..e6dcc45c454 100644
--- a/src/rustdoc/prune_undoc_details_pass.rs
+++ b/src/rustdoc/prune_undoc_details_pass.rs
@@ -16,7 +16,7 @@ fn run(
         fold_res: fold_res,
         fold_iface: fold_iface,
         fold_impl: fold_impl
-        with *fold::default_seq_fold(())
+        with *fold::default_par_fold(())
     });
     fold.fold_crate(fold, doc)
 }
diff --git a/src/rustdoc/prune_undoc_items_pass.rs b/src/rustdoc/prune_undoc_items_pass.rs
index 3109b2aaf47..341527c540a 100644
--- a/src/rustdoc/prune_undoc_items_pass.rs
+++ b/src/rustdoc/prune_undoc_items_pass.rs
@@ -26,7 +26,7 @@ fn run(
         fold_iface: fold_iface,
         fold_impl: fold_impl,
         fold_type: fold_type
-        with *fold::default_seq_fold(ctxt)
+        with *fold::default_par_fold(ctxt)
     });
     fold.fold_crate(fold, doc)
 }
@@ -105,7 +105,7 @@ fn fold_mod(
               _ { some(itemtag) }
             }
         }
-        with fold::default_seq_fold_mod(fold, doc)
+        with fold::default_par_fold_mod(fold, doc)
     };
     fold.ctxt.have_docs =
         doc.brief() != none
diff --git a/src/rustdoc/prune_unexported_pass.rs b/src/rustdoc/prune_unexported_pass.rs
index 228137f3546..577f44e464d 100644
--- a/src/rustdoc/prune_unexported_pass.rs
+++ b/src/rustdoc/prune_unexported_pass.rs
@@ -13,13 +13,13 @@ fn mk_pass() -> pass {
 fn run(srv: astsrv::srv, doc: doc::cratedoc) -> doc::cratedoc {
     let fold = fold::fold({
         fold_mod: fold_mod
-        with *fold::default_seq_fold(srv)
+        with *fold::default_par_fold(srv)
     });
     fold.fold_crate(fold, doc)
 }
 
 fn fold_mod(fold: fold::fold<astsrv::srv>, doc: doc::moddoc) -> doc::moddoc {
-    let doc = fold::default_seq_fold_mod(fold, doc);
+    let doc = fold::default_par_fold_mod(fold, doc);
     {
         items: ~exported_items(fold.ctxt, doc)
         with doc
diff --git a/src/rustdoc/reexport_pass.rs b/src/rustdoc/reexport_pass.rs
index e6f2aeea234..544d8b4c919 100644
--- a/src/rustdoc/reexport_pass.rs
+++ b/src/rustdoc/reexport_pass.rs
@@ -102,6 +102,7 @@ fn build_reexport_def_map(
         def_map: common::new_def_hash()
     };
 
+    // FIXME: Do a parallel fold
     let fold = fold::fold({
         fold_mod: fold_mod
         with *fold::default_seq_fold(ctxt)
diff --git a/src/rustdoc/sort_pass.rs b/src/rustdoc/sort_pass.rs
index 2a486bbdcad..28b97191c41 100644
--- a/src/rustdoc/sort_pass.rs
+++ b/src/rustdoc/sort_pass.rs
@@ -19,7 +19,7 @@ fn run(
 ) -> doc::cratedoc {
     let fold = fold::fold({
         fold_mod: fold_mod
-        with *fold::default_seq_fold(lteq)
+        with *fold::default_par_fold(lteq)
     });
     fold.fold_crate(fold, doc)
 }
@@ -28,7 +28,7 @@ fn fold_mod(
     fold: fold::fold<item_lteq>,
     doc: doc::moddoc
 ) -> doc::moddoc {
-    let doc = fold::default_seq_fold_mod(fold, doc);
+    let doc = fold::default_par_fold_mod(fold, doc);
     {
         items: ~sort::merge_sort(fold.ctxt, *doc.items)
         with doc
diff --git a/src/rustdoc/tystr_pass.rs b/src/rustdoc/tystr_pass.rs
index 9b1166fed7a..f2e531fd285 100644
--- a/src/rustdoc/tystr_pass.rs
+++ b/src/rustdoc/tystr_pass.rs
@@ -23,7 +23,7 @@ fn run(
         fold_iface: fold_iface,
         fold_impl: fold_impl,
         fold_type: fold_type
-        with *fold::default_seq_fold(srv)
+        with *fold::default_par_fold(srv)
     });
     fold.fold_crate(fold, doc)
 }