rustdoc: Change field order on doc::fndoc

diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index 42abc78b4d32ae1a77f6b108ae42d082b8ba0e98..8a0983296a869487effae3168d11a8cdaba8cf50 100644 (file)
--- a/src/rustdoc/attr_pass.rs
+++ b/src/rustdoc/attr_pass.rs
@@ -148,8 +148,8 @@ fn merge_fn_attrs(
             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)
         };
     }
 

diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs
index a479e5f3dd7209ccb7392f19f4d2a80e5f99fb42..c084bfe2657e6087cbc008a6dd44ae9a3bef04db 100644 (file)
--- a/src/rustdoc/doc.rs
+++ b/src/rustdoc/doc.rs
@@ -20,8 +20,8 @@
     name: str,
     brief: option<str>,
     desc: option<str>,
-    return: option<retdoc>,
-    args: [argdoc]
+    args: [argdoc],
+    return: option<retdoc>
 };
 
 type argdoc = ~{

diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
index eacb982252f9ae2dbbd107b0e6e7d2cea45cb7e9..68eeb419f1a2f0767488639eeaf2e14776b7e534 100644 (file)
--- a/src/rustdoc/extract.rs
+++ b/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
     }
 }