auto merge of #10225 : Jurily/rust/master, r=alexcrichton

bors · bors · commit 6879c8b38276 · 2013-11-01T23:36:10.000-07:00
diff --git a/src/libstd/char.rs b/src/libstd/char.rs
@@ -187,7 +187,7 @@ pub fn is_digit_radix(c: char, radix: uint) -> bool {
 #[inline]
 pub fn to_digit(c: char, radix: uint) -> Option<uint> {
     if radix > 36 {
-        fail!("to_digit: radix {} is to high (maximum 36)", radix);
+        fail!("to_digit: radix {} is too high (maximum 36)", radix);
     }
     let val = match c {
       '0' .. '9' => c as uint - ('0' as uint),

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ pub fn is_digit_radix(c: char, radix: uint) -> bool {`
`187`	`187`	`#[inline]`
`188`	`188`	`pub fn to_digit(c: char, radix: uint) -> Option<uint> {`
`189`	`189`	`if radix > 36 {`
`190`		`- fail!("to_digit: radix {} is to high (maximum 36)", radix);`
	`190`	`+ fail!("to_digit: radix {} is too high (maximum 36)", radix);`
`191`	`191`	`}`
`192`	`192`	`let val = match c {`
`193`	`193`	`'0' .. '9' => c as uint - ('0' as uint),`