chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Jonas Platte 2019-09-07 11:59:00 +02:00
parent 413f489f0c
commit 721dc6f413
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.toml
View File

@ -15,17 +15,17 @@ version = "0.2.0"
[dependencies] [dependencies]
futures-preview = "0.3.0-alpha.17" futures-preview = "0.3.0-alpha.17"
http = "0.1.18" http = "0.1.18"
hyper = { git = "https://github.com/hyperium/hyper" } hyper = "0.13.0-alpha.1"
ruma-api = "0.10.0" ruma-api = "0.10.0"
ruma-client-api = { git = "https://github.com/ruma/ruma-client-api" } ruma-client-api = { git = "https://github.com/ruma/ruma-client-api" }
ruma-identifiers = "0.14.0" ruma-identifiers = "0.14.0"
serde_json = "1.0.40" serde_json = "1.0.40"
serde_urlencoded = "0.6.1" serde_urlencoded = "0.6.1"
url = "2.0.0" url = "2.1.0"
[dependencies.hyper-tls] [dependencies.hyper-tls]
optional = true optional = true
git = "https://github.com/hyperium/hyper-tls" version = "0.4.0-alpha.1"
[dependencies.native-tls] [dependencies.native-tls]
optional = true optional = true
@ -36,11 +36,11 @@ git = "https://github.com/ruma/ruma-events"
rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19" rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19"
[dependencies.serde] [dependencies.serde]
version = "1.0.98" version = "1.0.99"
features = ["derive"] features = ["derive"]
[dev-dependencies.tokio] [dev-dependencies]
git = "https://github.com/tokio-rs/tokio" tokio = "0.2.0-alpha.4"
[features] [features]
default = ["tls"] default = ["tls"]
@ -48,4 +48,4 @@ tls = ["hyper-tls", "native-tls"]
[patch.crates-io.ruma-events] [patch.crates-io.ruma-events]
git = "https://github.com/ruma/ruma-events" git = "https://github.com/ruma/ruma-events"
rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19" rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19"

5
src/lib.rs
View File

@ -83,7 +83,6 @@
//! # ; //! # ;
//! ``` //! ```
#![feature(async_await, async_closure)]
#![deny( #![deny(
missing_copy_implementations, missing_copy_implementations,
missing_debug_implementations, missing_debug_implementations,
@ -194,7 +193,7 @@ pub type HttpsClient = Client<HttpsConnector<HttpConnector>>;
impl HttpsClient { impl HttpsClient {
/// Creates a new client for making HTTPS requests to the given homeserver. /// Creates a new client for making HTTPS requests to the given homeserver.
pub fn https(homeserver_url: Url, session: Option<Session>) -> Result<Self, NativeTlsError> { pub fn https(homeserver_url: Url, session: Option<Session>) -> Result<Self, NativeTlsError> {
let connector = HttpsConnector::new(4)?; let connector = HttpsConnector::new()?;
Ok(Self(Arc::new(ClientData { Ok(Self(Arc::new(ClientData {
homeserver_url, homeserver_url,
@ -333,7 +332,7 @@ where
since: Option<String>, since: Option<String>,
set_presence: bool, set_presence: bool,
) -> impl Stream<Item = Result<api::r0::sync::sync_events::Response, Error>> ) -> impl Stream<Item = Result<api::r0::sync::sync_events::Response, Error>>
+ TryStream<Ok = api::r0::sync::sync_events::Response, Error = Error> { + TryStream<Ok = api::r0::sync::sync_events::Response, Error = Error> {
use api::r0::sync::sync_events; use api::r0::sync::sync_events;
// TODO: Is this really the way TryStreams are supposed to work? // TODO: Is this really the way TryStreams are supposed to work?