diff options
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/net.rs | 5 | ||||
| -rw-r--r-- | src/libstd/sys_common/wtf8.rs | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/libstd/sys_common/net.rs b/src/libstd/sys_common/net.rs index c76b0bcf1c9..c70b39995eb 100644 --- a/src/libstd/sys_common/net.rs +++ b/src/libstd/sys_common/net.rs @@ -136,10 +136,7 @@ impl Iterator for LookupHost { fn next(&mut self) -> Option<SocketAddr> { loop { unsafe { - let cur = match self.cur.as_ref() { - None => return None, - Some(c) => c, - }; + let cur = self.cur.as_ref()?; self.cur = cur.ai_next; match sockaddr_to_addr(mem::transmute(cur.ai_addr), cur.ai_addrlen as usize) diff --git a/src/libstd/sys_common/wtf8.rs b/src/libstd/sys_common/wtf8.rs index e212b5006f2..b2fc559bb37 100644 --- a/src/libstd/sys_common/wtf8.rs +++ b/src/libstd/sys_common/wtf8.rs @@ -578,10 +578,7 @@ impl Wtf8 { fn next_surrogate(&self, mut pos: usize) -> Option<(usize, u16)> { let mut iter = self.bytes[pos..].iter(); loop { - let b = match iter.next() { - None => return None, - Some(&b) => b, - }; + let b = *iter.next()?; if b < 0x80 { pos += 1; } else if b < 0xE0 { |
