Skip to content

A couple cleanup commits for 'src/libstd/path.rs' #31878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 2 commits into from
Feb 26, 2016
Merged

A couple cleanup commits for 'src/libstd/path.rs' #31878

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8adc3f7
Prefer `slice::get` over length check with indexing.
frewsxcv Feb 25, 2016
c82be2f
Prefer 'match' pattern guard over conditional within body.
frewsxcv Feb 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/libstd/path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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,
Expand Down