diff --git a/src/libstd/from_str.rs b/src/libstd/from_str.rs
index d2f1a895e1e..e5bf9f6bb2a 100644
--- a/src/libstd/from_str.rs
+++ b/src/libstd/from_str.rs
@@ -19,3 +19,8 @@ pub trait FromStr {
     /// string is ill-formatted, the None is returned.
     fn from_str(s: &str) -> Option<Self>;
 }
+
+/// A utility function that just calls FromStr::from_str
+pub fn from_str<A: FromStr>(s: &str) -> Option<A> {
+    FromStr::from_str(s)
+}
diff --git a/src/libstd/num/float.rs b/src/libstd/num/float.rs
index 4dd6fd25333..df26fadae16 100644
--- a/src/libstd/num/float.rs
+++ b/src/libstd/num/float.rs
@@ -946,8 +946,8 @@ impl Float for float {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use prelude::*;
+    use super::*;
 
     use num::*;
     use num;
diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs
index 377d0a78134..07cafb0a4f1 100644
--- a/src/libstd/num/int_macros.rs
+++ b/src/libstd/num/int_macros.rs
@@ -547,8 +547,8 @@ impl ToStrRadix for $T {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use prelude::*;
+    use super::*;
 
     use int;
     use i16;
diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs
index af991045b45..effeb60fc22 100644
--- a/src/libstd/num/uint_macros.rs
+++ b/src/libstd/num/uint_macros.rs
@@ -430,8 +430,8 @@ impl BitCount for $T {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use prelude::*;
+    use super::*;
 
     use num;
     use sys;
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index 8f202ee8531..9cdf7af091f 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -41,6 +41,7 @@ pub use result::{Result, Ok, Err};
 // Reexported functions
 pub use io::{print, println};
 pub use iterator::range;
+pub use from_str::from_str;
 
 // Reexported types and traits
 pub use c_str::ToCStr;