diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2014-09-26 21:13:20 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2014-09-30 09:11:26 -0700 |
| commit | 416144b8279fbffceacea6d0fd90e0fd1f8ce53d (patch) | |
| tree | 0f7f628dd1388f378ac4836e32359b18a7297212 /src/libterm/terminfo/parm.rs | |
| parent | 38015eeb7010e5954a1bc60fddc1214a5f359627 (diff) | |
| download | rust-416144b8279fbffceacea6d0fd90e0fd1f8ce53d.tar.gz rust-416144b8279fbffceacea6d0fd90e0fd1f8ce53d.zip | |
librustc: Forbid `..` in range patterns.
This breaks code that looks like:
match foo {
1..3 => { ... }
}
Instead, write:
match foo {
1...3 => { ... }
}
Closes #17295.
[breaking-change]
Diffstat (limited to 'src/libterm/terminfo/parm.rs')
| -rw-r--r-- | src/libterm/terminfo/parm.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libterm/terminfo/parm.rs b/src/libterm/terminfo/parm.rs index 3f626d716f8..736cacbdeb7 100644 --- a/src/libterm/terminfo/parm.rs +++ b/src/libterm/terminfo/parm.rs @@ -256,7 +256,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) if res.is_err() { return res } output.push_all(res.unwrap().as_slice()) } else { return Err("stack is empty".to_string()) }, - ':'|'#'|' '|'.'|'0'..'9' => { + ':'|'#'|' '|'.'|'0'...'9' => { let mut flags = Flags::new(); let mut fstate = FormatStateFlags; match cur { @@ -264,7 +264,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) '#' => flags.alternate = true, ' ' => flags.space = true, '.' => fstate = FormatStatePrecision, - '0'..'9' => { + '0'...'9' => { flags.width = cur as uint - '0' as uint; fstate = FormatStateWidth; } @@ -339,7 +339,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) stack.push(Number(i)); state = Nothing; } - '0'..'9' => { + '0'...'9' => { state = IntConstant(i*10 + (cur as int - '0' as int)); old_state = Nothing; } @@ -368,14 +368,14 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) (FormatStateFlags,' ') => { flags.space = true; } - (FormatStateFlags,'0'..'9') => { + (FormatStateFlags,'0'...'9') => { flags.width = cur as uint - '0' as uint; *fstate = FormatStateWidth; } (FormatStateFlags,'.') => { *fstate = FormatStatePrecision; } - (FormatStateWidth,'0'..'9') => { + (FormatStateWidth,'0'...'9') => { let old = flags.width; flags.width = flags.width * 10 + (cur as uint - '0' as uint); if flags.width < old { return Err("format width overflow".to_string()) } @@ -383,7 +383,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) (FormatStateWidth,'.') => { *fstate = FormatStatePrecision; } - (FormatStatePrecision,'0'..'9') => { + (FormatStatePrecision,'0'...'9') => { let old = flags.precision; flags.precision = flags.precision * 10 + (cur as uint - '0' as uint); if flags.precision < old { |
