From ea03b821fddf6889a65e569aaaffacf785c2b72e Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Wed, 2 Aug 2023 12:04:26 +0200
Subject: [PATCH] ffi: Use UniFFI fork with future cancellation support

Upstream PR: https://github.com/mozilla/uniffi-rs/pull/1684
---
 Cargo.lock | 21 ++++++++++-----------
 Cargo.toml |  4 ++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f85f6aeff..ca129488b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 7857824e0..1361abbf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"