about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-04-12 18:46:15 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-04-13 02:21:02 +0530
commit72dc6fcbe76830a48989c0e54f5701e1f89f803c (patch)
tree1463ac33258304f22bb8deddbe7f5878b87c5943
parent4d38b497cebfcaeffa6fb4f960af87757a46a944 (diff)
parent11c184616842e26836ed541e9ec1236f85c63334 (diff)
Rollup merge of #24347 - xamgore:master, r=huonw
Docs meant that ParseIntError is returned though the function returns ParseFloatError.
-rw-r--r--src/libcore/num/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 4e4a928d91f..3fd179cf86f 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -2705,7 +2705,7 @@ macro_rules! from_str_radix_float_impl {
             ///
             /// # Return value
             ///
-            /// `Err(ParseIntError)` if the string did not represent a valid number.  Otherwise,
+            /// `Err(ParseFloatError)` if the string did not represent a valid number.
             /// Otherwise, `Ok(n)` where `n` is the floating-point number represented by `src`.
             #[inline]
             #[allow(deprecated)]
@@ -2734,7 +2734,7 @@ macro_rules! from_str_radix_float_impl {
             ///
             /// # Return value
             ///
-            /// `Err(ParseIntError)` if the string did not represent a valid number.  Otherwise,
+            /// `Err(ParseFloatError)` if the string did not represent a valid number.
             /// Otherwise, `Ok(n)` where `n` is the floating-point number represented by `src`.
             fn from_str_radix(src: &str, radix: u32)
                               -> Result<$T, ParseFloatError> {