mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-14 02:55:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

ffi: Use UniFFI fork with future cancellation support

Browse Source 
Upstream PR: https://github.com/mozilla/uniffi-rs/pull/1684
This commit is contained in:
Jonas Platte
2023-08-02 12:04:26 +02:00
committed by Jonas Platte
parent f1b4b80460
commit ea03b821fd
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Cargo.lock generated
View File

@@ -5325,7 +5325,7 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "uniffi"
version = "0.24.1"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"anyhow",
"camino",
@@ -5346,7 +5346,7 @@ dependencies = [
[[package]]
name = "uniffi_bindgen"
version = "0.24.1"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"anyhow",
"askama",
@@ -5370,7 +5370,7 @@ dependencies = [
[[package]]
name = "uniffi_build"
version = "0.24.1"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"anyhow",
"camino",
@@ -5380,7 +5380,7 @@ dependencies = [
[[package]]
name = "uniffi_checksum_derive"
version = "0.24.1"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"quote",
"syn 2.0.28",
@@ -5389,7 +5389,7 @@ dependencies = [
[[package]]
name = "uniffi_core"
version = "0.24.1"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"anyhow",
"async-compat",
@@ -5405,7 +5405,7 @@ dependencies = [
[[package]]
name = "uniffi_macros"
version = "0.24.1"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"bincode",
"camino",
@@ -5423,20 +5423,19 @@ dependencies = [
[[package]]
name = "uniffi_meta"
version = "0.24.1"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"anyhow",
"bytes",
"serde",
"siphasher",
"uniffi_checksum_derive",
"uniffi_core",
]
[[package]]
name = "uniffi_testing"
version = "0.24.1"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"anyhow",
"camino",
@@ -5450,7 +5449,7 @@ dependencies = [
[[package]]
name = "uniffi_udl"
version = "0.24.1"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"anyhow",
"uniffi_meta",
@@ -5761,7 +5760,7 @@ dependencies = [
[[package]]
name = "weedle2"
version = "4.0.0"
source = "git+https://github.com/mozilla/uniffi-rs?rev=8565b7f941e7967778efd39c5ab27551dfa23ec6#8565b7f941e7967778efd39c5ab27551dfa23ec6"
source = "git+https://github.com/Hywan/uniffi-rs?rev=6d32d7657294d8c8ebb00139cfe55ff90fb093dc#6d32d7657294d8c8ebb00139cfe55ff90fb093dc"
dependencies = [
"nom",
]

4
Cargo.toml
View File

@@ -44,8 +44,8 @@ thiserror = "1.0.38"
tokio = { version = "1.24", default-features = false, features = ["sync"] }
tracing = { version = "0.1.36", default-features = false, features = ["std"] }
tracing-core = "0.1.30"
uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "8565b7f941e7967778efd39c5ab27551dfa23ec6" }
uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs", rev = "8565b7f941e7967778efd39c5ab27551dfa23ec6" }
uniffi = { git = "https://github.com/Hywan/uniffi-rs", rev = "6d32d7657294d8c8ebb00139cfe55ff90fb093dc" }
uniffi_bindgen = { git = "https://github.com/Hywan/uniffi-rs", rev = "6d32d7657294d8c8ebb00139cfe55ff90fb093dc" }
vodozemac = { git = "https://github.com/matrix-org/vodozemac/", rev = "cedc9a08fdd8d0931ea778acf68c619a8298ee70" }
zeroize = "1.6.0"