about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorEric Arellano <ericarellano@me.com>2020-12-07 14:24:05 -0700
committerEric Arellano <ericarellano@me.com>2020-12-07 14:24:05 -0700
commitd2de69da2e99d43e14a80219b835aaf513c2f0d9 (patch)
tree0602a307cb74daea1791c8b47df8aeb42ba84090 /library/std/src
parent85e9ea015220cc74dc54873974ed7138ea22eced (diff)
downloadrust-d2de69da2e99d43e14a80219b835aaf513c2f0d9.tar.gz
rust-d2de69da2e99d43e14a80219b835aaf513c2f0d9.zip
Dogfood 'str_split_once()` in the std lib
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/lib.rs1
-rw-r--r--library/std/src/sys_common/net.rs4
2 files changed, 2 insertions, 3 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 6c240cb4c3e..aba47445563 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -312,6 +312,7 @@
 #![feature(stdsimd)]
 #![feature(stmt_expr_attributes)]
 #![feature(str_internals)]
+#![feature(str_split_once)]
 #![feature(test)]
 #![feature(thread_local)]
 #![feature(thread_local_internals)]
diff --git a/library/std/src/sys_common/net.rs b/library/std/src/sys_common/net.rs
index 48ba4ddfc0b..47d615142f2 100644
--- a/library/std/src/sys_common/net.rs
+++ b/library/std/src/sys_common/net.rs
@@ -177,9 +177,7 @@ impl TryFrom<&str> for LookupHost {
         }
 
         // split the string by ':' and convert the second part to u16
-        let mut parts_iter = s.rsplitn(2, ':');
-        let port_str = try_opt!(parts_iter.next(), "invalid socket address");
-        let host = try_opt!(parts_iter.next(), "invalid socket address");
+        let (port_str, host) = try_opt!(s.rsplit_once(':'), "invalid socket address");
         let port: u16 = try_opt!(port_str.parse().ok(), "invalid port value");
 
         (host, port).try_into()