---

yaml
---
r: 13799
b: refs/heads/try
c: e946792
h: refs/heads/master
i:
  13797: 1784436
  13795: f6ee3db
  13791: 3f6d19b
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: 2999479a2dcb10019558d64c2045fdee31841d31
+refs/heads/try: e946792a78590df3972fc4a9827d5e94d333d055
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/extract.rs

@@ -77,7 +77,17 @@ fn moddoc_from_mod(
                   }
                 }
             }),
-        enums: doc::enumlist([])
+        enums: doc::enumlist(
+            vec::filter_map(module.items) {|item|
+                alt item.node {
+                  ast::item_enum(variants, _) {
+                    some(enumdoc_from_enum(item.ident, item.id, variants))
+                  }
+                  _ {
+                    none
+                  }
+                }
+            })
     }
 }
 
@@ -145,6 +155,51 @@ fn should_extract_const_name_and_id() {
     assert doc.topmod.consts[0].name == "a";
 }
 
+fn enumdoc_from_enum(
+    name: ast::ident,
+    id: ast::node_id,
+    variants: [ast::variant]
+) -> doc::enumdoc {
+    ~{
+        id: id,
+        name: name,
+        brief: none,
+        desc: none,
+        variants: variantdocs_from_variants(variants)
+    }
+}
+
+fn variantdocs_from_variants(
+    variants: [ast::variant]
+) -> [doc::variantdoc] {
+    vec::map(variants, variantdoc_from_variant)
+}
+
+fn variantdoc_from_variant(variant: ast::variant) -> doc::variantdoc {
+    ~{
+        name: variant.node.name,
+        desc: none,
+        sig: none
+    }
+}
+
+#[test]
+fn should_extract_enums() {
+    let source = "enum e { v }";
+    let ast = parse::from_str(source);
+    let doc = extract(ast, "");
+    assert doc.topmod.enums[0].id != 0;
+    assert doc.topmod.enums[0].name == "e";
+}
+
+#[test]
+fn should_extract_enum_variants() {
+    let source = "enum e { v }";
+    let ast = parse::from_str(source);
+    let doc = extract(ast, "");
+    assert doc.topmod.enums[0].variants[0].name == "v";
+}
+
 #[cfg(test)]
 mod tests {