diff options
| author | bors <bors@rust-lang.org> | 2015-05-20 04:28:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-20 04:28:47 +0000 |
| commit | f6b446f4a9147cf75a4554bbc1bef22698d8e263 (patch) | |
| tree | e44a4246ab05f13ea9fd43a70ba251989eb81477 /src/libcore | |
| parent | 43cf733bfa5affc74485daeae179cc2f855b5512 (diff) | |
| parent | 395d01cf64579312b9b6924d8056264abaaf33f7 (diff) | |
| download | rust-f6b446f4a9147cf75a4554bbc1bef22698d8e263.tar.gz rust-f6b446f4a9147cf75a4554bbc1bef22698d8e263.zip | |
Auto merge of #25624 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #25583, #25585, #25602, #25604, #25607, #25611, #25614, #25620 - Failed merges:
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/num/mod.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index bd7286dfa3f..e560fae31a1 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -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), Ok(10)); + /// ``` #[stable(feature = "rust1", since = "1.0.0")] #[allow(deprecated)] pub fn from_str_radix(src: &str, radix: u32) -> Result<$T, ParseIntError> { |
