---

yaml
---
r: 7463
b: refs/heads/master
c: 266cc7b
h: refs/heads/master
i:
  7461: 9916d97
  7459: 6a87e12
  7455: e4655e5
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 515fdb2863d0e192499ab1aaf5f591be333d31ee
+refs/heads/master: 266cc7b0c30194300ca49eda6da95941b01474b9

trunk/src/rustdoc/attr_pass.rs

@@ -154,11 +154,23 @@ fn fold_fn(
     }
 
     fn merge_arg_attrs(
-        doc: [doc::argdoc],
-        _attrs: [attr_parser::arg_attrs]
+        docs: [doc::argdoc],
+        attrs: [attr_parser::arg_attrs]
     ) -> [doc::argdoc] {
-        // FIXME
-        doc
+        vec::map(docs) {|doc|
+            alt vec::find(attrs) {|attr|
+                attr.name == doc.name
+            } {
+                some(attr) {
+                    ~{
+                        desc: some(attr.desc)
+                        with *doc
+                    }
+                }
+                none. { doc }
+            }
+        }
+        // FIXME: Warning when documenting a non-existant arg
     }
 
     fn merge_ret_attrs(
@@ -179,3 +191,13 @@ fn fold_fn_should_extract_fn_attributes() {
     let doc = fold_fn(fold, doc.topmod.fns[0]);
     assert doc.desc == some("test");
 }
+
+#[test]
+fn fold_fn_should_extract_arg_attributes() {
+    let source = "#[doc(args(a = \"b\"))] fn c(a: bool) { }";
+    let srv = astsrv::mk_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.args[0].desc == some("b");
+}

trunk/src/rustdoc/doc.rs

@@ -26,6 +26,7 @@ type fndoc = ~{
 
 type argdoc = ~{
     name: str,
+    desc: option<str>,
     ty: option<str>
 };
 

trunk/src/rustdoc/extract.rs

@@ -100,6 +100,7 @@ fn argdocs_from_args(args: [ast::arg]) -> [doc::argdoc] {
 fn argdoc_from_arg(arg: ast::arg) -> doc::argdoc {
     ~{
         name: arg.ident,
+        desc: none,
         ty: none
     }
 }