diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs index 5e1e6eaf654..2e82d987b26 100644 --- a/src/rustdoc/attr_parser.rs +++ b/src/rustdoc/attr_parser.rs @@ -24,12 +24,14 @@ type arg_attrs = { desc: str }; -#[doc = - "Given a vec of attributes, extract the meta_items contained in the \ - doc attribute"] fn doc_meta( attrs: [ast::attribute] ) -> option<@ast::meta_item> { + + #[doc = + "Given a vec of attributes, extract the meta_items contained in the \ + doc attribute"]; + let doc_attrs = attr::find_attrs_by_name(attrs, "doc"); let doc_metas = attr::attr_metas(doc_attrs); if vec::is_not_empty(doc_metas) { diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs index 51acade36cf..be183e3b0be 100644 --- a/src/rustdoc/extract.rs +++ b/src/rustdoc/extract.rs @@ -4,11 +4,13 @@ import rustc::syntax::ast; export from_srv, extract; -#[doc = "Use the AST service to create a document tree"] fn from_srv( srv: astsrv::srv, default_name: str ) -> doc::cratedoc { + + #[doc = "Use the AST service to create a document tree"]; + astsrv::exec(srv) {|ctxt| extract(ctxt.ast, default_name) } diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs index 988d4176e0e..2abb6b4718b 100755 --- a/src/rustdoc/rustdoc.rs +++ b/src/rustdoc/rustdoc.rs @@ -5,12 +5,14 @@ #[doc = "A single operation on the document model"] type pass = fn~(srv: astsrv::srv, doc: doc::cratedoc) -> doc::cratedoc; -#[doc = "Run a series of passes over the document"] fn run_passes( srv: astsrv::srv, doc: doc::cratedoc, passes: [pass] ) -> doc::cratedoc { + + #[doc = "Run a series of passes over the document"]; + vec::foldl(doc, passes) {|doc, pass| pass(srv, doc) }