From f83292fc75cedd6bc932faa612f6acec55b429dc Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Wed, 27 Jul 2022 16:11:03 +0200 Subject: [PATCH] refactor: Start using UniFFI proc-macro frontend --- bindings/matrix-sdk-ffi/src/api.udl | 11 ++++------- bindings/matrix-sdk-ffi/src/client.rs | 3 ++- bindings/matrix-sdk-ffi/src/lib.rs | 1 + 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bindings/matrix-sdk-ffi/src/api.udl b/bindings/matrix-sdk-ffi/src/api.udl index d5168fdad..dc6014d25 100644 --- a/bindings/matrix-sdk-ffi/src/api.udl +++ b/bindings/matrix-sdk-ffi/src/api.udl @@ -1,9 +1,6 @@ namespace sdk { - void setup_tracing(string configuration); - MediaSource media_source_from_url(string url); MessageEventContent message_event_content_from_markdown(string md); - string gen_transaction_id(); }; [Error] @@ -179,15 +176,15 @@ interface HomeserverLoginDetails { interface AuthenticationService { constructor(string base_path); - + HomeserverLoginDetails? homeserver_details(); - + [Throws=AuthenticationError] void configure_homeserver(string server_name); - + [Throws=AuthenticationError] Client login(string username, string password); - + [Throws=AuthenticationError] Client restore_with_access_token(string token, string device_id); }; diff --git a/bindings/matrix-sdk-ffi/src/client.rs b/bindings/matrix-sdk-ffi/src/client.rs index 54a181ad1..8e478f1d4 100644 --- a/bindings/matrix-sdk-ffi/src/client.rs +++ b/bindings/matrix-sdk-ffi/src/client.rs @@ -262,6 +262,7 @@ impl Client { } } -pub fn gen_transaction_id() -> String { +#[uniffi::export] +fn gen_transaction_id() -> String { TransactionId::new().to_string() } diff --git a/bindings/matrix-sdk-ffi/src/lib.rs b/bindings/matrix-sdk-ffi/src/lib.rs index db2461303..8785dcfca 100644 --- a/bindings/matrix-sdk-ffi/src/lib.rs +++ b/bindings/matrix-sdk-ffi/src/lib.rs @@ -57,6 +57,7 @@ impl From for ClientError { } } +#[uniffi::export] fn setup_tracing(configuration: String) { tracing_subscriber::registry() .with(EnvFilter::new(configuration))