From 01a1c98d09b5c57c4a7eb025e4f84c403b26a024 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 27 Feb 2012 18:11:12 -0800
Subject: [PATCH] rustdoc: Clean up pass names

---
 src/rustdoc/desc_pass.rs             | 4 ++--
 src/rustdoc/prune_unexported_pass.rs | 2 +-
 src/rustdoc/rustdoc.rs               | 2 +-
 src/rustdoc/trim_pass.rs             | 2 +-
 src/rustdoc/unindent_pass.rs         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/rustdoc/desc_pass.rs b/src/rustdoc/desc_pass.rs
index 3061caf45207..38e6317fb05a 100644
--- a/src/rustdoc/desc_pass.rs
+++ b/src/rustdoc/desc_pass.rs
@@ -2,9 +2,9 @@
 
 export mk_pass;
 
-fn mk_pass(op: fn~(str) -> str) -> pass {
+fn mk_pass(name: str, op: fn~(str) -> str) -> pass {
     {
-        name: "desc",
+        name: name,
         f: fn~(srv: astsrv::srv, doc: doc::cratedoc) -> doc::cratedoc {
             run(srv, doc, op)
         }
diff --git a/src/rustdoc/prune_unexported_pass.rs b/src/rustdoc/prune_unexported_pass.rs
index 42d281a04d5c..6e1edc159c04 100644
--- a/src/rustdoc/prune_unexported_pass.rs
+++ b/src/rustdoc/prune_unexported_pass.rs
@@ -8,7 +8,7 @@ export mk_pass;
 
 fn mk_pass() -> pass {
     {
-        name: "prune_unexperted",
+        name: "prune_unexported",
         f: run
     }
 }
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index 00213c57003a..ff2e49c760b6 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -117,7 +117,7 @@ fn run(source_file: str) {
 
     let default_name = source_file;
     astsrv::from_file(source_file) {|srv|
-        time("wait") {||
+        time("wait_ast") {||
             astsrv::exec(srv) {|_ctxt| () }
         };
         let doc = time("extract") {||
diff --git a/src/rustdoc/trim_pass.rs b/src/rustdoc/trim_pass.rs
index 55d2f5eea2af..df5f06fb871e 100644
--- a/src/rustdoc/trim_pass.rs
+++ b/src/rustdoc/trim_pass.rs
@@ -10,7 +10,7 @@ is interpreted as the brief description.
 export mk_pass;
 
 fn mk_pass() -> pass {
-    desc_pass::mk_pass({|s| str::trim(s)})
+    desc_pass::mk_pass("trim", {|s| str::trim(s)})
 }
 
 #[test]
diff --git a/src/rustdoc/unindent_pass.rs b/src/rustdoc/unindent_pass.rs
index f7d6311690ce..7aa7f31400b5 100644
--- a/src/rustdoc/unindent_pass.rs
+++ b/src/rustdoc/unindent_pass.rs
@@ -14,7 +14,7 @@ middle of a line, and each of the following lines is indented.
 export mk_pass;
 
 fn mk_pass() -> pass {
-    desc_pass::mk_pass(unindent)
+    desc_pass::mk_pass("unindent", unindent)
 }
 
 fn unindent(s: str) -> str {