From 727bd7de7e6332482ee2765d46bfd00d89386d4b Mon Sep 17 00:00:00 2001
From: Colin Wallace <colin@mooooo.ooo>
Date: Mon, 23 Jul 2018 22:04:33 -0700
Subject: libcore: Prefer `Option::map` over `match` where applicable

---
 src/libcore/str/mod.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/libcore')

diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index 3e215de58dd..86b8349fa3c 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -696,13 +696,10 @@ impl<'a> Iterator for CharIndices<'a> {
 impl<'a> DoubleEndedIterator for CharIndices<'a> {
     #[inline]
     fn next_back(&mut self) -> Option<(usize, char)> {
-        match self.iter.next_back() {
-            None => None,
-            Some(ch) => {
-                let index = self.front_offset + self.iter.iter.len();
-                Some((index, ch))
-            }
-        }
+        self.iter.next_back().map(|ch| {
+            let index = self.front_offset + self.iter.iter.len();
+            (index, ch)
+        })
     }
 }
 
-- 
cgit 1.4.1-3-g733a5