rollup merge of rust-lang#18013 : stefanbucur/patch-1

alexcrichton · alexcrichton · commit 2e2d681d88d9 · 2014-10-13T15:10:28.000-07:00
diff --git a/src/libcore/char.rs b/src/libcore/char.rs
@@ -147,7 +147,7 @@ pub fn to_digit(c: char, radix: uint) -> Option<uint> {
 #[inline]
 pub fn from_digit(num: uint, radix: uint) -> Option<char> {
     if radix > 36 {
-        fail!("from_digit: radix is to high (maximum 36)");
+        fail!("from_digit: radix is too high (maximum 36)");
     }
     if num < radix {
         unsafe {

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ pub fn to_digit(c: char, radix: uint) -> Option<uint> {`
`147`	`147`	`#[inline]`
`148`	`148`	`pub fn from_digit(num: uint, radix: uint) -> Option<char> {`
`149`	`149`	`if radix > 36 {`
`150`		`- fail!("from_digit: radix is to high (maximum 36)");`
	`150`	`+ fail!("from_digit: radix is too high (maximum 36)");`
`151`	`151`	`}`
`152`	`152`	`if num < radix {`
`153`	`153`	`unsafe {`