diff options
| author | Matt Brubeck <mbrubeck@limpet.net> | 2017-12-08 17:32:04 -0800 |
|---|---|---|
| committer | Matt Brubeck <mbrubeck@limpet.net> | 2017-12-09 14:18:33 -0800 |
| commit | 3024c1434a667425d30e4b0785857381323712aa (patch) | |
| tree | 97e25cbc974f2a552c2314a2da2e216c358fb141 /src/libstd_unicode | |
| parent | c7b6d8263b0c106503d102ab8148769ac9f7d086 (diff) | |
| download | rust-3024c1434a667425d30e4b0785857381323712aa.tar.gz rust-3024c1434a667425d30e4b0785857381323712aa.zip | |
Use Try syntax for Option in place of macros or match
Diffstat (limited to 'src/libstd_unicode')
| -rw-r--r-- | src/libstd_unicode/char.rs | 7 |
1 files changed, 1 insertions, 6 deletions
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 { |