---

brson · brson · commit f34a75c96ac6 · 2012-03-02T13:46:02.000-08:00
yaml --- r: 14589 b: refs/heads/try c: 78bfdb1 h: refs/heads/master i: 14587: 4e0ffd0 v: v3
diff --git a/[refs] b/[refs]
@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 09f191f3a78b7915c922f9831df3dfe5e050db7f
+refs/heads/try: 78bfdb11c861f4423156ff0572743480191c3844
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/rustdoc/doc.rs b/branches/try/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/branches/try/src/rustdoc/markdown_index_pass.rs b/branches/try/src/rustdoc/markdown_index_pass.rs
diff --git a/branches/try/src/rustdoc/rustdoc.rc b/branches/try/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/branches/try/src/rustdoc/rustdoc.rs b/branches/try/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/branches/try/src/test/run-pass/cci_no_inline_exe.rs b/branches/try/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;

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,6 @@ fn run(config: config::config) {`
`147`	`147`	`unindent_pass::mk_pass(),`
`148`	`148`	`sort_item_name_pass::mk_pass(),`
`149`	`149`	`sort_item_type_pass::mk_pass(),`
`150`		`- markdown_index_pass::mk_pass(),`
`151`	`150`	`markdown_pass::mk_pass(config)`
`152`	`151`	`]);`
`153`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// xfail-fast - check-fast doesn't understand aux-build`
`2`	`1`	`// aux-build:cci_no_inline_lib.rs`
`3`	`2`
`4`	`3`	`use std;`