2 files changed, 68 insertions, 3 deletions
diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index 7fa45932616..c5fcd6c0af7 100644
--- a/src/rustdoc/attr_pass.rs
+++ b/src/rustdoc/attr_pass.rs
@@ -1,10 +1,74 @@
 import rustc::syntax::ast;
+import rustc::middle::ast_map;
 
 export run;
 
 fn run(
-    _doc: doc::cratedoc,
-    _crate: @ast::crate
+    srv: astsrv::seq_srv,
+    doc: doc::cratedoc
 ) -> doc::cratedoc {
-    fail;
+    let fold = fold::fold({
+        fold_fn: fn~(
+            f: fold::fold<astsrv::seq_srv>,
+            d: doc::fndoc
+        ) -> doc::fndoc {
+            fold_fn(f, d)
+        }
+        with *fold::default_seq_fold(srv)
+    });
+    fold.fold_crate(fold, doc)
+}
+
+fn fold_fn(
+    fold: fold::fold<astsrv::seq_srv>,
+    doc: doc::fndoc
+) -> doc::fndoc {
+
+    let srv = fold.ctxt;
+
+    let attrs = alt srv.map.get(doc.id) {
+      ast_map::node_item(item) { item.attrs }
+    };
+    let attrs = attr_parser::parse_fn(attrs);
+    ret merge_fn_attrs(doc, attrs);
+
+    fn merge_fn_attrs(
+        doc: doc::fndoc,
+        attrs: attr_parser::fn_attrs
+    ) -> doc::fndoc {
+        ret ~{
+            id: doc.id,
+            name: doc.name,
+            brief: attrs.brief,
+            desc: attrs.desc,
+            return: merge_ret_attrs(doc.return, attrs.return),
+            args: merge_arg_attrs(doc.args, attrs.args)
+        };
+    }
+
+    fn merge_arg_attrs(
+        doc: [(str, str)],
+        _attrs: [attr_parser::arg_attrs]
+    ) -> [(str, str)] {
+        // FIXME
+        doc
+    }
+
+    fn merge_ret_attrs(
+        doc: option<doc::retdoc>,
+        _attrs: option<str>
+    ) -> option<doc::retdoc> {
+        // FIXME
+        doc
+    }
+}
+
+#[test]
+fn fold_fn_should_extract_fn_attributes() {
+    let source = "#[doc = \"test\"] fn a() -> int { }";
+    let srv = astsrv::mk_seq_srv_from_str(source);
+    let doc = extract::from_srv(srv, "");
+    let fold = fold::default_seq_fold(srv);
+    let doc = fold_fn(fold, doc.topmod.fns[0]);
+    assert doc.desc == some("test");
 }
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index 8f69ba780e3..3f85f3e0946 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -76,6 +76,7 @@ fn run(source_file: str) {
     let srv = astsrv::mk_seq_srv_from_file(source_file);
     let doc = extract::from_srv(srv, default_name);
     let doc = run_passes(srv, doc, [
+        attr_pass::run,
         tystr_pass::run
     ]);
     gen::write_markdown(doc, std::io::stdout());