diff options
| author | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2014-11-15 15:52:00 +1100 |
|---|---|---|
| committer | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2014-11-16 12:41:55 +1100 |
| commit | 29bc9c632eda71c6b4a8b35db637971953b58d03 (patch) | |
| tree | 95e8ff15586d9733b6bfd8be5438579049f1622c /src/libstd/path | |
| parent | 7e43f419cb98c9035d30e5cf0e0be7944dbc0371 (diff) | |
Move FromStr to core::str
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/posix.rs | 3 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 794f6978642..e2ff824a7c9 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -13,12 +13,11 @@ use c_str::{CString, ToCStr}; use clone::Clone; use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering}; -use from_str::FromStr; use hash; use io::Writer; use iter::{DoubleEndedIterator, AdditiveIterator, Extend, Iterator, Map}; use option::{Option, None, Some}; -use str::Str; +use str::{FromStr, Str}; use str; use slice::{CloneSliceAllocPrelude, Splits, AsSlice, VectorVector, PartialEqSlicePrelude, SlicePrelude}; diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 2da2159653e..b8016e3e8f4 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -16,14 +16,13 @@ use ascii::AsciiCast; use c_str::{CString, ToCStr}; use clone::Clone; use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering}; -use from_str::FromStr; use hash; use io::Writer; use iter::{AdditiveIterator, DoubleEndedIterator, Extend, Iterator, Map}; use mem; use option::{Option, Some, None}; use slice::{AsSlice, SlicePrelude}; -use str::{CharSplits, Str, StrAllocating, StrVector, StrPrelude}; +use str::{CharSplits, FromStr, Str, StrAllocating, StrVector, StrPrelude}; use string::String; use unicode::char::UnicodeChar; use vec::Vec; |
