From d8c7b9feb237e6afd8a6bda9903f69d10e4c9c05 Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Wed, 9 Oct 2019 03:32:10 +0300
Subject: [PATCH] JSON transport: use Tokio resolver for connect()

---
 example-service/src/client.rs | 6 +++---
 json-transport/src/lib.rs     | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/example-service/src/client.rs b/example-service/src/client.rs
index 0c3f61e..300c331 100644
--- a/example-service/src/client.rs
+++ b/example-service/src/client.rs
@@ -5,7 +5,7 @@
 // https://opensource.org/licenses/MIT.
 
 use clap::{App, Arg};
-use std::io;
+use std::{io, net::SocketAddr};
 use tarpc::{client, context};
 
 #[tokio::main]
@@ -35,12 +35,12 @@ async fn main() -> io::Result<()> {
 
     let server_addr = flags.value_of("server_addr").unwrap();
     let server_addr = server_addr
-        .parse()
+        .parse::<SocketAddr>()
         .unwrap_or_else(|e| panic!(r#"--server_addr value "{}" invalid: {}"#, server_addr, e));
 
     let name = flags.value_of("name").unwrap().into();
 
-    let transport = tarpc_json_transport::connect(&server_addr).await?;
+    let transport = tarpc_json_transport::connect(server_addr).await?;
 
     // WorldClient is generated by the service attribute. It has a constructor `new` that takes a
     // config and any Transport as input.
diff --git a/json-transport/src/lib.rs b/json-transport/src/lib.rs
index 2eb9194..78dd5e9 100644
--- a/json-transport/src/lib.rs
+++ b/json-transport/src/lib.rs
@@ -124,10 +124,9 @@ impl<S: AsyncWrite + AsyncRead, Item: serde::de::DeserializeOwned, SinkItem: Ser
 }
 
 /// Connects to `addr`, wrapping the connection in a JSON transport.
-pub async fn connect<Item, SinkItem>(
-    addr: &SocketAddr,
-) -> io::Result<Transport<TcpStream, Item, SinkItem>>
+pub async fn connect<A, Item, SinkItem>(addr: A) -> io::Result<Transport<TcpStream, Item, SinkItem>>
 where
+    A: ToSocketAddrs,
     Item: for<'de> Deserialize<'de>,
     SinkItem: Serialize,
 {