Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net: add more impls for ToSocketAddrs #1760

Merged
merged 2 commits into from
Nov 16, 2019
Merged

net: add more impls for ToSocketAddrs #1760

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5710c64
net: add more impls for ToSocketAddrs
taiki-e Nov 10, 2019
f37c13b
remove impl for &'a [SocketAddr]
taiki-e Nov 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 60 additions & 9 deletions tokio/src/net/addr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use futures_util::future;
use std::io;
use std::net::{IpAddr, SocketAddr};
#[cfg(feature = "dns")]
use std::net::{Ipv4Addr, Ipv6Addr};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};

/// Convert or resolve without blocking to one or more `SocketAddr` values.
///
Expand Down Expand Up @@ -31,6 +29,32 @@ impl sealed::ToSocketAddrsPriv for SocketAddr {
}
}

// ===== impl SocketAddrV4 =====

impl ToSocketAddrs for SocketAddrV4 {}

impl sealed::ToSocketAddrsPriv for SocketAddrV4 {
type Iter = std::option::IntoIter<SocketAddr>;
type Future = ReadyFuture<Self::Iter>;

fn to_socket_addrs(&self) -> Self::Future {
SocketAddr::V4(*self).to_socket_addrs()
}
}

// ===== impl SocketAddrV6 =====

impl ToSocketAddrs for SocketAddrV6 {}

impl sealed::ToSocketAddrsPriv for SocketAddrV6 {
type Iter = std::option::IntoIter<SocketAddr>;
type Future = ReadyFuture<Self::Iter>;

fn to_socket_addrs(&self) -> Self::Future {
SocketAddr::V6(*self).to_socket_addrs()
}
}

// ===== impl str =====

#[cfg(feature = "dns")]
Expand Down Expand Up @@ -64,17 +88,16 @@ impl sealed::ToSocketAddrsPriv for str {
// ===== impl (&str, u16) =====

#[cfg(feature = "dns")]
impl ToSocketAddrs for (&'_ str, u16) {}
impl ToSocketAddrs for (&str, u16) {}

#[cfg(feature = "dns")]
impl sealed::ToSocketAddrsPriv for (&'_ str, u16) {
impl sealed::ToSocketAddrsPriv for (&str, u16) {
type Iter = sealed::OneOrMore;
type Future = sealed::MaybeReady;

fn to_socket_addrs(&self) -> Self::Future {
use crate::blocking;
use sealed::MaybeReady;
use std::net::{SocketAddrV4, SocketAddrV6};

let (host, port) = *self;

Expand Down Expand Up @@ -115,6 +138,34 @@ impl sealed::ToSocketAddrsPriv for (IpAddr, u16) {
}
}

// ===== impl (Ipv4Addr, u16) =====

impl ToSocketAddrs for (Ipv4Addr, u16) {}

impl sealed::ToSocketAddrsPriv for (Ipv4Addr, u16) {
type Iter = std::option::IntoIter<SocketAddr>;
type Future = ReadyFuture<Self::Iter>;

fn to_socket_addrs(&self) -> Self::Future {
let (ip, port) = *self;
SocketAddrV4::new(ip, port).to_socket_addrs()
}
}

// ===== impl (Ipv6Addr, u16) =====

impl ToSocketAddrs for (Ipv6Addr, u16) {}

impl sealed::ToSocketAddrsPriv for (Ipv6Addr, u16) {
type Iter = std::option::IntoIter<SocketAddr>;
type Future = ReadyFuture<Self::Iter>;

fn to_socket_addrs(&self) -> Self::Future {
let (ip, port) = *self;
SocketAddrV6::new(ip, port, 0, 0).to_socket_addrs()
}
}

// ===== impl String =====

#[cfg(feature = "dns")]
Expand All @@ -130,11 +181,11 @@ impl sealed::ToSocketAddrsPriv for String {
}
}

// ===== impl &'_ impl ToSocketAddrs =====
// ===== impl &impl ToSocketAddrs =====

impl<T: ToSocketAddrs + ?Sized> ToSocketAddrs for &'_ T {}
impl<T: ToSocketAddrs + ?Sized> ToSocketAddrs for &T {}

impl<T> sealed::ToSocketAddrsPriv for &'_ T
impl<T> sealed::ToSocketAddrsPriv for &T
where
T: sealed::ToSocketAddrsPriv + ?Sized,
{
Expand Down