From 8adc3f74f53a59d62ac914e920d5547a3e460924 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Wed, 24 Feb 2016 22:34:23 -0500 Subject: [PATCH 1/2] Prefer `slice::get` over length check with indexing. --- src/libstd/path.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstd/path.rs b/src/libstd/path.rs index 35118bde96bb..e1393ce6aab9 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -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() { From c82be2f4cb909a70b870ab2fb176e54a91e5372f Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Wed, 24 Feb 2016 22:50:23 -0500 Subject: [PATCH 2/2] Prefer 'match' pattern guard over conditional within body. --- src/libstd/path.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libstd/path.rs b/src/libstd/path.rs index e1393ce6aab9..81d9d0a7f103 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -393,11 +393,8 @@ fn iter_after(mut iter: I, mut prefix: J) -> Option 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,