rustdoc: Add function signature field to the doc::fndoc

diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs
index 9b718aa988bcbb702e7d6f6d0fdd84e4e465c8a3..89c8f304e1a8842985607253e6a9ed491c4dad3d 100644 (file)
--- a/src/rustdoc/attr_pass.rs
+++ b/src/rustdoc/attr_pass.rs
@@ -134,7 +134,8 @@ fn merge_fn_attrs(
             brief: attrs.brief,
             desc: attrs.desc,
             args: merge_arg_attrs(doc.args, attrs.args),
-            return: merge_ret_attrs(doc.return, attrs.return)
+            return: merge_ret_attrs(doc.return, attrs.return),
+            ty: none
         };
     }
 

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

diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
index a636e6219c40a212c342464425260d9d9abe0b9b..eba2ba8d63f3ce57539c1bfb4d8c2c8cfbadb522 100644 (file)
--- a/src/rustdoc/extract.rs
+++ b/src/rustdoc/extract.rs
@@ -80,7 +80,8 @@ fn fndoc_from_fn(
         brief: none,
         desc: none,
         args: argdocs_from_args(decl.inputs),
-        return: none
+        return: none,
+        ty: none
     }
 }