Skip to content

Commit 8584beb

Browse files
committed
---
yaml --- r: 56509 b: refs/heads/auto c: 2985f74 h: refs/heads/master i: 56507: c12eb3b v: v3
1 parent c03ce8b commit 8584beb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: aa346401baae03aeeba5d3ff10006eae7b60ca0e
17+
refs/heads/auto: 2985f74ff345638af2391a74b60e8e949691e694
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libsyntax/parse/parser.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,7 @@ pub impl Parser {
11811181
self.bump();
11821182
// (e) is parenthesized e
11831183
// (e,) is a tuple with only one field, e
1184-
let mut one_tuple = false;
1184+
let mut trailing_comma = false;
11851185
if *self.token == token::RPAREN {
11861186
hi = self.span.hi;
11871187
self.bump();
@@ -1195,13 +1195,13 @@ pub impl Parser {
11951195
es.push(self.parse_expr());
11961196
}
11971197
else {
1198-
one_tuple = true;
1198+
trailing_comma = true;
11991199
}
12001200
}
12011201
hi = self.span.hi;
12021202
self.expect(&token::RPAREN);
12031203

1204-
return if es.len() == 1 && !one_tuple {
1204+
return if es.len() == 1 && !trailing_comma {
12051205
self.mk_expr(lo, self.span.hi, expr_paren(es[0]))
12061206
}
12071207
else {

0 commit comments

Comments
 (0)