Skip to content

Commit efe1f3c

Browse files
committed
chore: Bump our deps
1 parent b4e8193 commit efe1f3c

File tree

21 files changed

+902
-847
lines changed

21 files changed

+902
-847
lines changed

Cargo.lock

Lines changed: 826 additions & 773 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ resolver = "2"
1919
rust-version = "1.88"
2020

2121
[workspace.dependencies]
22-
anyhow = "1.0.95"
22+
anyhow = "1.0.98"
2323
aquamarine = "0.6.0"
2424
as_variant = "1.3.0"
2525
assert-json-diff = "2.0.2"
2626
assert_matches = "1.5.0"
2727
assert_matches2 = "0.1.2"
2828
async-compat = "0.2.4"
2929
async-rx = "0.1.3"
30-
async-stream = "0.3.5"
31-
async-trait = "0.1.85"
30+
async-stream = "0.3.6"
31+
async-trait = "0.1.88"
3232
base64 = "0.22.1"
33-
bitflags = "2.8.0"
33+
bitflags = "2.9.1"
3434
byteorder = "1.5.0"
35-
chrono = "0.4.39"
35+
chrono = "0.4.41"
3636
eyeball = { version = "0.8.8", features = ["tracing"] }
3737
eyeball-im = { version = "0.7.0", features = ["tracing"] }
3838
eyeball-im-util = "0.9.0"
@@ -44,20 +44,20 @@ gloo-timers = "0.3.0"
4444
growable-bloom-filter = "2.1.1"
4545
hkdf = "0.12.4"
4646
hmac = "0.12.1"
47-
http = "1.2.0"
47+
http = "1.3.1"
4848
imbl = "5.0.0"
49-
indexmap = "2.7.1"
50-
insta = { version = "1.42.1", features = ["json", "redactions"] }
49+
indexmap = "2.10.0"
50+
insta = { version = "1.43.1", features = ["json", "redactions"] }
5151
itertools = "0.14.0"
52-
js-sys = "0.3.69"
52+
js-sys = "0.3.77"
5353
mime = "0.3.17"
5454
oauth2 = { version = "5.0.0", default-features = false, features = ["reqwest", "timing-resistant-secret-traits"] }
55-
once_cell = "1.20.2"
55+
once_cell = "1.21.3"
5656
pbkdf2 = { version = "0.12.2" }
5757
pin-project-lite = "0.2.16"
58-
proptest = { version = "1.6.0", default-features = false, features = ["std"] }
58+
proptest = { version = "1.7.0", default-features = false, features = ["std"] }
5959
rand = "0.9.2"
60-
reqwest = { version = "0.12.12", default-features = false }
60+
reqwest = { version = "0.12.22", default-features = false }
6161
rmp-serde = "1.3.0"
6262
ruma = { git = "https://github.com/ruma/ruma", rev = "a626e6b8521bcaa01bf8b7c4161b26b361b72aff", features = [
6363
"client-api-c",
@@ -82,15 +82,15 @@ ruma = { git = "https://github.com/ruma/ruma", rev = "a626e6b8521bcaa01bf8b7c416
8282
ruma-common = { git = "https://github.com/ruma/ruma", rev = "a626e6b8521bcaa01bf8b7c4161b26b361b72aff" }
8383
sentry = "0.36.0"
8484
sentry-tracing = "0.36.0"
85-
serde = { version = "1.0.217", features = ["rc"] }
85+
serde = { version = "1.0.219", features = ["rc"] }
8686
serde_html_form = "0.2.7"
87-
serde_json = "1.0.138"
88-
sha2 = "0.10.8"
89-
similar-asserts = "1.6.1"
87+
serde_json = "1.0.142"
88+
sha2 = "0.10.9"
89+
similar-asserts = "1.7.0"
9090
stream_assert = "0.1.1"
91-
tempfile = "3.16.0"
92-
thiserror = "2.0.11"
93-
tokio = { version = "1.43.1", default-features = false, features = ["sync"] }
91+
tempfile = "3.20.0"
92+
thiserror = "2.0.12"
93+
tokio = { version = "1.47.1", default-features = false, features = ["sync", "net"] }
9494
tokio-stream = "0.1.17"
9595
tracing = { version = "0.1.40", default-features = false, features = ["std"] }
9696
tracing-core = "0.1.32"
@@ -99,12 +99,12 @@ unicode-normalization = "0.1.24"
9999
uniffi = { version = "0.28.0" }
100100
uniffi_bindgen = { version = "0.28.0" }
101101
url = "2.5.4"
102-
uuid = "1.12.1"
102+
uuid = "1.17.0"
103103
vodozemac = { git = "https://github.com/matrix-org/vodozemac/", rev = "d2b8743802f4ad7efc9ae9cf48baccbfb04d4d8a", features = ["insecure-pk-encryption"] }
104-
wasm-bindgen = "0.2.84"
104+
wasm-bindgen = "0.2.100"
105105
wasm-bindgen-test = "0.3.50"
106-
web-sys = "0.3.69"
107-
wiremock = "0.6.2"
106+
web-sys = "0.3.77"
107+
wiremock = "0.6.4"
108108
zeroize = "1.8.1"
109109

110110
matrix-sdk = { path = "crates/matrix-sdk", version = "0.13.0", default-features = false }

bindings/matrix-sdk-crypto-ffi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ workspace = true
5656
features = ["crypto-store"]
5757

5858
[dependencies.tokio]
59-
version = "1.43.1"
59+
version = "1.47.1"
6060
default-features = false
6161
features = ["rt-multi-thread"]
6262

bindings/matrix-sdk-crypto-ffi/src/backup_recovery_key.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use matrix_sdk_crypto::{
66
store::{types::BackupDecryptionKey, CryptoStoreError as InnerStoreError},
77
};
88
use pbkdf2::pbkdf2;
9-
use rand::{distributions::Alphanumeric, thread_rng, Rng};
9+
use rand::{distr::Alphanumeric, rng, Rng};
1010
use sha2::Sha512;
1111
use thiserror::Error;
1212
use zeroize::Zeroize;
@@ -75,11 +75,7 @@ impl BackupRecoveryKey {
7575
#[allow(clippy::new_without_default)]
7676
#[uniffi::constructor]
7777
pub fn new() -> Arc<Self> {
78-
Arc::new(Self {
79-
inner: BackupDecryptionKey::new()
80-
.expect("Can't gather enough randomness to create a recovery key"),
81-
passphrase_info: None,
82-
})
78+
Arc::new(Self { inner: BackupDecryptionKey::new(), passphrase_info: None })
8379
}
8480

8581
/// Try to create a [`BackupRecoveryKey`] from a base 64 encoded string.
@@ -97,7 +93,7 @@ impl BackupRecoveryKey {
9793
/// Create a new [`BackupRecoveryKey`] from the given passphrase.
9894
#[uniffi::constructor]
9995
pub fn new_from_passphrase(passphrase: String) -> Arc<Self> {
100-
let mut rng = thread_rng();
96+
let mut rng = rng();
10197
let salt: String = iter::repeat(())
10298
.map(|()| rng.sample(Alphanumeric))
10399
.map(char::from)

bindings/matrix-sdk-crypto-ffi/src/dehydrated_devices.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ pub enum DehydrationError {
2929
Store(#[from] matrix_sdk_crypto::CryptoStoreError),
3030
#[error("The pickle key has an invalid length, expected 32 bytes, got {0}")]
3131
PickleKeyLength(usize),
32-
#[error(transparent)]
33-
Rand(#[from] rand::Error),
3432
}
3533

3634
impl From<matrix_sdk_crypto::dehydrated_devices::DehydrationError> for DehydrationError {

bindings/matrix-sdk-crypto-ffi/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ pub struct DehydratedDeviceKey {
845845
impl DehydratedDeviceKey {
846846
/// Generates a new random pickle key.
847847
pub fn new() -> Result<Self, DehydrationError> {
848-
let inner = InnerDehydratedDeviceKey::new()?;
848+
let inner = InnerDehydratedDeviceKey::new();
849849
Ok(inner.into())
850850
}
851851

bindings/matrix-sdk-ffi/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ matrix-sdk = { workspace = true, features = [
5555
matrix-sdk-common.workspace = true
5656
matrix-sdk-ffi-macros.workspace = true
5757
matrix-sdk-ui = { workspace = true, features = ["uniffi"] }
58-
mime = "0.3.16"
58+
mime = "0.3.17"
5959
once_cell.workspace = true
6060
ruma = { workspace = true, features = ["html", "unstable-msc3488", "compat-unset-avatar", "unstable-msc3245-v1-compat", "unstable-msc4278", "unstable-hydra"] }
6161
serde.workspace = true
@@ -71,7 +71,7 @@ sentry = { version = "0.36.0", optional = true, default-features = false, featur
7171
sentry-tracing = { version = "0.36.0", optional = true }
7272
thiserror.workspace = true
7373
tracing.workspace = true
74-
tracing-appender = { version = "0.2.2" }
74+
tracing-appender = { version = "0.2.3" }
7575
tracing-core.workspace = true
7676
tracing-subscriber = { workspace = true, features = ["env-filter"] }
7777
url.workspace = true
@@ -90,7 +90,7 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
9090
uniffi = { workspace = true, features = ["tokio"] }
9191

9292
[target.'cfg(target_os = "android")'.dependencies]
93-
paranoid-android = "0.2.1"
93+
paranoid-android = "0.2.2"
9494

9595
[build-dependencies]
9696
uniffi = { workspace = true, features = ["build"] }

crates/matrix-sdk-base/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ assert_matches = { workspace = true, optional = true }
5858
assert_matches2 = { workspace = true, optional = true }
5959
async-trait.workspace = true
6060
bitflags = { workspace = true, features = ["serde"] }
61-
decancer = "3.3.0"
61+
decancer = "3.3.3"
6262
eyeball = { workspace = true, features = ["async-lock"] }
6363
eyeball-im.workspace = true
6464
futures-util.workspace = true

crates/matrix-sdk-crypto/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ as_variant.workspace = true
4242
async-trait.workspace = true
4343
bs58 = { version = "0.5.1" }
4444
byteorder.workspace = true
45-
cfg-if = "1.0.0"
45+
cfg-if = "1.0.1"
4646
ctr = "0.9.2"
4747
eyeball.workspace = true
4848
futures-core.workspace = true
@@ -63,11 +63,11 @@ serde_json.workspace = true
6363
sha2.workspace = true
6464
subtle = "2.6.1"
6565
thiserror.workspace = true
66-
time = { version = "0.3.37", features = ["formatting"] }
66+
time = { version = "0.3.41", features = ["formatting"] }
6767
tokio.workspace = true
6868
tokio-stream = { workspace = true, features = ["sync"] }
6969
tracing = { workspace = true, features = ["attributes"] }
70-
ulid = { version = "1.1.4" }
70+
ulid = { version = "1.2.1" }
7171
uniffi = { workspace = true, optional = true }
7272
url.workspace = true
7373
vodozemac.workspace = true
@@ -85,7 +85,7 @@ assert_matches.workspace = true
8585
assert_matches2.workspace = true
8686
futures-executor.workspace = true
8787
http.workspace = true
88-
indoc = "2.0.5"
88+
indoc = "2.0.6"
8989
insta.workspace = true
9090
matrix-sdk-test.workspace = true
9191
proptest.workspace = true

crates/matrix-sdk-crypto/src/store/types.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,12 @@ pub struct BackupDecryptionKey {
242242
pub(crate) inner: Box<[u8; BackupDecryptionKey::KEY_SIZE]>,
243243
}
244244

245+
impl Default for BackupDecryptionKey {
246+
fn default() -> Self {
247+
Self::new()
248+
}
249+
}
250+
245251
impl BackupDecryptionKey {
246252
/// The number of bytes the decryption key will hold.
247253
pub const KEY_SIZE: usize = 32;
@@ -279,6 +285,12 @@ pub struct DehydratedDeviceKey {
279285
pub(crate) inner: Box<[u8; DehydratedDeviceKey::KEY_SIZE]>,
280286
}
281287

288+
impl Default for DehydratedDeviceKey {
289+
fn default() -> Self {
290+
Self::new()
291+
}
292+
}
293+
282294
impl DehydratedDeviceKey {
283295
/// The number of bytes the encryption key will hold.
284296
pub const KEY_SIZE: usize = 32;

0 commit comments

Comments
 (0)