From 95099cddcf2691fcbb389db657c70cf80d776918 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 2 Mar 2012 13:44:40 -0800 Subject: [PATCH] rust: xfail-fast run-pass/cci_no_inline_exe --- 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, 32 insertions(+), 2 deletions(-) create mode 100644 src/rustdoc/markdown_index_pass.rs diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs index aa1bca2eab9..ceca4cb5a72 100644 --- a/src/rustdoc/doc.rs +++ b/src/rustdoc/doc.rs @@ -122,14 +122,12 @@ 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 new file mode 100644 index 00000000000..038b0083623 --- /dev/null +++ b/src/rustdoc/markdown_index_pass.rs @@ -0,0 +1,29 @@ +#[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 5f88ca4bdf9..69a95cfd24c 100644 --- a/src/rustdoc/rustdoc.rc +++ b/src/rustdoc/rustdoc.rc @@ -17,6 +17,7 @@ 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 86af77a687f..df0e014eb41 100755 --- a/src/rustdoc/rustdoc.rs +++ b/src/rustdoc/rustdoc.rs @@ -147,6 +147,7 @@ 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 eca86bcf82c..62b4fdb9fd5 100644 --- a/src/test/run-pass/cci_no_inline_exe.rs +++ b/src/test/run-pass/cci_no_inline_exe.rs @@ -1,3 +1,4 @@ +// xfail-fast - check-fast doesn't understand aux-build // aux-build:cci_no_inline_lib.rs use std;