Skip to content

Commit

Permalink
Rollup merge of rust-lang#25583 - steveklabnik:gh25517, r=alexcrichton
Browse files Browse the repository at this point in the history
  • Loading branch information
steveklabnik committed May 18, 2015
2 parents e2922c1 + 1254c34 commit 1be4156
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions src/libcore/num/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,11 @@ macro_rules! int_impl {
///
/// Leading and trailing whitespace represent an error.
///
/// # Arguments
///
/// * src - A string slice
/// * radix - The base to use. Must lie in the range [2 .. 36]
///
/// # Return value
/// # Examples
///
/// `Err(ParseIntError)` if the string did not represent a valid number.
/// Otherwise, `Ok(n)` where `n` is the integer represented by `src`.
/// ```
/// assert_eq!(u32::from_str_radix("A", 16), Some(10));
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
#[allow(deprecated)]
pub fn from_str_radix(src: &str, radix: u32) -> Result<$T, ParseIntError> {
Expand Down

0 comments on commit 1be4156

Please sign in to comment.