Skip to content

Commit b74a6ce

Browse files
committed
---
yaml --- r: 13917 b: refs/heads/try c: fd7bb70 h: refs/heads/master i: 13915: f296f99 v: v3
1 parent a13b3f5 commit b74a6ce

File tree

2 files changed

+45
-2
lines changed

2 files changed

+45
-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: a64030697b0ac7852b952248e9bad46bad10c1a9
5+
refs/heads/try: fd7bb70d6f8a08cbc1d6f2f37dc7781840e9a881
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/desc_to_brief_pass.rs

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ fn run(
2222
fold_const: fold_const,
2323
fold_fn: fold_fn,
2424
fold_enum: fold_enum,
25-
fold_res: fold_res
25+
fold_res: fold_res,
26+
fold_iface: fold_iface
2627
with *fold::default_seq_fold(())
2728
});
2829
fold.fold_crate(fold, doc)
@@ -83,6 +84,26 @@ fn fold_res(fold: fold::fold<()>, doc: doc::resdoc) -> doc::resdoc {
8384
}
8485
}
8586

87+
fn fold_iface(fold: fold::fold<()>, doc: doc::ifacedoc) -> doc::ifacedoc {
88+
let doc =fold::default_seq_fold_iface(fold, doc);
89+
let (brief, desc) = modify(doc.brief, doc.desc);
90+
91+
{
92+
brief: brief,
93+
desc: desc,
94+
methods: vec::map(doc.methods) {|doc|
95+
let (brief, desc) = modify(doc.brief, doc.desc);
96+
97+
{
98+
brief: brief,
99+
desc: desc
100+
with doc
101+
}
102+
}
103+
with doc
104+
}
105+
}
106+
86107
#[test]
87108
fn should_promote_mod_desc() {
88109
let source = "#[doc(desc = \"desc\")] mod m { }";
@@ -138,6 +159,28 @@ fn should_promote_resource_desc() {
138159
assert doc.topmod.resources()[0].desc == none;
139160
}
140161

162+
#[test]
163+
fn should_promote_iface_desc() {
164+
let source = "#[doc(desc = \"desc\")] iface i { fn a(); }";
165+
let srv = astsrv::mk_srv_from_str(source);
166+
let doc = extract::from_srv(srv, "");
167+
let doc = attr_pass::mk_pass()(srv, doc);
168+
let doc = run(srv, doc);
169+
assert doc.topmod.ifaces()[0].brief == some("desc");
170+
assert doc.topmod.ifaces()[0].desc == none;
171+
}
172+
173+
#[test]
174+
fn should_promote_iface_method_desc() {
175+
let source = "iface i { #[doc(desc = \"desc\")] fn a(); }";
176+
let srv = astsrv::mk_srv_from_str(source);
177+
let doc = extract::from_srv(srv, "");
178+
let doc = attr_pass::mk_pass()(srv, doc);
179+
let doc = run(srv, doc);
180+
assert doc.topmod.ifaces()[0].methods[0].brief == some("desc");
181+
assert doc.topmod.ifaces()[0].methods[0].desc == none;
182+
}
183+
141184
fn modify(
142185
brief: option<str>,
143186
desc: option<str>

0 commit comments

Comments
 (0)