Skip to content

Commit b95e2c7

Browse files
committed
---
yaml --- r: 13810 b: refs/heads/try c: d6ce209 h: refs/heads/master v: v3
1 parent eb1bd4e commit b95e2c7

File tree

2 files changed

+47
-2
lines changed

2 files changed

+47
-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: 53c6454de58dd3b7aeb2ad2c390872004cafff2c
5+
refs/heads/try: d6ce20973a8c467c234d877aa4cbde5f73be20f0
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/desc_pass.rs

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ fn run(
1818
let fold = fold::fold({
1919
fold_mod: fold_mod,
2020
fold_const: fold_const,
21-
fold_fn: fold_fn
21+
fold_fn: fold_fn,
22+
fold_enum: fold_enum
2223
with *fold::default_seq_fold(op)
2324
});
2425
fold.fold_crate(fold, doc)
@@ -68,3 +69,47 @@ fn fold_fn(fold: fold::fold<op>, doc: doc::fndoc) -> doc::fndoc {
6869
with *doc
6970
}
7071
}
72+
73+
fn fold_enum(fold: fold::fold<op>, doc: doc::enumdoc) -> doc::enumdoc {
74+
~{
75+
brief: maybe_apply_op(fold.ctxt, doc.brief),
76+
desc: maybe_apply_op(fold.ctxt, doc.desc),
77+
variants: vec::map(doc.variants) {|variant|
78+
~{
79+
desc: maybe_apply_op(fold.ctxt, variant.desc)
80+
with *variant
81+
}
82+
}
83+
with *doc
84+
}
85+
}
86+
87+
#[test]
88+
fn should_execute_op_on_enum_brief() {
89+
let source = "#[doc(brief = \" a \")] enum a { b }";
90+
let srv = astsrv::mk_srv_from_str(source);
91+
let doc = extract::from_srv(srv, "");
92+
let doc = attr_pass::mk_pass()(srv, doc);
93+
let doc = mk_pass(str::trim)(srv, doc);
94+
assert doc.topmod.enums[0].brief == some("a");
95+
}
96+
97+
#[test]
98+
fn should_execute_op_on_enum_desc() {
99+
let source = "#[doc(desc = \" a \")] enum a { b }";
100+
let srv = astsrv::mk_srv_from_str(source);
101+
let doc = extract::from_srv(srv, "");
102+
let doc = attr_pass::mk_pass()(srv, doc);
103+
let doc = mk_pass(str::trim)(srv, doc);
104+
assert doc.topmod.enums[0].desc == some("a");
105+
}
106+
107+
#[test]
108+
fn should_execute_op_on_variant_desc() {
109+
let source = "enum a { #[doc = \" 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 = mk_pass(str::trim)(srv, doc);
114+
assert doc.topmod.enums[0].variants[0].desc == some("a");
115+
}

0 commit comments

Comments
 (0)