about summary refs log tree commit diff
path: root/src/libstd/io/net
diff options
context:
space:
mode:
authorBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-11-15 15:52:00 +1100
committerBrendan Zabarauskas <bjzaba@yahoo.com.au>2014-11-16 12:41:55 +1100
commit29bc9c632eda71c6b4a8b35db637971953b58d03 (patch)
tree95e8ff15586d9733b6bfd8be5438579049f1622c /src/libstd/io/net
parent7e43f419cb98c9035d30e5cf0e0be7944dbc0371 (diff)
downloadrust-29bc9c632eda71c6b4a8b35db637971953b58d03.tar.gz
rust-29bc9c632eda71c6b4a8b35db637971953b58d03.zip
Move FromStr to core::str
Diffstat (limited to 'src/libstd/io/net')
-rw-r--r--src/libstd/io/net/ip.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs
index 2a2d978ef49..7ba5e173182 100644
--- a/src/libstd/io/net/ip.rs
+++ b/src/libstd/io/net/ip.rs
@@ -16,13 +16,12 @@
 #![allow(missing_docs)]
 
 use fmt;
-use from_str::FromStr;
 use io::{mod, IoResult, IoError};
 use io::net;
 use iter::Iterator;
 use option::{Option, None, Some};
 use result::{Ok, Err};
-use str::StrPrelude;
+use str::{FromStr, StrPrelude};
 use slice::{CloneSlicePrelude, SlicePrelude};
 use vec::Vec;
 
@@ -540,7 +539,7 @@ impl<'a> ToSocketAddr for &'a str {
 mod test {
     use prelude::*;
     use super::*;
-    use from_str::FromStr;
+    use str::FromStr;
 
     #[test]
     fn test_from_str_ipv4() {