From 045d94ab4bc2cd642f873b08c781716b4b7ff49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Fri, 1 Dec 2023 11:49:35 +0100 Subject: [PATCH] Rename `message` inside an error, since it clashes with Kotlin's default `message` property in exceptions --- bindings/matrix-sdk-ffi/src/encryption.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bindings/matrix-sdk-ffi/src/encryption.rs b/bindings/matrix-sdk-ffi/src/encryption.rs index 7b5309be1..2fd59c53f 100644 --- a/bindings/matrix-sdk-ffi/src/encryption.rs +++ b/bindings/matrix-sdk-ffi/src/encryption.rs @@ -67,8 +67,8 @@ pub enum RecoveryError { Client { source: crate::ClientError }, /// Error in the secret storage subsystem. - #[error("Error in the secret-storage subsystem: {message}")] - SecretStorage { message: String }, + #[error("Error in the secret-storage subsystem: {error_message}")] + SecretStorage { error_message: String }, } impl From for RecoveryError { @@ -77,7 +77,7 @@ impl From for RecoveryError { recovery::RecoveryError::BackupExistsOnServer => Self::BackupExistsOnServer, recovery::RecoveryError::Sdk(e) => Self::Client { source: ClientError::from(e) }, recovery::RecoveryError::SecretStorage(e) => { - Self::SecretStorage { message: e.to_string() } + Self::SecretStorage { error_message: e.to_string() } } } }