rollup merge of #19830: mchaput/patch-1

brson · brson · commit 2ad1e0fedd59 · 2014-12-16T14:07:29.000-08:00
Error message has wrong spelling ("radix is to high").
diff --git a/src/libcore/char.rs b/src/libcore/char.rs
@@ -141,7 +141,7 @@ pub fn to_digit(c: char, radix: uint) -> Option<uint> {
 #[unstable = "pending decisions about costructors for primitives"]
 pub fn from_digit(num: uint, radix: uint) -> Option<char> {
     if radix > 36 {
-        panic!("from_digit: radix is to high (maximum 36)");
+        panic!("from_digit: radix is too high (maximum 36)");
     }
     if num < radix {
         unsafe {

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ pub fn to_digit(c: char, radix: uint) -> Option<uint> {`
`141`	`141`	`#[unstable = "pending decisions about costructors for primitives"]`
`142`	`142`	`pub fn from_digit(num: uint, radix: uint) -> Option<char> {`
`143`	`143`	`if radix > 36 {`
`144`		`- panic!("from_digit: radix is to high (maximum 36)");`
	`144`	`+ panic!("from_digit: radix is too high (maximum 36)");`
`145`	`145`	`}`
`146`	`146`	`if num < radix {`
`147`	`147`	`unsafe {`