about summary refs log tree commit diff
path: root/src/libstd/net
diff options
context:
space:
mode:
authordileepb <dileepbapat@gmail.com>2016-02-23 21:18:07 +0530
committerdileepb <dileepbapat@gmail.com>2016-02-23 21:21:51 +0530
commitfbfe70e6ab26c0cccb5fbbf5b805eecb751cb576 (patch)
tree3cbbaa4b464bf6288f1fa9555d2a8f6b4dbd3cc8 /src/libstd/net
parent6ffd7cd1664b70fed34861df3957ddee87ec9ad1 (diff)
downloadrust-fbfe70e6ab26c0cccb5fbbf5b805eecb751cb576.tar.gz
rust-fbfe70e6ab26c0cccb5fbbf5b805eecb751cb576.zip
#31820 - Utilize `if..let` instead of single `match` branch
Diffstat (limited to 'src/libstd/net')
-rw-r--r--src/libstd/net/addr.rs5
-rw-r--r--src/libstd/net/parser.rs5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
index 89c51c70843..87d5dc20e9f 100644
--- a/src/libstd/net/addr.rs
+++ b/src/libstd/net/addr.rs
@@ -467,9 +467,8 @@ impl ToSocketAddrs for str {
     type Iter = vec::IntoIter<SocketAddr>;
     fn to_socket_addrs(&self) -> io::Result<vec::IntoIter<SocketAddr>> {
         // try to parse as a regular SocketAddr first
-        match self.parse().ok() {
-            Some(addr) => return Ok(vec![addr].into_iter()),
-            None => {}
+        if let Some(addr) = self.parse().ok() {
+            return Ok(vec![addr].into_iter());
         }
 
         macro_rules! try_opt {
diff --git a/src/libstd/net/parser.rs b/src/libstd/net/parser.rs
index 46a0309dbb5..63eee6bcfde 100644
--- a/src/libstd/net/parser.rs
+++ b/src/libstd/net/parser.rs
@@ -66,9 +66,8 @@ impl<'a> Parser<'a> {
     fn read_or<T>(&mut self, parsers: &mut [Box<FnMut(&mut Parser) -> Option<T> + 'static>])
                -> Option<T> {
         for pf in parsers {
-            match self.read_atomically(|p: &mut Parser| pf(p)) {
-                Some(r) => return Some(r),
-                None => {}
+            if let Some(r) = self.read_atomically(|p: &mut Parser| pf(p)) {
+                return Some(r);
             }
         }
         None