Skip to content

Commit 214784d

Browse files
committed
---
yaml --- r: 140174 b: refs/heads/try2 c: 2985f74 h: refs/heads/master v: v3
1 parent 88d497a commit 214784d

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: aa346401baae03aeeba5d3ff10006eae7b60ca0e
8+
refs/heads/try2: 2985f74ff345638af2391a74b60e8e949691e694
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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)