about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-03-03 17:50:17 +0900
committerGitHub <noreply@github.com>2020-03-03 17:50:17 +0900
commite453a0cc49ad83fbb54fb22f9bba7545f5a92c68 (patch)
tree6d30e786044c654a5478545b69a9f8792e856655 /src/libstd
parent9be7932d35f9d71e3264c67b7e2aca485a2e3dc4 (diff)
parent0ec14089a9b62b9e3cda6e84f6ac598ea3778933 (diff)
downloadrust-e453a0cc49ad83fbb54fb22f9bba7545f5a92c68.tar.gz
rust-e453a0cc49ad83fbb54fb22f9bba7545f5a92c68.zip
Rollup merge of #69637 - matthiaskrgr:if_let_some_result, r=ecstatic-morse
Don't convert Results to Options just for matching.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/net/addr.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
index a59d7f0263b..57cba6b1f7a 100644
--- a/src/libstd/net/addr.rs
+++ b/src/libstd/net/addr.rs
@@ -901,7 +901,7 @@ 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
-        if let Some(addr) = self.parse().ok() {
+        if let Ok(addr) = self.parse() {
             return Ok(vec![addr].into_iter());
         }