From e1ed5c2e82e1a33e01d4e0d87de5e4e762a090cc Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Thu, 17 Oct 2024 11:47:12 +0200 Subject: [PATCH] fixup! fix(ffi): don't panic when running into an unknown membership state --- bindings/matrix-sdk-ffi/src/error.rs | 5 +++++ bindings/matrix-sdk-ffi/src/room_member.rs | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bindings/matrix-sdk-ffi/src/error.rs b/bindings/matrix-sdk-ffi/src/error.rs index ba0198b4f0c..cdfc07a690a 100644 --- a/bindings/matrix-sdk-ffi/src/error.rs +++ b/bindings/matrix-sdk-ffi/src/error.rs @@ -217,3 +217,8 @@ impl From for NotificationSettingsError { Self::Generic { msg: e.to_string() } } } + +/// Something has not been implemented yet. +#[derive(thiserror::Error, Debug)] +#[error("not implemented yet")] +pub struct NotYetImplemented; diff --git a/bindings/matrix-sdk-ffi/src/room_member.rs b/bindings/matrix-sdk-ffi/src/room_member.rs index f38fcd88a89..8f784821d6c 100644 --- a/bindings/matrix-sdk-ffi/src/room_member.rs +++ b/bindings/matrix-sdk-ffi/src/room_member.rs @@ -1,7 +1,7 @@ use matrix_sdk::room::{RoomMember as SdkRoomMember, RoomMemberRole}; use ruma::UserId; -use crate::error::ClientError; +use crate::error::{ClientError, NotYetImplemented}; #[derive(Clone, uniffi::Enum)] pub enum MembershipState { @@ -24,11 +24,6 @@ pub enum MembershipState { Custom(String), } -/// Something has not been implemented yet. -#[derive(thiserror::Error, Debug)] -#[error("not implemented yet")] -pub struct NotYetImplemented; - impl TryFrom for MembershipState { type Error = NotYetImplemented;