---

yaml
---
r: 11714
b: refs/heads/master
c: ac8b2c8
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5c28b2c1d111c285148f977a0f39c35cac264db5
+refs/heads/master: ac8b2c83542fdd470c775e0a9e99cd2a26afbf36
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/doc.rs

@@ -70,8 +70,7 @@ type argdoc = {
 };
 
 type retdoc = {
-    desc: option<str>,
-    ty: option<str>
+    desc: option<str>
 };
 
 type enumdoc = {

trunk/src/rustdoc/extract.rs

@@ -136,8 +136,7 @@ fn fndoc_from_fn(
         item: itemdoc,
         args: argdocs_from_args(decl.inputs),
         return: {
-            desc: none,
-            ty: none
+            desc: none
         },
         failure: none,
         sig: none
@@ -253,8 +252,7 @@ fn ifacedoc_from_iface(
                 desc: none,
                 args: argdocs_from_args(method.decl.inputs),
                 return: {
-                    desc: none,
-                    ty: none
+                    desc: none
                 },
                 failure: none,
                 sig: none
@@ -296,8 +294,7 @@ fn impldoc_from_impl(
                 desc: none,
                 args: argdocs_from_args(method.decl.inputs),
                 return: {
-                    desc: none,
-                    ty: none
+                    desc: none
                 },
                 failure: none,
                 sig: none

trunk/src/rustdoc/markdown_pass.rs

@@ -531,37 +531,29 @@ fn write_return(
     ctxt: ctxt,
     doc: doc::retdoc
 ) {
-    alt doc.ty {
-      some(ty) {
-        ctxt.w.write_str(#fmt("Returns `%s`", ty));
-        alt doc.desc {
-          some(d) {
-            ctxt.w.write_line(#fmt(" - %s", d));
-            ctxt.w.write_line("");
-          }
-          none {
-            ctxt.w.write_line("");
-            ctxt.w.write_line("");
-          }
-        }
+    alt doc.desc {
+      some(d) {
+        ctxt.w.write_line(#fmt("Returns - %s", d));
+        ctxt.w.write_line("");
       }
       none { }
     }
 }
 
 #[test]
 fn should_write_return_type_on_new_line() {
-    let markdown = test::render("fn a() -> int { }");
-    assert str::contains(markdown, "\nReturns `int`");
+    let markdown = test::render(
+        "#[doc(return = \"test\")] fn a() -> int { }");
+    assert str::contains(markdown, "\nReturns - test");
 }
 
 #[test]
 fn should_write_blank_line_between_return_type_and_next_header() {
     let markdown = test::render(
-        "fn a() -> int { } \
+        "#[doc(return = \"test\")] fn a() -> int { } \
          fn b() -> int { }"
     );
-    assert str::contains(markdown, "Returns `int`\n\n##");
+    assert str::contains(markdown, "Returns - test\n\n##");
 }
 
 #[test]
@@ -578,14 +570,6 @@ fn should_write_blank_line_after_return_description() {
     assert str::contains(markdown, "blorp\n\n");
 }
 
-#[test]
-fn should_write_return_description_on_same_line_as_type() {
-    let markdown = test::render(
-        "#[doc(return = \"blorp\")] fn a() -> int { }"
-    );
-    assert str::contains(markdown, "Returns `int` - blorp");
-}
-
 fn write_failure(ctxt: ctxt, str: option<str>) {
     alt str {
       some(str) {
@@ -823,8 +807,8 @@ fn should_not_write_iface_method_arguments_if_none() {
 #[test]
 fn should_write_iface_method_return_info() {
     let markdown = test::render(
-        "iface a { fn a() -> int; }");
-    assert str::contains(markdown, "Returns `int`");
+        "iface a { #[doc(return = \"test\")] fn a() -> int; }");
+    assert str::contains(markdown, "Returns - test");
 }
 
 #[test]
@@ -905,8 +889,8 @@ fn should_not_write_impl_method_arguments_if_none() {
 #[test]
 fn should_write_impl_method_return_info() {
     let markdown = test::render(
-        "impl a for int { fn a() -> int { } }");
-    assert str::contains(markdown, "Returns `int`");
+        "impl a for int { #[doc(return = \"test\")] fn a() -> int { } }");
+    assert str::contains(markdown, "Returns - test");
 }
 
 #[test]

trunk/src/rustdoc/prune_undoc_details_pass.rs

@@ -31,8 +31,7 @@ fn fold_fn(
     let doc = fold::default_seq_fold_fn(fold, doc);
 
     {
-        args: prune_args(doc.args),
-        return: prune_return(doc.return)
+        args: prune_args(doc.args)
         with doc
     }
 }
@@ -47,35 +46,12 @@ fn prune_args(docs: [doc::argdoc]) -> [doc::argdoc] {
     }
 }
 
-fn prune_return(doc: doc::retdoc) -> doc::retdoc {
-    {
-        ty: if option::is_some(doc.desc) {
-            doc.ty
-        } else {
-            none
-        }
-        with doc
-    }
-}
-
 #[test]
 fn should_elide_undocumented_arguments() {
     let doc = test::mk_doc("#[doc = \"hey\"] fn a(b: int) { }");
     assert vec::is_empty(doc.cratemod().fns()[0].args);
 }
 
-#[test]
-fn should_elide_undocumented_return_values() {
-    let source = "#[doc = \"fonz\"] fn a() -> int { }";
-    astsrv::from_str(source) {|srv|
-        let doc = extract::from_srv(srv, "");
-        let doc = tystr_pass::mk_pass().f(srv, doc);
-        let doc = attr_pass::mk_pass().f(srv, doc);
-        let doc = run(srv, doc);
-        assert doc.cratemod().fns()[0].return.ty == none;
-    }
-}
-
 fn fold_res(
     fold: fold::fold<()>,
     doc: doc::resdoc
@@ -110,8 +86,7 @@ fn fold_iface(
 fn prune_methods(docs: [doc::methoddoc]) -> [doc::methoddoc] {
     par::anymap(docs) {|doc|
         {
-            args: prune_args(doc.args),
-            return: prune_return(doc.return)
+            args: prune_args(doc.args)
             with doc
         }
     }
@@ -123,12 +98,6 @@ fn should_elide_undocumented_iface_method_args() {
     assert vec::is_empty(doc.cratemod().ifaces()[0].methods[0].args);
 }
 
-#[test]
-fn should_elide_undocumented_iface_method_return_values() {
-    let doc = test::mk_doc("#[doc = \"hey\"] iface i { fn a() -> int; }");
-    assert doc.cratemod().ifaces()[0].methods[0].return.ty == none;
-}
-
 fn fold_impl(
     fold: fold::fold<()>,
     doc: doc::impldoc
@@ -148,13 +117,6 @@ fn should_elide_undocumented_impl_method_args() {
     assert vec::is_empty(doc.cratemod().impls()[0].methods[0].args);
 }
 
-#[test]
-fn should_elide_undocumented_impl_method_return_values() {
-    let doc = test::mk_doc(
-        "#[doc = \"hey\"] impl i for int { fn a() -> int { } }");
-    assert doc.cratemod().impls()[0].methods[0].return.ty == none;
-}
-
 #[cfg(test)]
 mod test {
     fn mk_doc(source: str) -> doc::doc {