Skip to content

Commit 0235e74

Browse files
committed
Give up on use of huge_word for comments. Still not formatting quite right, but closer.
1 parent f4df2e4 commit 0235e74

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

src/comp/pretty/pprust.rs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,32 +1185,25 @@ fn print_remaining_comments(&ps s) {
11851185

11861186
fn print_comment(&ps s, lexer::cmnt cmnt) {
11871187
alt (cmnt.style) {
1188-
case (lexer::isolated) {
1189-
hardbreak(s.s);
1190-
for (str line in cmnt.lines) {
1191-
huge_word(s.s, line);
1192-
zerobreak(s.s);
1193-
}
1188+
case (lexer::mixed) {
1189+
assert vec::len(cmnt.lines) == 1u;
1190+
zerobreak(s.s);
1191+
word(s.s, cmnt.lines.(0));
1192+
zerobreak(s.s);
11941193
}
1195-
case (lexer::trailing) {
1194+
case (_) {
11961195
if (vec::len(cmnt.lines) == 1u) {
11971196
word(s.s, cmnt.lines.(0));
11981197
hardbreak(s.s);
11991198
} else {
1200-
cbox(s.s, 0u);
1199+
ibox(s.s, 0u);
12011200
for (str line in cmnt.lines) {
1202-
huge_word(s.s, line);
1203-
zerobreak(s.s);
1201+
word(s.s, line);
1202+
hardbreak(s.s);
12041203
}
12051204
end(s.s);
12061205
}
12071206
}
1208-
case (lexer::mixed) {
1209-
assert vec::len(cmnt.lines) == 1u;
1210-
zerobreak(s.s);
1211-
word(s.s, cmnt.lines.(0));
1212-
zerobreak(s.s);
1213-
}
12141207
}
12151208
}
12161209
//

0 commit comments

Comments
 (0)