Skip to content

Commit 6578e72

Browse files
committed
---
yaml --- r: 4172 b: refs/heads/master c: 19394a5 h: refs/heads/master v: v3
1 parent 014aba3 commit 6578e72

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
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: e3552da0e60eec7a018ddb2a2212d03d4f6fa338
2+
refs/heads/master: 19394a50e72fabb94ae21f7dec4571d135721bd7

trunk/src/comp/syntax/parse/lexer.rs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -546,19 +546,9 @@ fn next_token_inner(rdr: &reader) -> token::token {
546546

547547
tag cmnt_style {
548548
isolated; // No code on either side of each line of the comment
549-
550-
551-
552549
trailing; // Code exists to the left of the comment
553-
554-
555-
556550
mixed; // Code before /* foo */ and after the comment
557-
558-
559-
560-
blank_line; // Just a manual blank linke "\n\n", for layout
561-
551+
blank_line; // Just a manual blank line "\n\n", for layout
562552
}
563553

564554
type cmnt = {style: cmnt_style, lines: str[], pos: uint};

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ fn bclose(s: &ps, span: codemap::span) { bclose_(s, span, indent_unit); }
174174

175175
fn is_bol(s: &ps) -> bool {
176176
ret s.s.last_token() == pp::EOF ||
177-
s.s.last_token() == pp::hardbreak_tok();
177+
s.s.last_token() == pp::hardbreak_tok();
178178
}
179179

180180
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) {
10301030
_ { }
10311031
}
10321032
}
1033-
fn local_span(loc: &@ast::local) -> codemap::span { ret loc.span; }
1034-
commasep_cmnt(s, consistent, locs, print_local, local_span);
1033+
commasep(s, consistent, locs, print_local);
10351034
end(s);
10361035
}
10371036
ast::decl_item(item) { print_item(s, item); }

0 commit comments

Comments
 (0)