about summary refs log tree commit diff
path: root/src/libstd/net
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2020-01-09 00:22:10 +0100
committerGitHub <noreply@github.com>2020-01-09 00:22:10 +0100
commit5ea69781f46a556b3d6f7e8e52d5641d61d12131 (patch)
treea5024d981e459032f7ca7c9c59485fd783ef0405 /src/libstd/net
parent11f0013378f8a7ec7a2ca3e09afd78e1397273e7 (diff)
parentf720469fd0c4dff6d92e2f778ea2f252f76dcc2e (diff)
downloadrust-5ea69781f46a556b3d6f7e8e52d5641d61d12131.tar.gz
rust-5ea69781f46a556b3d6f7e8e52d5641d61d12131.zip
Rollup merge of #67966 - popzxc:core-std-matches, r=Centril
Use matches macro in libcore and libstd

This PR replaces matches like

```rust
match var {
    value => true,
    _ => false,
}
```

with use of `matches!` macro.

r? @Centril
Diffstat (limited to 'src/libstd/net')
-rw-r--r--src/libstd/net/addr.rs10
-rw-r--r--src/libstd/net/ip.rs10
2 files changed, 4 insertions, 16 deletions
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
index a9d88370c61..a59d7f0263b 100644
--- a/src/libstd/net/addr.rs
+++ b/src/libstd/net/addr.rs
@@ -227,10 +227,7 @@ impl SocketAddr {
     /// ```
     #[stable(feature = "sockaddr_checker", since = "1.16.0")]
     pub fn is_ipv4(&self) -> bool {
-        match *self {
-            SocketAddr::V4(_) => true,
-            SocketAddr::V6(_) => false,
-        }
+        matches!(*self, SocketAddr::V4(_))
     }
 
     /// Returns [`true`] if the [IP address] in this `SocketAddr` is an
@@ -252,10 +249,7 @@ impl SocketAddr {
     /// ```
     #[stable(feature = "sockaddr_checker", since = "1.16.0")]
     pub fn is_ipv6(&self) -> bool {
-        match *self {
-            SocketAddr::V4(_) => false,
-            SocketAddr::V6(_) => true,
-        }
+        matches!(*self, SocketAddr::V6(_))
     }
 }
 
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs
index 15d2361acd9..6410a4f2b65 100644
--- a/src/libstd/net/ip.rs
+++ b/src/libstd/net/ip.rs
@@ -281,10 +281,7 @@ impl IpAddr {
     /// ```
     #[stable(feature = "ipaddr_checker", since = "1.16.0")]
     pub fn is_ipv4(&self) -> bool {
-        match self {
-            IpAddr::V4(_) => true,
-            IpAddr::V6(_) => false,
-        }
+        matches!(self, IpAddr::V4(_))
     }
 
     /// Returns [`true`] if this address is an [IPv6 address], and [`false`] otherwise.
@@ -303,10 +300,7 @@ impl IpAddr {
     /// ```
     #[stable(feature = "ipaddr_checker", since = "1.16.0")]
     pub fn is_ipv6(&self) -> bool {
-        match self {
-            IpAddr::V4(_) => false,
-            IpAddr::V6(_) => true,
-        }
+        matches!(self, IpAddr::V6(_))
     }
 }