---

yaml
---
r: 13758
b: refs/heads/try
c: fc64aef
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: cb44fa2a2176bb81e3d7fa9e99503805d08eebf2
+refs/heads/try: fc64aefe0aebe547322e86b3e5daa4564d038e63
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/rustdoc.rc

@@ -24,4 +24,5 @@ mod tystr_pass;
 mod prune_undoc_pass;
 mod prune_unexported_pass;
 mod desc_to_brief_pass;
+mod trim_pass;
 mod astsrv;

branches/try/src/rustdoc/rustdoc.rs

@@ -101,6 +101,7 @@ fn run(source_file: str) {
         // FIXME: This pass should be optional
         prune_undoc_pass::mk_pass(),
         desc_to_brief_pass::mk_pass(),
+        trim_pass::mk_pass(),
         gen::mk_pass {|| std::io:: stdout()}
     ]);
 }

branches/try/src/rustdoc/trim_pass.rs

@@ -0,0 +1,130 @@
+#[doc = "
+
+Pulls a brief description out of a long description.
+
+If the first paragraph of a long description is short enough then it
+is interpreted as the brief description.
+
+"];
+
+export mk_pass;
+
+fn mk_pass() -> pass {
+    run
+}
+
+fn run(
+    _srv: astsrv::srv,
+    doc: doc::cratedoc
+) -> doc::cratedoc {
+    let fold = fold::fold({
+        fold_mod: fold_mod,
+        fold_const: fold_const,
+        fold_fn: fold_fn
+        with *fold::default_seq_fold(())
+    });
+    fold.fold_crate(fold, doc)
+}
+
+fn trimopt(s: option<str>) -> option<str> {
+    option::map(s, {|s| str::trim(s) })
+}
+
+fn fold_mod(fold: fold::fold<()>, doc: doc::moddoc) -> doc::moddoc {
+    let doc = fold::default_seq_fold_mod(fold, doc);
+
+    ~{
+        brief: trimopt(doc.brief),
+        desc: trimopt(doc.desc)
+        with *doc
+    }
+}
+
+#[test]
+fn should_trim_mod() {
+    let source = "#[doc(brief = \"\nbrief\n\", \
+                  desc = \"\ndesc\n\")] \
+                  mod m { }";
+    let srv = astsrv::mk_srv_from_str(source);
+    let doc = extract::from_srv(srv, "");
+    let doc = attr_pass::mk_pass()(srv, doc);
+    let doc = run(srv, doc);
+    assert doc.topmod.mods[0].brief == some("brief");
+    assert doc.topmod.mods[0].desc == some("desc");
+}
+
+fn fold_const(fold: fold::fold<()>, doc: doc::constdoc) -> doc::constdoc {
+    let doc = fold::default_seq_fold_const(fold, doc);
+
+    ~{
+        brief: trimopt(doc.brief),
+        desc: trimopt(doc.desc)
+        with *doc
+    }
+}
+
+#[test]
+fn should_trim_const() {
+    let source = "#[doc(brief = \"\nbrief\n\", \
+                  desc = \"\ndesc\n\")] \
+                  const a: bool = true;";
+    let srv = astsrv::mk_srv_from_str(source);
+    let doc = extract::from_srv(srv, "");
+    let doc = attr_pass::mk_pass()(srv, doc);
+    let doc = run(srv, doc);
+    assert doc.topmod.consts[0].brief == some("brief");
+    assert doc.topmod.consts[0].desc == some("desc");
+}
+
+fn fold_fn(fold: fold::fold<()>, doc: doc::fndoc) -> doc::fndoc {
+    let doc = fold::default_seq_fold_fn(fold, doc);
+
+    ~{
+        brief: trimopt(doc.brief),
+        desc: trimopt(doc.desc),
+        args: vec::map(doc.args) {|doc|
+            ~{
+                desc: trimopt(doc.desc)
+                with *doc
+            }
+        },
+        return: {
+            desc: trimopt(doc.return.desc)
+            with doc.return
+        }
+        with *doc
+    }
+}
+
+#[test]
+fn should_trim_fn() {
+    let source = "#[doc(brief = \"\nbrief\n\", \
+                  desc = \"\ndesc\n\")] \
+                  fn a() { }";
+    let srv = astsrv::mk_srv_from_str(source);
+    let doc = extract::from_srv(srv, "");
+    let doc = attr_pass::mk_pass()(srv, doc);
+    let doc = run(srv, doc);
+    assert doc.topmod.fns[0].brief == some("brief");
+    assert doc.topmod.fns[0].desc == some("desc");
+}
+
+#[test]
+fn should_trim_args() {
+    let source = "#[doc(args(a = \"\na\n\"))] fn a(a: int) { }";
+    let srv = astsrv::mk_srv_from_str(source);
+    let doc = extract::from_srv(srv, "");
+    let doc = attr_pass::mk_pass()(srv, doc);
+    let doc = run(srv, doc);
+    assert doc.topmod.fns[0].args[0].desc == some("a");
+}
+
+#[test]
+fn should_trim_ret() {
+    let source = "#[doc(return = \"\na\n\")] fn a() -> int { }";
+    let srv = astsrv::mk_srv_from_str(source);
+    let doc = extract::from_srv(srv, "");
+    let doc = attr_pass::mk_pass()(srv, doc);
+    let doc = run(srv, doc);
+    assert doc.topmod.fns[0].return.desc == some("a");
+}