Skip to content

Documentation fixes #24298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2015
Merged

Documentation fixes #24298

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7697ee
mod.rs docs fix
White-Oak Apr 10, 2015
b4c49ba
mod.rs docs fix - for floats
White-Oak Apr 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions src/libcore/num/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down Expand Up @@ -1374,9 +1373,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> {
Expand Down Expand Up @@ -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> {
Expand Down Expand Up @@ -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::*;
Expand Down