Skip to content

Commit dd5c737

Browse files
committed
auto merge of #8988 : cmr/rust/fromstr_fn, r=brson
It just calls out to the associated function on the trait.
2 parents d36612d + e0e5523 commit dd5c737

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

src/libstd/from_str.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,8 @@ pub trait FromStr {
1919
/// string is ill-formatted, the None is returned.
2020
fn from_str(s: &str) -> Option<Self>;
2121
}
22+
23+
/// A utility function that just calls FromStr::from_str
24+
pub fn from_str<A: FromStr>(s: &str) -> Option<A> {
25+
FromStr::from_str(s)
26+
}

src/libstd/num/float.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,8 +946,8 @@ impl Float for float {
946946

947947
#[cfg(test)]
948948
mod tests {
949-
use super::*;
950949
use prelude::*;
950+
use super::*;
951951

952952
use num::*;
953953
use num;

src/libstd/num/int_macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,8 @@ impl ToStrRadix for $T {
547547
548548
#[cfg(test)]
549549
mod tests {
550-
use super::*;
551550
use prelude::*;
551+
use super::*;
552552
553553
use int;
554554
use i16;

src/libstd/num/uint_macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@ impl BitCount for $T {
430430

431431
#[cfg(test)]
432432
mod tests {
433-
use super::*;
434433
use prelude::*;
434+
use super::*;
435435

436436
use num;
437437
use sys;

src/libstd/prelude.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ pub use result::{Result, Ok, Err};
4141
// Reexported functions
4242
pub use io::{print, println};
4343
pub use iterator::range;
44+
pub use from_str::from_str;
4445

4546
// Reexported types and traits
4647
pub use c_str::ToCStr;

0 commit comments

Comments
 (0)