---

yaml
---
r: 23667
b: refs/heads/master
c: 80c4f74
h: refs/heads/master
i:
  23665: 689b376
  23663: bde60ee
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d777e5133360876baa4213f81a33934f04768a0f
+refs/heads/master: 80c4f74c29ede062909db2b048b5b75820730994
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/doc/rust.md

@@ -2211,14 +2211,14 @@ fn main() {
 ~~~~
 
 Multiple match patterns may be joined with the `|` operator.  A
-range of values may be specified with `to`. For example:
+range of values may be specified with `..`. For example:
 
 ~~~~
 # let x = 2;
 
 let message = match x {
   0 | 1  => ~"not many",
-  2 to 9 => ~"a few",
+  2 .. 9 => ~"a few",
   _      => ~"lots"
 };
 ~~~~

trunk/src/libcore/char.rs

@@ -120,9 +120,9 @@ pure fn is_digit(c: char) -> bool {
  */
 pure fn to_digit(c: char, radix: uint) -> Option<uint> {
     let val = match c {
-      '0' to '9' => c as uint - ('0' as uint),
-      'a' to 'z' => c as uint + 10u - ('a' as uint),
-      'A' to 'Z' => c as uint + 10u - ('A' as uint),
+      '0' .. '9' => c as uint - ('0' as uint),
+      'a' .. 'z' => c as uint + 10u - ('a' as uint),
+      'A' .. 'Z' => c as uint + 10u - ('A' as uint),
       _ => return None
     };
     if val < radix { Some(val) }
@@ -171,7 +171,7 @@ fn escape_default(c: char) -> ~str {
       '\\' => ~"\\\\",
       '\'' => ~"\\'",
       '"'  => ~"\\\"",
-      '\x20' to '\x7e' => str::from_char(c),
+      '\x20' .. '\x7e' => str::from_char(c),
       _ => escape_unicode(c)
     }
 }

trunk/src/libcore/float.rs

@@ -263,7 +263,7 @@ fn from_str(num: &str) -> Option<float> {
 
    //The string must start with one of the following characters.
    match str::char_at(num, 0u) {
-      '-' | '+' | '0' to '9' | '.' => (),
+      '-' | '+' | '0' .. '9' | '.' => (),
       _ => return None
    }
 
@@ -286,7 +286,7 @@ fn from_str(num: &str) -> Option<float> {
        c   = char_range.ch;
        pos = char_range.next;
        match c {
-         '0' to '9' => {
+         '0' .. '9' => {
            total = total * 10f;
            total += ((c as int) - ('0' as int)) as float;
          }