Make printing of comments inside bindings slightly less broken

2 files changed, 3 insertions, 14 deletions

diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs
index 8163f8d29fc..b11e7aa5d85 100644
--- a/src/comp/syntax/parse/lexer.rs
+++ b/src/comp/syntax/parse/lexer.rs
@@ -546,19 +546,9 @@ fn next_token_inner(rdr: &reader) -> token::token {
 
 tag cmnt_style {
     isolated; // No code on either side of each line of the comment
-
-
-
     trailing; // Code exists to the left of the comment
-
-
-
     mixed; // Code before /* foo */ and after the comment
-
-
-
-    blank_line; // Just a manual blank linke "\n\n", for layout
-
+    blank_line; // Just a manual blank line "\n\n", for layout
 }
 
 type cmnt = {style: cmnt_style, lines: str[], pos: uint};
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
index fd48b10a317..afca9903487 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/comp/syntax/print/pprust.rs
@@ -174,7 +174,7 @@ fn bclose(s: &ps, span: codemap::span) { bclose_(s, span, indent_unit); }
 
 fn is_bol(s: &ps) -> bool {
     ret s.s.last_token() == pp::EOF ||
-            s.s.last_token() == pp::hardbreak_tok();
+        s.s.last_token() == pp::hardbreak_tok();
 }
 
 fn hardbreak_if_not_bol(s: &ps) { if !is_bol(s) { hardbreak(s.s); } }
@@ -1030,8 +1030,7 @@ fn print_decl(s: &ps, decl: &@ast::decl) {
               _ { }
             }
         }
-        fn local_span(loc: &@ast::local) -> codemap::span { ret loc.span; }
-        commasep_cmnt(s, consistent, locs, print_local, local_span);
+        commasep(s, consistent, locs, print_local);
         end(s);
       }
       ast::decl_item(item) { print_item(s, item); }