nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-27 06:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #24298 - White-Oak:master, r=alexcrichton

Browse Source 
Fixes 'fn from_str_radix' documentation where docs meant that Option is returned, though the function returns Result.
This commit is contained in:
Manish Goregaokar 2015-04-11 19:05:43 +05:30
commit b140ad1194
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libcore/num/mod.rs
View File

@ -856,9 +856,8 @@ macro_rules! int_impl {
///
/// # Return value
///
/// `None` if the string did not represent a valid number.
/// Otherwise, `Some(n)` where `n` is the integer represented
/// by `src`.
/// `Err(ParseIntError)` if the string did not represent a valid number.
/// Otherwise, `Ok(n)` where `n` is the integer represented by `src`.
#[stable(feature = "rust1", since = "1.0.0")]
#[allow(deprecated)]
pub fn from_str_radix(src: &str, radix: u32) -> Result<$T, ParseIntError> {
@ -1373,9 +1372,8 @@ macro_rules! uint_impl {
///
/// # Return value
///
/// `None` if the string did not represent a valid number.
/// Otherwise, `Some(n)` where `n` is the integer represented
/// by `src`.
/// `Err(ParseIntError)` if the string did not represent a valid number.
/// Otherwise, `Ok(n)` where `n` is the integer represented by `src`.
#[stable(feature = "rust1", since = "1.0.0")]
#[allow(deprecated)]
pub fn from_str_radix(src: &str, radix: u32) -> Result<$T, ParseIntError> {
@ -2707,8 +2705,8 @@ macro_rules! from_str_radix_float_impl {
///
/// # Return value
///
/// `None` if the string did not represent a valid number. Otherwise,
/// `Some(n)` where `n` is the floating-point number represented by `src`.
/// `Err(ParseIntError)` if the string did not represent a valid number. Otherwise,
/// Otherwise, `Ok(n)` where `n` is the floating-point number represented by `src`.
#[inline]
#[allow(deprecated)]
fn from_str(src: &str) -> Result<$T, ParseFloatError> {
@ -2736,9 +2734,8 @@ macro_rules! from_str_radix_float_impl {
///
/// # Return value
///
/// `None` if the string did not represent a valid number.
/// Otherwise, `Some(n)` where `n` is the floating-point number
/// represented by `src`.
/// `Err(ParseIntError)` if the string did not represent a valid number. Otherwise,
/// Otherwise, `Ok(n)` where `n` is the floating-point number represented by `src`.
fn from_str_radix(src: &str, radix: u32)
-> Result<$T, ParseFloatError> {
use self::FloatErrorKind::*;