From 78bfdb11c861f4423156ff0572743480191c3844 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Fri, 2 Mar 2012 13:46:02 -0800
Subject: [PATCH] Revert "rust: xfail-fast run-pass/cci_no_inline_exe"

This reverts commit 95099cddcf2691fcbb389db657c70cf80d776918.
---
 src/rustdoc/doc.rs                     |  2 ++
 src/rustdoc/markdown_index_pass.rs     | 29 --------------------------
 src/rustdoc/rustdoc.rc                 |  1 -
 src/rustdoc/rustdoc.rs                 |  1 -
 src/test/run-pass/cci_no_inline_exe.rs |  1 -
 5 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 src/rustdoc/markdown_index_pass.rs

diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs
index ceca4cb5a72a..aa1bca2eab93 100644
--- a/src/rustdoc/doc.rs
+++ b/src/rustdoc/doc.rs
@@ -122,12 +122,14 @@ Fields:
 
 * kind - The type of thing being indexed, e.g. 'Module'
 * name - The name of the thing
+* brief - A description
 * link - A format-specific string representing the link target
 
 "]
 type index_entry = {
     kind: str,
     name: str,
+    brief: str,
     link: str
 };
 
diff --git a/src/rustdoc/markdown_index_pass.rs b/src/rustdoc/markdown_index_pass.rs
deleted file mode 100644
index 038b00836230..000000000000
--- a/src/rustdoc/markdown_index_pass.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-#[doc = "Build indexes as appropriate for the markdown pass"];
-
-export mk_pass;
-
-fn mk_pass() -> pass {
-    {
-        name: "markdown_index",
-        f: run
-    }
-}
-
-fn run(_srv: astsrv::srv, doc: doc::cratedoc) -> doc::cratedoc {
-    doc
-}
-
-#[test]
-fn should_index_mod_contents() {
-    
-}
-
-#[cfg(test)]
-mod test {
-    fn mk_doc(source: str) -> doc::cratedoc {
-        astsrv::from_str(source) {|srv|
-            let doc = extract::from_srv(srv, "");
-            run(srv, doc);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/rustdoc/rustdoc.rc b/src/rustdoc/rustdoc.rc
index 69a95cfd24c9..5f88ca4bdf92 100644
--- a/src/rustdoc/rustdoc.rc
+++ b/src/rustdoc/rustdoc.rc
@@ -17,7 +17,6 @@ mod parse;
 mod extract;
 mod attr_parser;
 mod doc;
-mod markdown_index_pass;
 mod markdown_pass;
 mod markdown_writer;
 mod fold;
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index df0e014eb41c..86af77a687fd 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -147,7 +147,6 @@ fn run(config: config::config) {
             unindent_pass::mk_pass(),
             sort_item_name_pass::mk_pass(),
             sort_item_type_pass::mk_pass(),
-            markdown_index_pass::mk_pass(),
             markdown_pass::mk_pass(config)
         ]);
     }
diff --git a/src/test/run-pass/cci_no_inline_exe.rs b/src/test/run-pass/cci_no_inline_exe.rs
index 62b4fdb9fd58..eca86bcf82cc 100644
--- a/src/test/run-pass/cci_no_inline_exe.rs
+++ b/src/test/run-pass/cci_no_inline_exe.rs
@@ -1,4 +1,3 @@
-// xfail-fast - check-fast doesn't understand aux-build
 // aux-build:cci_no_inline_lib.rs
 
 use std;