Skip to content

Commit b908c44

Browse files
committed
---
yaml --- r: 4837 b: refs/heads/master c: 113be53 h: refs/heads/master i: 4835: 885df31 v: v3
1 parent 7b6be1a commit b908c44

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
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: 8c3ed8640b175ceeb1347415ed960532e20d64d2
2+
refs/heads/master: 113be53df357c4e678d750c2a62b2949117954ab

trunk/src/comp/syntax/print/pprust.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1563,7 +1563,11 @@ fn print_comment(s: &ps, cmnt: lexer::cmnt) {
15631563
}
15641564
lexer::blank_line. {
15651565
// We need to do at least one, possibly two hardbreaks.
1566-
if is_begin(s) || is_end(s) { hardbreak(s.s) }
1566+
let is_semi = alt s.s.last_token() {
1567+
pp::STRING(s, _) { s == ";" }
1568+
_ { false }
1569+
};
1570+
if is_semi || is_begin(s) || is_end(s) { hardbreak(s.s) }
15671571
hardbreak(s.s);
15681572
}
15691573
}

trunk/src/test/pretty/blank-lines.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// pp-exact
2+
fn f() -> [int] {
3+
let picard = 0;
4+
5+
let data = 1;
6+
7+
let worf = 2;
8+
9+
10+
let enterprise = [picard, data, worf];
11+
12+
13+
14+
ret enterprise;
15+
}

0 commit comments

Comments
 (0)