Skip to content

Commit 29bf671

Browse files
committed
---
yaml --- r: 7411 b: refs/heads/master c: 2d85e8f h: refs/heads/master i: 7409: ed96bae 7407: 1dda457 v: v3
1 parent d99f8ae commit 29bf671

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 6c295c0f49c880c895e21c4e7d741943cfed75e0
2+
refs/heads/master: 2d85e8f59a59233c83889e74e9e41dbf257c91b5

trunk/src/rustdoc/gen.rs

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ fn write_return(
141141
some(doc) {
142142
alt doc.ty {
143143
some(ty) {
144-
ctxt.w.write_line("### Returns `" + ty + "`");
144+
ctxt.w.write_line(#fmt("Returns `%s`", ty));
145+
ctxt.w.write_line("");
145146
alt doc.desc {
146147
some(d) {
147148
ctxt.w.write_line(d);
@@ -162,6 +163,7 @@ mod tests {
162163
let srv = astsrv::mk_srv_from_str(source);
163164
let doc = extract::from_srv(srv, "");
164165
let doc = attr_pass::mk_pass()(srv, doc);
166+
let doc = tystr_pass::mk_pass()(srv, doc);
165167
write_markdown_str(doc)
166168
}
167169

@@ -208,16 +210,31 @@ mod tests {
208210
}
209211

210212
#[test]
211-
fn should_leve_blank_line_after_brief() {
213+
fn should_leave_blank_line_after_brief() {
212214
let markdown = render("#[doc(brief = \"brief\")] fn a() { }");
213215
assert str::contains(markdown, "brief\n\n");
214216
}
215217

216218
#[test]
217-
fn should_leve_blank_line_between_brief_and_desc() {
219+
fn should_leave_blank_line_between_brief_and_desc() {
218220
let markdown = render(
219221
"#[doc(brief = \"brief\", desc = \"desc\")] fn a() { }"
220222
);
221223
assert str::contains(markdown, "brief\n\ndesc");
222224
}
225+
226+
#[test]
227+
fn should_write_return_type_on_new_line() {
228+
let markdown = render("fn a() -> int { }");
229+
assert str::contains(markdown, "\nReturns `int`");
230+
}
231+
232+
#[test]
233+
fn should_write_blank_line_between_return_type_and_next_header() {
234+
let markdown = render(
235+
"fn a() -> int { } \
236+
fn b() -> int { }"
237+
);
238+
assert str::contains(markdown, "Returns `int`\n\n##");
239+
}
223240
}

0 commit comments

Comments
 (0)