From 3024c1434a667425d30e4b0785857381323712aa Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@limpet.net>
Date: Fri, 8 Dec 2017 17:32:04 -0800
Subject: Use Try syntax for Option in place of macros or match

---
 src/libstd_unicode/char.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/libstd_unicode')

diff --git a/src/libstd_unicode/char.rs b/src/libstd_unicode/char.rs
index 1c0cdfd8435..293c66148ab 100644
--- a/src/libstd_unicode/char.rs
+++ b/src/libstd_unicode/char.rs
@@ -1528,12 +1528,7 @@ impl<I: Iterator<Item = u16>> Iterator for DecodeUtf16<I> {
     fn next(&mut self) -> Option<Result<char, DecodeUtf16Error>> {
         let u = match self.buf.take() {
             Some(buf) => buf,
-            None => {
-                match self.iter.next() {
-                    Some(u) => u,
-                    None => return None,
-                }
-            }
+            None => self.iter.next()?
         };
 
         if u < 0xD800 || 0xDFFF < u {
-- 
cgit 1.4.1-3-g733a5