---

yaml
---
r: 13806
b: refs/heads/try
c: a25bc19
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: 87c3a5c1a3e2daee39afb60be83133bf4caf4413
+refs/heads/try: a25bc195e25fcce97301b907e2a03501daafb9b9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/attr_parser.rs

@@ -9,8 +9,10 @@ import rustc::syntax::ast;
 import rustc::front::attr;
 import core::tuple;
 
-export crate_attrs, mod_attrs, fn_attrs, arg_attrs, const_attrs, enum_attrs;
-export parse_crate, parse_mod, parse_fn, parse_const, parse_enum;
+export crate_attrs, mod_attrs, fn_attrs, arg_attrs,
+       const_attrs, enum_attrs, variant_attrs;
+export parse_crate, parse_mod, parse_fn, parse_const,
+       parse_enum, parse_variant;
 
 type crate_attrs = {
     name: option<str>
@@ -370,3 +372,48 @@ fn should_parse_enum_long_doc() {
     assert attrs.brief == some("a");
     assert attrs.desc == some("b");
 }
+
+fn parse_variant(attrs: [ast::attribute]) -> variant_attrs {
+    parse_short_doc_or(
+        attrs,
+        {|desc|
+            {
+                desc: desc
+            }
+        },
+        {|_items, brief, desc|
+            if option::is_some(brief) && option::is_some(desc) {
+                // FIXME: Warn about dropping brief description
+            }
+
+            {
+                // Prefer desc over brief
+                desc: option::maybe(brief, desc, {|s| some(s) })
+            }
+        }
+    )
+}
+
+#[test]
+fn should_parse_variant_short_doc() {
+    let source = "#[doc = \"a\"]";
+    let attrs = test::parse_attributes(source);
+    let attrs = parse_variant(attrs);
+    assert attrs.desc == some("a");
+}
+
+#[test]
+fn should_parse_variant_brief_doc() {
+    let source = "#[doc(brief = \"a\")]";
+    let attrs = test::parse_attributes(source);
+    let attrs = parse_variant(attrs);
+    assert attrs.desc == some("a");
+}
+
+#[test]
+fn should_parse_variant_long_doc() {
+    let source = "#[doc(desc = \"a\")]";
+    let attrs = test::parse_attributes(source);
+    let attrs = parse_variant(attrs);
+    assert attrs.desc == some("a");
+}