---

yaml
---
r: 4831
b: refs/heads/master
c: b02f1f4
h: refs/heads/master
i:
  4829: 053f114
  4827: 26c6404
  4823: 9783864
  4815: 7c837af
  4799: f747cd9
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84fb821e4036a65f78db1821d75b95526ed3fd76
+refs/heads/master: b02f1f46e550e8f87df6c3ec7f9721b1f4edc958

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

@@ -1537,7 +1537,12 @@ fn print_comment(s: &ps, cmnt: lexer::cmnt) {
       }
       lexer::isolated. {
         pprust::hardbreak_if_not_bol(s);
-        for line: str in cmnt.lines { word(s.s, line); hardbreak(s.s); }
+        for line: str in cmnt.lines {
+            // Don't print empty lines because they will end up as trailing
+            // whitespace
+            if str::is_not_empty(line) { word(s.s, line); }
+            hardbreak(s.s);
+        }
       }
       lexer::trailing. {
         word(s.s, " ");
@@ -1546,7 +1551,10 @@ fn print_comment(s: &ps, cmnt: lexer::cmnt) {
             hardbreak(s.s);
         } else {
             ibox(s, 0u);
-            for line: str in cmnt.lines { word(s.s, line); hardbreak(s.s); }
+            for line: str in cmnt.lines {
+                if str::is_not_empty(line) { word(s.s, line); }
+                hardbreak(s.s);
+            }
             end(s);
         }
       }

trunk/src/test/pretty/block-comment-trailing-whitespace.rs

@@ -0,0 +1,8 @@
+// pp-exact
+fn f() {
+    /*
+    The next line should not be indented.
+
+    That one. It shouldn't have been indented.
+    */
+}

trunk/src/test/pretty/block-comment-trailing-whitespace2.rs

@@ -0,0 +1,7 @@
+// pp-exact
+fn f() {
+} /*
+  The next line should not be indented.
+
+  That one. It shouldn't have been indented.
+  */