diff --git a/tonic-examples/Cargo.toml b/tonic-examples/Cargo.toml index 3ccb7ea..65a11b7 100644 --- a/tonic-examples/Cargo.toml +++ b/tonic-examples/Cargo.toml @@ -24,9 +24,9 @@ path = "src/routeguide/client.rs" [dependencies] tonic = { path = "../tonic" } -hyper = { path = "../../hyper" } +hyper = { git = "https://github.com/hyperium/hyper" } futures-preview = { version = "=0.3.0-alpha.18", default-features = false, features = ["alloc"]} -tokio = "=0.2.0-alpha.2" +tokio = "=0.2.0-alpha.4" prost = "0.5" prost-derive = "0.5" bytes = "0.4" diff --git a/tonic-examples/src/helloworld/client.rs b/tonic-examples/src/helloworld/client.rs index c96119f..c782cd9 100644 --- a/tonic-examples/src/helloworld/client.rs +++ b/tonic-examples/src/helloworld/client.rs @@ -13,7 +13,7 @@ async fn main() -> Result<(), Box> { let origin = http::Uri::from_static("http://[::1]:50051"); let settings = Builder::new().http2_only(true).clone(); - let mut maker = Connect::new(HttpConnector::new(1), settings); + let mut maker = Connect::new(HttpConnector::new(), settings); let svc = maker.make_service(origin.clone()).await?; diff --git a/tonic-examples/src/helloworld/server.rs b/tonic-examples/src/helloworld/server.rs index 80fa85e..277e027 100644 --- a/tonic-examples/src/helloworld/server.rs +++ b/tonic-examples/src/helloworld/server.rs @@ -22,13 +22,8 @@ impl MyGreeter { let string = &self.data; - let when = tokio::clock::now() + Duration::from_millis(100); - Delay::new(when).await; - println!("My data: {:?}", string); - Delay::new(when).await; - let reply = hello_world::HelloReply { message: "Zomg, it works!".into(), }; diff --git a/tonic-examples/src/routeguide/client.rs b/tonic-examples/src/routeguide/client.rs index 173a4d0..f8073b3 100644 --- a/tonic-examples/src/routeguide/client.rs +++ b/tonic-examples/src/routeguide/client.rs @@ -18,7 +18,7 @@ async fn main() -> Result<(), Box> { let origin = http::Uri::from_static("http://[::1]:10000"); let settings = Builder::new().http2_only(true).clone(); - let mut maker = Connect::new(HttpConnector::new(1), settings); + let mut maker = Connect::new(HttpConnector::new(), settings); let svc = maker.make_service(origin.clone()).await?; let svc = AddOrigin::new(svc, origin); diff --git a/tonic-interop/Cargo.toml b/tonic-interop/Cargo.toml index f92d6fa..6f9af94 100644 --- a/tonic-interop/Cargo.toml +++ b/tonic-interop/Cargo.toml @@ -13,14 +13,14 @@ name = "server" path = "src/bin/server.rs" [dependencies] -tokio = "=0.2.0-alpha.2" +tokio = "=0.2.0-alpha.4" tonic = { path = "../tonic" } prost = "0.5" prost-derive = "0.5" bytes = "0.4" http = "0.1" futures-util-preview = "=0.3.0-alpha.18" -hyper = { path = "../../hyper" } +hyper = { git = "https://github.com/hyperium/hyper" } console = "0.7" structopt = "0.2" diff --git a/tonic-interop/src/client.rs b/tonic-interop/src/client.rs index a993aef..07bf3e3 100644 --- a/tonic-interop/src/client.rs +++ b/tonic-interop/src/client.rs @@ -29,7 +29,7 @@ pub async fn create(addr: SocketAddr) -> Result