Skip to content

Commit 965a840

Browse files
committed
---
yaml --- r: 7861 b: refs/heads/snap-stage3 c: 4c188fb h: refs/heads/master i: 7859: d9d895e v: v3
1 parent a255754 commit 965a840

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
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 21fc2a36d8941242e65227d1362259bc7b399bec
4+
refs/heads/snap-stage3: 4c188fb82f815f80b3ff411f699f4dc5f16823e0
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rustdoc/desc_to_brief_pass.rs

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ fn run(
2121
fold_mod: fold_mod,
2222
fold_const: fold_const,
2323
fold_fn: fold_fn,
24-
fold_enum: fold_enum
24+
fold_enum: fold_enum,
25+
fold_res: fold_res
2526
with *fold::default_seq_fold(())
2627
});
2728
fold.fold_crate(fold, doc)
@@ -71,6 +72,17 @@ fn fold_enum(fold: fold::fold<()>, doc: doc::enumdoc) -> doc::enumdoc {
7172
}
7273
}
7374

75+
fn fold_res(fold: fold::fold<()>, doc: doc::resdoc) -> doc::resdoc {
76+
let doc = fold::default_seq_fold_res(fold, doc);
77+
let (brief, desc) = modify(doc.brief, doc.desc);
78+
79+
~{
80+
brief: brief,
81+
desc: desc
82+
with *doc
83+
}
84+
}
85+
7486
#[test]
7587
fn should_promote_mod_desc() {
7688
let source = "#[doc(desc = \"desc\")] mod m { }";
@@ -115,6 +127,17 @@ fn should_promote_enum_desc() {
115127
assert doc.topmod.enums[0].desc == none;
116128
}
117129

130+
#[test]
131+
fn should_promote_resource_desc() {
132+
let source = "#[doc(desc = \"desc\")] resource r(a: bool) { }";
133+
let srv = astsrv::mk_srv_from_str(source);
134+
let doc = extract::from_srv(srv, "");
135+
let doc = attr_pass::mk_pass()(srv, doc);
136+
let doc = run(srv, doc);
137+
assert doc.topmod.resources[0].brief == some("desc");
138+
assert doc.topmod.resources[0].desc == none;
139+
}
140+
118141
fn modify(
119142
brief: option<str>,
120143
desc: option<str>

0 commit comments

Comments
 (0)