---

yaml
---
r: 7462
b: refs/heads/master
c: 515fdb2
h: refs/heads/master
v: v3

Author: brson

[refs]

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

trunk/src/rustdoc/attr_pass.rs

@@ -148,8 +148,8 @@ fn fold_fn(
             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)
+            args: merge_arg_attrs(doc.args, attrs.args),
+            return: merge_ret_attrs(doc.return, attrs.return)
         };
     }
 

trunk/src/rustdoc/doc.rs

@@ -20,8 +20,8 @@ type fndoc = ~{
     name: str,
     brief: option<str>,
     desc: option<str>,
-    return: option<retdoc>,
-    args: [argdoc]
+    args: [argdoc],
+    return: option<retdoc>
 };
 
 type argdoc = ~{

trunk/src/rustdoc/extract.rs

@@ -78,8 +78,8 @@ fn fndoc_from_fn(
         name: name,
         brief: none,
         desc: none,
-        return: none,
-        args: argdocs_from_args(decl.inputs)
+        args: argdocs_from_args(decl.inputs),
+        return: none
     }
 }