bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Test fixes and rebase conflicts

Browse source
This commit is contained in:
Alex Crichton 2015-01-06 15:57:50 -08:00
parent 26cd8eae48
commit 56a9e2fcd5
18 changed files with 67 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/path/mod.rs
View file

@ -68,7 +68,7 @@ use fmt;
use iter::IteratorExt;
use option::Option;
use option::Option::{None, Some};
use prelude::v1::{FullRange, Index};
use ops::{FullRange, Index};
use str;
use str::StrExt;
use string::{String, CowString};

2
src/libstd/path/windows.rs
View file

@ -25,7 +25,7 @@ use iter::{AdditiveIterator, Extend};
use iter::{Iterator, IteratorExt, Map, repeat};
use mem;
use option::Option::{self, Some, None};
use prelude::v1::{FullRange, Index};
use ops::{FullRange, Index};
use slice::{SliceExt, SliceConcatExt};
use str::{SplitTerminator, FromStr, StrExt};
use string::{String, ToString};