Skip to content

Commit 6983035

Browse files
committed
---
yaml --- r: 186047 b: refs/heads/auto c: 0905c8a h: refs/heads/master i: 186045: 7a3087c 186043: 34d8269 186039: da91fe4 186031: 56487d1 186015: b671d65 185983: 8c0ae4d v: v3
1 parent b3df4fb commit 6983035

File tree

3 files changed

+39
-1
lines changed

3 files changed

+39
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 60f7732ccd9b0ad50490457ddd02a4a48cf74e74
13+
refs/heads/auto: 0905c8a5ec856a6b972fcb239df2b8f6e82d2418
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3538,6 +3538,19 @@ impl<'a> Parser<'a> {
35383538
self.bump();
35393539
pat = PatStruct(enum_path, fields, etc);
35403540
}
3541+
token::DotDotDot => {
3542+
let hi = self.last_span.hi;
3543+
let start = self.mk_expr(lo, hi, ExprPath(None, enum_path));
3544+
self.eat(&token::DotDotDot);
3545+
let end = if self.token.is_ident() || self.token.is_path() {
3546+
let path = self.parse_path(LifetimeAndTypesWithColons);
3547+
let hi = self.span.hi;
3548+
self.mk_expr(lo, hi, ExprPath(None, path))
3549+
} else {
3550+
self.parse_literal_maybe_minus()
3551+
};
3552+
pat = PatRange(start, end);
3553+
}
35413554
_ => {
35423555
let mut args: Vec<P<Pat>> = Vec::new();
35433556
match self.token {
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use m::{START, END};
12+
13+
fn main() {
14+
match 42u32 {
15+
m::START...m::END => {},
16+
0u32...m::END => {},
17+
m::START...59u32 => {},
18+
_ => {},
19+
}
20+
}
21+
22+
mod m {
23+
pub const START: u32 = 4;
24+
pub const END: u32 = 14;
25+
}

0 commit comments

Comments
 (0)