From 721dc6f413ba0059ed6641f5875afcd8752c81dc Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 7 Sep 2019 11:59:00 +0200 Subject: [PATCH] Update dependencies --- Cargo.toml | 14 +++++++------- src/lib.rs | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fd124c62..e19da024 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,17 +15,17 @@ version = "0.2.0" [dependencies] futures-preview = "0.3.0-alpha.17" http = "0.1.18" -hyper = { git = "https://github.com/hyperium/hyper" } +hyper = "0.13.0-alpha.1" ruma-api = "0.10.0" ruma-client-api = { git = "https://github.com/ruma/ruma-client-api" } ruma-identifiers = "0.14.0" serde_json = "1.0.40" serde_urlencoded = "0.6.1" -url = "2.0.0" +url = "2.1.0" [dependencies.hyper-tls] optional = true -git = "https://github.com/hyperium/hyper-tls" +version = "0.4.0-alpha.1" [dependencies.native-tls] optional = true @@ -36,11 +36,11 @@ git = "https://github.com/ruma/ruma-events" rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19" [dependencies.serde] -version = "1.0.98" +version = "1.0.99" features = ["derive"] -[dev-dependencies.tokio] -git = "https://github.com/tokio-rs/tokio" +[dev-dependencies] +tokio = "0.2.0-alpha.4" [features] default = ["tls"] @@ -48,4 +48,4 @@ tls = ["hyper-tls", "native-tls"] [patch.crates-io.ruma-events] git = "https://github.com/ruma/ruma-events" -rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19" \ No newline at end of file +rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19" diff --git a/src/lib.rs b/src/lib.rs index 0508cd81..e27317fe 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -83,7 +83,6 @@ //! # ; //! ``` -#![feature(async_await, async_closure)] #![deny( missing_copy_implementations, missing_debug_implementations, @@ -194,7 +193,7 @@ pub type HttpsClient = Client>; impl HttpsClient { /// Creates a new client for making HTTPS requests to the given homeserver. pub fn https(homeserver_url: Url, session: Option) -> Result { - let connector = HttpsConnector::new(4)?; + let connector = HttpsConnector::new()?; Ok(Self(Arc::new(ClientData { homeserver_url, @@ -333,7 +332,7 @@ where since: Option, set_presence: bool, ) -> impl Stream> - + TryStream { + + TryStream { use api::r0::sync::sync_events; // TODO: Is this really the way TryStreams are supposed to work?