---

yaml
---
r: 11467
b: refs/heads/master
c: 1601005
h: refs/heads/master
i:
  11465: b4cfb78
  11463: 52c8d02
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2576a3c2c9584365fa134bfc1755112855ddfcd2
+refs/heads/master: 16010058a64a8c0f2db064a365550e3dc5b88171
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/tystr_pass.rs

@@ -48,7 +48,11 @@ fn get_fn_sig(srv: astsrv::srv, fn_id: doc::ast_id) -> option<str> {
         alt check ctxt.ast_map.get(fn_id) {
           ast_map::node_item(@{
             ident: ident,
-            node: ast::item_fn(decl, _, blk), _
+            node: ast::item_fn(decl, _, _), _
+          }, _) |
+          ast_map::node_native_item(@{
+            ident: ident,
+            node: ast::native_item_fn(decl, _), _
           }, _) {
             some(pprust::fun_to_str(decl, ident, []))
           }
@@ -62,6 +66,12 @@ fn should_add_fn_sig() {
     assert doc.topmod.fns()[0].sig == some("fn a() -> int");
 }
 
+#[test]
+fn should_add_native_fn_sig() {
+    let doc = test::mk_doc("native mod a { fn a() -> int; }");
+    assert doc.topmod.nmods()[0].fns[0].sig == some("fn a() -> int");
+}
+
 fn merge_ret_ty(
     srv: astsrv::srv,
     fn_id: doc::ast_id,
@@ -83,6 +93,9 @@ fn get_ret_ty(srv: astsrv::srv, fn_id: doc::ast_id) -> option<str> {
         alt check ctxt.ast_map.get(fn_id) {
           ast_map::node_item(@{
             node: ast::item_fn(decl, _, _), _
+          }, _) |
+          ast_map::node_native_item(@{
+            node: ast::native_item_fn(decl, _), _
           }, _) {
             ret_ty_to_str(decl)
           }
@@ -111,6 +124,12 @@ fn should_not_add_nil_ret_type() {
     assert doc.topmod.fns()[0].return.ty == none;
 }
 
+#[test]
+fn should_add_native_fn_ret_types() {
+    let doc = test::mk_doc("native mod a { fn a() -> int; }");
+    assert doc.topmod.nmods()[0].fns[0].return.ty == some("int");
+}
+
 fn merge_arg_tys(
     srv: astsrv::srv,
     fn_id: doc::ast_id,
@@ -135,6 +154,9 @@ fn get_arg_tys(srv: astsrv::srv, fn_id: doc::ast_id) -> [(str, str)] {
           }, _) |
           ast_map::node_item(@{
             node: ast::item_res(decl, _, _, _, _), _
+          }, _) |
+          ast_map::node_native_item(@{
+            node: ast::native_item_fn(decl, _), _
           }, _) {
             decl_arg_tys(decl)
           }
@@ -156,6 +178,12 @@ fn should_add_arg_types() {
     assert fn_.args[1].ty == some("bool");
 }
 
+#[test]
+fn should_add_native_fn_arg_types() {
+    let doc = test::mk_doc("native mod a { fn a(b: int); }");
+    assert doc.topmod.nmods()[0].fns[0].args[0].ty == some("int");
+}
+
 fn fold_const(
     fold: fold::fold<astsrv::srv>,
     doc: doc::constdoc