summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2016-12-12 16:41:19 +0100
committerLinus Färnstrand <linus@mullvad.net>2016-12-12 16:41:19 +0100
commit6e34677dc1127aeb002464321e980a3dc984ff37 (patch)
tree8359d311b1bad86a2a44c1dfa88f6e4855595b64 /src
parent87c1ed3ae60c735f404d2ad2b8d7c5c8daa6f4c4 (diff)
downloadmullvadvpn-6e34677dc1127aeb002464321e980a3dc984ff37.tar.xz
mullvadvpn-6e34677dc1127aeb002464321e980a3dc984ff37.zip
Rename split_at_colon
Diffstat (limited to 'src')
-rw-r--r--src/net.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net.rs b/src/net.rs
index 3ef4be6b77..9a8a8431f5 100644
--- a/src/net.rs
+++ b/src/net.rs
@@ -44,7 +44,7 @@ impl RemoteAddr {
}
fn from_domain_str(s: &str) -> Result<Self, AddrParseError> {
- let (address, port_str) = Self::split_at_colon(s).map_err(|_| AddrParseError(()))?;
+ let (address, port_str) = Self::split_at_last_colon(s).map_err(|_| AddrParseError(()))?;
let port = u16::from_str(port_str).map_err(|_| AddrParseError(()))?;
if address.len() == 0 || address.contains(':') {
return Err(AddrParseError(()));
@@ -52,7 +52,7 @@ impl RemoteAddr {
Ok(RemoteAddr::Domain(address.to_owned(), port))
}
- fn split_at_colon(s: &str) -> Result<(&str, &str), ()> {
+ fn split_at_last_colon(s: &str) -> Result<(&str, &str), ()> {
let mut iter = s.rsplitn(2, ":");
let port = iter.next().unwrap();
let address = iter.next().ok_or(())?;