Skip to content

Commit 6eca633

Browse files
committed
---
yaml --- r: 56505 b: refs/heads/auto c: 7ef92ba h: refs/heads/master i: 56503: 40a7805 v: v3
1 parent 5bec420 commit 6eca633

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: 2a74c58588e116d250fa9043ff4914cc68ef49e4
17+
refs/heads/auto: 7ef92ba246349b396333c8aaa8337667030a935f
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
@@ -2463,8 +2463,8 @@ pub impl Parser {
24632463
return @spanned(lo, self.last_span.hi, decl_local(locals));
24642464
}
24652465
2466-
/* assumes "let" token has already been consumed */
2467-
fn parse_instance_var(&self, pr: visibility) -> @struct_field {
2466+
// parse a structure field
2467+
fn parse_name_and_ty(&self, pr: visibility) -> @struct_field {
24682468
let mut is_mutbl = struct_immutable;
24692469
let lo = self.span.lo;
24702470
if self.eat_keyword(&~"mut") {
@@ -3327,7 +3327,7 @@ pub impl Parser {
33273327
self.obsolete(*self.last_span, ObsoleteLet);
33283328
}
33293329

3330-
let a_var = self.parse_instance_var(vis);
3330+
let a_var = self.parse_name_and_ty(vis);
33313331
match *self.token {
33323332
token::SEMI => {
33333333
self.obsolete(copy *self.span, ObsoleteFieldTerminator);

0 commit comments

Comments
 (0)