OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #31878 - frewsxcv:path-cleanup, r=alexcrichton

Browse Source 
None
This commit is contained in:
Manish Goregaokar 2016-02-26 15:12:17 +05:30
commit cefbe505bd
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstd/path.rs
View File

@ -226,7 +226,7 @@ mod platform {
}
_ => (),
}
} else if path.len() > 1 && path[1] == b':' {
} else if path.get(1) == Some(b':') {
// C:
let c = path[0];
if c.is_ascii() && (c as char).is_alphabetic() {
@ -393,11 +393,8 @@ fn iter_after<A, I, J>(mut iter: I, mut prefix: J) -> Option<I>
loop {
let mut iter_next = iter.clone();
match (iter_next.next(), prefix.next()) {
(Some(x), Some(y)) => {
if x != y {
return None;
}
}
(Some(ref x), Some(ref y)) if x == y => (),
(Some(_), Some(_)) => return None,
(Some(_), None) => return Some(iter),
(None, None) => return Some(iter),
(None, Some(_)) => return None,