From 515fdb2863d0e192499ab1aaf5f591be333d31ee Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 18 Jan 2012 21:57:18 -0800
Subject: [PATCH] rustdoc: Change field order on doc::fndoc

---
 src/rustdoc/attr_pass.rs | 4 ++--
 src/rustdoc/doc.rs       | 4 ++--
 src/rustdoc/extract.rs   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index 42abc78b4d32..8a0983296a86 100644
--- a/src/rustdoc/attr_pass.rs
+++ b/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)
         };
     }
 
diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs
index a479e5f3dd72..c084bfe2657e 100644
--- a/src/rustdoc/doc.rs
+++ b/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 = ~{
diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
index eacb982252f9..68eeb419f1a2 100644
--- 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
     }
 }