Skip to content

Commit 43db5af

Browse files
committed
---
yaml --- r: 57861 b: refs/heads/incoming c: 7ef92ba h: refs/heads/master i: 57859: 96cb78f v: v3
1 parent c8fa1a2 commit 43db5af

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
@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 2a74c58588e116d250fa9043ff4914cc68ef49e4
9+
refs/heads/incoming: 7ef92ba246349b396333c8aaa8337667030a935f
1010
refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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