Skip to content

Commit eb1bd4e

Browse files
committed
---
yaml --- r: 13809 b: refs/heads/try c: 53c6454 h: refs/heads/master i: 13807: cab0f6c v: v3
1 parent 6b82342 commit eb1bd4e

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 1d94f40c6c9a03312b3de0902e6c6a66a54ee0a2
5+
refs/heads/try: 53c6454de58dd3b7aeb2ad2c390872004cafff2c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/desc_to_brief_pass.rs

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ fn run(
2020
let fold = fold::fold({
2121
fold_mod: fold_mod,
2222
fold_const: fold_const,
23-
fold_fn: fold_fn
23+
fold_fn: fold_fn,
24+
fold_enum: fold_enum
2425
with *fold::default_seq_fold(())
2526
});
2627
fold.fold_crate(fold, doc)
@@ -59,6 +60,17 @@ fn fold_fn(fold: fold::fold<()>, doc: doc::fndoc) -> doc::fndoc {
5960
}
6061
}
6162

63+
fn fold_enum(fold: fold::fold<()>, doc: doc::enumdoc) -> doc::enumdoc {
64+
let doc = fold::default_seq_fold_enum(fold, doc);
65+
let (brief, desc) = modify(doc.brief, doc.desc);
66+
67+
~{
68+
brief: brief,
69+
desc: desc
70+
with *doc
71+
}
72+
}
73+
6274
#[test]
6375
fn should_promote_mod_desc() {
6476
let source = "#[doc(desc = \"desc\")] mod m { }";
@@ -92,6 +104,17 @@ fn should_promote_fn_desc() {
92104
assert doc.topmod.fns[0].desc == none;
93105
}
94106

107+
#[test]
108+
fn should_promote_enum_desc() {
109+
let source = "#[doc(desc = \"desc\")] enum a { b }";
110+
let srv = astsrv::mk_srv_from_str(source);
111+
let doc = extract::from_srv(srv, "");
112+
let doc = attr_pass::mk_pass()(srv, doc);
113+
let doc = run(srv, doc);
114+
assert doc.topmod.enums[0].brief == some("desc");
115+
assert doc.topmod.enums[0].desc == none;
116+
}
117+
95118
fn modify(
96119
brief: option<str>,
97120
desc: option<str>

0 commit comments

Comments
 (0)