diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-06-27 20:34:13 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-06-30 14:32:19 +0200 |
| commit | 083cf35f674594025172ef4fe869599c9abada64 (patch) | |
| tree | ba11d0605bb62e9db0302b4b11698e8443c14d1d | |
| parent | 1b8f11df440237262839ab47184eacd4e02d5563 (diff) | |
| download | mullvadvpn-083cf35f674594025172ef4fe869599c9abada64.tar.xz mullvadvpn-083cf35f674594025172ef4fe869599c9abada64.zip | |
Remove unused ToRemoteAddrs trait
| -rw-r--r-- | talpid_core/src/net.rs | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/talpid_core/src/net.rs b/talpid_core/src/net.rs index bc0becbfcd..310adee6ca 100644 --- a/talpid_core/src/net.rs +++ b/talpid_core/src/net.rs @@ -1,11 +1,6 @@ use std::fmt; -use std::io; -use std::iter; use std::net::SocketAddr; -use std::option; -use std::slice; use std::str::FromStr; -use std::vec; error_chain! { @@ -129,63 +124,6 @@ impl fmt::Display for RemoteAddr { } } -/// A trait for objects which can be converted to one or more `RemoteAddr` values. -pub trait ToRemoteAddrs { - /// Returned iterator over remote addresses which this type may correspond - /// to. - type Iter: Iterator<Item = RemoteAddr>; - - /// Converts this object to an iterator of parsed `RemoteAddr`s. - /// - /// # Errors - /// - /// Any errors encountered during parsing will be returned as an `Err`. - fn to_remote_addrs(&self) -> io::Result<Self::Iter>; -} - -impl ToRemoteAddrs for RemoteAddr { - type Iter = option::IntoIter<RemoteAddr>; - - fn to_remote_addrs(&self) -> io::Result<Self::Iter> { - Ok(Some(self.clone()).into_iter()) - } -} - -impl<'a> ToRemoteAddrs for &'a [RemoteAddr] { - type Iter = iter::Cloned<slice::Iter<'a, RemoteAddr>>; - - fn to_remote_addrs(&self) -> io::Result<Self::Iter> { - Ok(self.iter().cloned()) - } -} - -impl<'a> ToRemoteAddrs for &'a str { - type Iter = option::IntoIter<RemoteAddr>; - - fn to_remote_addrs(&self) -> io::Result<Self::Iter> { - let parsed_addr = str_to_remote_addr(self)?; - Ok(Some(parsed_addr).into_iter()) - } -} - -impl<'a> ToRemoteAddrs for &'a [&'a str] { - type Iter = vec::IntoIter<RemoteAddr>; - - fn to_remote_addrs(&self) -> io::Result<Self::Iter> { - let mut addrs = Vec::with_capacity(self.len()); - for addr in self.iter() { - addrs.push(str_to_remote_addr(addr)?); - } - Ok(addrs.into_iter()) - } -} - -fn str_to_remote_addr(s: &str) -> io::Result<RemoteAddr> { - RemoteAddr::from_str(s) - .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e.description())) -} - - #[cfg(test)] mod remote_addr_tests { |
