rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rust: Upgrade our deps

Browse Source
This commit is contained in:
Damir Jelić 2021-05-25 16:13:12 +02:00
parent 49fa34e997
commit 688c167166
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rust-sdk/Cargo.toml
View File

@ -9,14 +9,14 @@ crate-type = ["cdylib", "lib"]
name = "matrix_crypto" name = "matrix_crypto"
[dependencies] [dependencies]
serde = "1.0.64" serde = "1.0.126"
serde_json = "1.0.64" serde_json = "1.0.64"
http = "0.2.4" http = "0.2.4"
thiserror = "1.0.24" thiserror = "1.0.25"
tracing = "0.1.25" tracing = "0.1.26"
tracing-subscriber = "0.2.17" tracing-subscriber = "0.2.18"
uniffi = "0.8.0" uniffi = "0.9.0"
[dependencies.js_int] [dependencies.js_int]
version = "0.2.0" version = "0.2.0"
@ -24,17 +24,17 @@ features = ["lax_deserialize"]
[dependencies.matrix-sdk-common] [dependencies.matrix-sdk-common]
git = "https://github.com/matrix-org/matrix-rust-sdk/" git = "https://github.com/matrix-org/matrix-rust-sdk/"
branch = "encryption-info-v2" rev = "e058191b992f261a1a848b7ec521badf173881d6"
[dependencies.matrix-sdk-crypto] [dependencies.matrix-sdk-crypto]
git = "https://github.com/matrix-org/matrix-rust-sdk/" git = "https://github.com/matrix-org/matrix-rust-sdk/"
branch = "encryption-info-v2" rev = "e058191b992f261a1a848b7ec521badf173881d6"
features = ["sled_cryptostore"] features = ["sled_cryptostore"]
[dependencies.tokio] [dependencies.tokio]
version = "1.4.0" version = "1.6.0"
default_features = false default_features = false
features = ["rt-multi-thread"] features = ["rt-multi-thread"]
[build-dependencies] [build-dependencies]
uniffi_build = "0.8.0" uniffi_build = "0.9.0"

2
rust-sdk/src/machine.rs
View File

@ -386,7 +386,7 @@ impl OlmMachine {
let room_id = RoomId::try_from(room_id)?; let room_id = RoomId::try_from(room_id)?;
let content: Box<RawValue> = serde_json::from_str(content)?; let content: Box<RawValue> = serde_json::from_str(content)?;
let content = AnyMessageEventContent::from_parts(event_type, content)?; let content = AnyMessageEventContent::from_parts(event_type, &content)?;
let encrypted_content = self let encrypted_content = self
.runtime .runtime
.block_on(self.inner.encrypt(&room_id, content)) .block_on(self.inner.encrypt(&room_id, content))