bindings: Use proc-macros for types no longer referenced in UDL

matrix-org · Apr 27, 2023 · 6307f6c · 6307f6c
1 parent e2f1302
commit 6307f6c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 25 deletions.
diff --git a/bindings/matrix-sdk-crypto-ffi/src/error.rs b/bindings/matrix-sdk-crypto-ffi/src/error.rs
@@ -42,7 +42,8 @@ pub enum SignatureError {
     UnknownUserIdentity(String),
 }
 
-#[derive(Debug, thiserror::Error)]
+#[derive(Debug, thiserror::Error, uniffi::Error)]
+#[uniffi(flat_error)]
 pub enum CryptoStoreError {
     #[error("Failed to open the store")]
     OpenStore(#[from] OpenStoreError),

diff --git a/bindings/matrix-sdk-crypto-ffi/src/olm.udl b/bindings/matrix-sdk-crypto-ffi/src/olm.udl
@@ -8,16 +8,6 @@ callback interface ProgressListener {
     void on_progress(i32 progress, i32 total);
 };
 
-[Error]
-enum CryptoStoreError {
-    "OpenStore",
-    "CryptoStore",
-    "OlmError",
-    "Serialization",
-    "InvalidUserId",
-    "Identifier",
-};
-
 dictionary CancelInfo {
     string cancel_code;
     string reason;

diff --git a/bindings/matrix-sdk-ffi/src/api.udl b/bindings/matrix-sdk-ffi/src/api.udl
@@ -1,10 +1,5 @@
 namespace matrix_sdk_ffi {};
 
-[Error]
-interface ClientError {
-    Generic(string msg);
-};
-
 callback interface ClientDelegate {
     void did_receive_auth_error(boolean is_soft_logout);
 };
@@ -148,11 +143,3 @@ callback interface SessionVerificationControllerDelegate {
     void did_cancel();
     void did_finish();
 };
-
-enum LogLevel {
-    "Error",
-    "Warn",
-    "Info",
-    "Debug",
-    "Trace",
-};
diff --git a/bindings/matrix-sdk-ffi/src/error.rs b/bindings/matrix-sdk-ffi/src/error.rs
@@ -1,6 +1,6 @@
 use matrix_sdk::{self, encryption::CryptoStoreError, HttpError, IdParseError, StoreError};
 
-#[derive(thiserror::Error, Debug)]
+#[derive(Debug, thiserror::Error, uniffi::Error)]
 pub enum ClientError {
     #[error("client error: {msg}")]
     Generic { msg: String },

diff --git a/bindings/matrix-sdk-ffi/src/tracing.rs b/bindings/matrix-sdk-ffi/src/tracing.rs
@@ -170,6 +170,7 @@ impl Span {
     }
 }
 
+#[derive(uniffi::Enum)]
 pub enum LogLevel {
     Error,
     Warn,
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,6 +170,7 @@ impl Span { @@
         }
     }
+    #[derive(uniffi::Enum)]
     pub enum LogLevel {
         Error,
         Warn,
@@ Expand Down @@