bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fallout

Browse source
This commit is contained in:
Nick Cameron 2015-01-04 17:43:24 +13:00
parent 791f545685
commit 0c7f7a5fb8
89 changed files with 543 additions and 468 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::{FullRange, Index};
use prelude::v1::{FullRange, Index};
use str;
use str::StrExt;
use string::{String, CowString};

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

@ -24,7 +24,7 @@ use iter::{AdditiveIterator, Extend};
use iter::{Iterator, IteratorExt, Map, repeat};
use mem;
use option::Option::{self, Some, None};
use prelude::{FullRange, Index};
use prelude::v1::{FullRange, Index};
use slice::{SliceExt, SliceConcatExt};
use str::{SplitTerminator, FromStr, StrExt};
use string::{String, ToString};
@ -337,8 +337,12 @@ impl GenericPath for Path {
Some(match self.sepidx_or_prefix_len() {
None if ".." == self.repr => self.repr.index(&FullRange),
None => ".",
Some((_,idxa,end)) if self.repr.index(&(idxa..end)) == ".." => self.repr.index(&FullRange),
Some((idxb,_,end)) if self.repr.index(&(idxb..end)) == "\\" => self.repr.index(&FullRange),
Some((_,idxa,end)) if self.repr.index(&(idxa..end)) == ".." => {
self.repr.index(&FullRange)
}
Some((idxb,_,end)) if self.repr.index(&(idxb..end)) == "\\" => {
self.repr.index(&FullRange)
}
Some((0,idxa,_)) => self.repr.index(&(0..idxa)),
Some((idxb,idxa,_)) => {
match self.prefix {