From ac6dad3f35213be33c7eb8fafdf8ffe423427f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Mon, 25 Jan 2021 15:47:51 +0100 Subject: [PATCH] matrix-sdk: Bump our deps --- matrix_sdk/Cargo.toml | 16 ++++++++-------- matrix_sdk_base/Cargo.toml | 22 +++++++++++----------- matrix_sdk_common/Cargo.toml | 8 ++++---- matrix_sdk_crypto/Cargo.toml | 18 +++++++++--------- matrix_sdk_crypto/benches/crypto_bench.rs | 11 ++++++++--- matrix_sdk_test/Cargo.toml | 4 ++-- 6 files changed, 42 insertions(+), 37 deletions(-) diff --git a/matrix_sdk/Cargo.toml b/matrix_sdk/Cargo.toml index dddf7e72..648e358c 100644 --- a/matrix_sdk/Cargo.toml +++ b/matrix_sdk/Cargo.toml @@ -29,9 +29,9 @@ socks = ["reqwest/socks"] docs = ["encryption", "sled_cryptostore", "sled_state_store"] [dependencies] -dashmap = { version = "4.0.1", optional = true } -futures = "0.3.8" -http = "0.2.2" +dashmap = { version = "4.0.2", optional = true } +futures = "0.3.12" +http = "0.2.3" serde_json = "1.0.61" thiserror = "1.0.23" tracing = "0.1.22" @@ -59,7 +59,7 @@ features = ["std", "std-future"] futures-timer = "3.0.2" [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio] -version = "1.0.1" +version = "1.1.0" default-features = false features = ["fs", "rt"] @@ -68,14 +68,14 @@ version = "3.0.2" features = ["wasm-bindgen"] [dev-dependencies] -async-std = { version = "1.8.0", features = ["unstable"] } +async-std = { version = "1.9.0", features = ["unstable"] } dirs = "3.0.1" matrix-sdk-test = { version = "0.2.0", path = "../matrix_sdk_test" } -tokio = { version = "1.0.1", default-features = false, features = ["rt-multi-thread", "macros"] } +tokio = { version = "1.1.0", default-features = false, features = ["rt-multi-thread", "macros"] } serde_json = "1.0.61" tracing-subscriber = "0.2.15" -tempfile = "3.1.0" -mockito = "0.28.0" +tempfile = "3.2.0" +mockito = "0.29.0" lazy_static = "1.4.0" [[example]] diff --git a/matrix_sdk_base/Cargo.toml b/matrix_sdk_base/Cargo.toml index 4c05db0c..972aa310 100644 --- a/matrix_sdk_base/Cargo.toml +++ b/matrix_sdk_base/Cargo.toml @@ -25,8 +25,8 @@ markdown = ["matrix-sdk-common/markdown"] docs = ["encryption", "sled_cryptostore"] [dependencies] -dashmap= "4.0.1" -serde = { version = "1.0.119", features = ["rc"] } +dashmap= "4.0.2" +serde = { version = "1.0.122", features = ["rc"] } serde_json = "1.0.61" tracing = "0.1.22" @@ -35,7 +35,7 @@ matrix-sdk-crypto = { version = "0.2.0", path = "../matrix_sdk_crypto", optional # Misc dependencies thiserror = "1.0.23" -futures = "0.3.8" +futures = "0.3.12" zeroize = { version = "1.2.0", features = ["zeroize_derive"] } # Deps for the sled state store @@ -47,24 +47,24 @@ sha2 = { version = "0.9.2", optional = true } rand = { version = "0.8.2", optional = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio] -version = "1.0.1" +version = "1.1.0" default-features = false features = ["sync", "fs"] [dev-dependencies] matrix-sdk-test = { version = "0.2.0", path = "../matrix_sdk_test" } -http = "0.2.2" +http = "0.2.3" tracing-subscriber = "0.2.15" -tempfile = "3.1.0" -mockito = "0.28.0" -rustyline = "7.0.0" +tempfile = "3.2.0" +mockito = "0.29.0" +rustyline = "7.1.0" rustyline-derive = "0.4.0" -atty = "0.2" +atty = "0.2.14" clap = "2.33.3" -syntect = "4.4.0" +syntect = "4.5.0" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -tokio = { version = "1.0.1", default-features = false, features = ["rt-multi-thread", "macros"] } +tokio = { version = "1.1.0", default-features = false, features = ["rt-multi-thread", "macros"] } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] wasm-bindgen-test = "0.3.19" diff --git a/matrix_sdk_common/Cargo.toml b/matrix_sdk_common/Cargo.toml index 30012fc5..444d397e 100644 --- a/matrix_sdk_common/Cargo.toml +++ b/matrix_sdk_common/Cargo.toml @@ -16,7 +16,7 @@ markdown = ["ruma/markdown"] [dependencies] instant = { version = "0.1.9", features = ["wasm-bindgen", "now"] } -serde = "1.0.119" +serde = "1.0.122" async-trait = "0.1.42" [dependencies.ruma] @@ -26,13 +26,13 @@ rev = "8c109d3c0a7ec66b352dc82677d30db7cb0723eb" features = ["client-api", "unstable-pre-spec"] [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -uuid = { version = "0.8.1", default-features = false, features = ["v4", "serde"] } +uuid = { version = "0.8.2", default-features = false, features = ["v4", "serde"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio] -version = "1.0.1" +version = "1.1.0" default-features = false features = ["sync"] [target.'cfg(target_arch = "wasm32")'.dependencies] futures-locks = { version = "0.6.0", default-features = false } -uuid = { version = "0.8.1", default-features = false, features = ["v4", "wasm-bindgen"] } +uuid = { version = "0.8.2", default-features = false, features = ["v4", "wasm-bindgen"] } diff --git a/matrix_sdk_crypto/Cargo.toml b/matrix_sdk_crypto/Cargo.toml index ebf3d651..9b53e062 100644 --- a/matrix_sdk_crypto/Cargo.toml +++ b/matrix_sdk_crypto/Cargo.toml @@ -24,8 +24,8 @@ docs = ["sqlite_cryptostore"] matrix-sdk-common = { version = "0.2.0", path = "../matrix_sdk_common" } olm-rs = { version = "1.0.0", features = ["serde"] } -getrandom = "0.2.1" -serde = { version = "1.0.119", features = ["derive", "rc"] } +getrandom = "0.2.2" +serde = { version = "1.0.122", features = ["derive", "rc"] } serde_json = "1.0.61" zeroize = { version = "1.2.0", features = ["zeroize_derive"] } @@ -34,14 +34,14 @@ sled = { version = "0.34.6", optional = true } thiserror = "1.0.23" tracing = "0.1.22" atomic = "0.5.0" -dashmap = "4.0.1" +dashmap = "4.0.2" sha2 = "0.9.2" aes-gcm = "0.8.0" aes-ctr = "0.6.0" pbkdf2 = { version = "0.6.0", default-features = false } hmac = "0.10.1" base64 = "0.13.0" -byteorder = "1.3.4" +byteorder = "1.4.2" [target.'cfg(not(target_arch = "wasm32"))'.dependencies.sqlx] version = "0.4.2" @@ -50,15 +50,15 @@ default-features = false features = ["runtime-tokio-native-tls", "sqlite", "macros"] [dev-dependencies] -tokio = { version = "1.0.1", default-features = false, features = ["rt-multi-thread", "macros"] } -futures = "0.3.8" +tokio = { version = "1.1.0", default-features = false, features = ["rt-multi-thread", "macros"] } +futures = "0.3.12" proptest = "0.10.1" serde_json = "1.0.61" -tempfile = "3.1.0" -http = "0.2.2" +tempfile = "3.2.0" +http = "0.2.3" matrix-sdk-test = { version = "0.2.0", path = "../matrix_sdk_test" } indoc = "1.0.3" -criterion = "0.3.3" +criterion = { version = "0.3.4", features = ["async", "async_futures", "html_reports"] } [[bench]] name = "crypto_bench" diff --git a/matrix_sdk_crypto/benches/crypto_bench.rs b/matrix_sdk_crypto/benches/crypto_bench.rs index 65422f35..18e4ab54 100644 --- a/matrix_sdk_crypto/benches/crypto_bench.rs +++ b/matrix_sdk_crypto/benches/crypto_bench.rs @@ -1,8 +1,10 @@ use std::convert::TryFrom; -use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput}; +use criterion::{ + async_executor::FuturesExecutor, criterion_group, criterion_main, BenchmarkId, Criterion, + Throughput, +}; -use futures::executor::block_on; use matrix_sdk_common::{ api::r0::keys::get_keys, identifiers::{user_id, DeviceIdBox, UserId}, @@ -46,7 +48,10 @@ pub fn receive_keys_query(c: &mut Criterion) { group.bench_with_input( BenchmarkId::new("key_query", "150 devices key query response parsing"), &response, - |b, response| b.iter(|| block_on(machine.mark_request_as_sent(&uuid, response)).unwrap()), + |b, response| { + b.to_async(FuturesExecutor) + .iter(|| async { machine.mark_request_as_sent(&uuid, response).await.unwrap() }) + }, ); group.finish() } diff --git a/matrix_sdk_test/Cargo.toml b/matrix_sdk_test/Cargo.toml index 3aa3e490..0ab8435c 100644 --- a/matrix_sdk_test/Cargo.toml +++ b/matrix_sdk_test/Cargo.toml @@ -12,8 +12,8 @@ version = "0.2.0" [dependencies] serde_json = "1.0.61" -http = "0.2.2" +http = "0.2.3" matrix-sdk-common = { version = "0.2.0", path = "../matrix_sdk_common" } matrix-sdk-test-macros = { version = "0.1.0", path = "../matrix_sdk_test_macros" } lazy_static = "1.4.0" -serde = "1.0.119" +serde = "1.0.122"