From d531a7cc01b008ae2e5edb46bee0f4c4bccd37c4 Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Tue, 2 Jul 2024 11:53:38 +0200 Subject: [PATCH] ffi(client builder): inline enable_cross_process_refresh_lock_inner into its one caller No functional changes. --- bindings/matrix-sdk-ffi/src/client_builder.rs | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/bindings/matrix-sdk-ffi/src/client_builder.rs b/bindings/matrix-sdk-ffi/src/client_builder.rs index 1643a6088..b58d46275 100644 --- a/bindings/matrix-sdk-ffi/src/client_builder.rs +++ b/bindings/matrix-sdk-ffi/src/client_builder.rs @@ -10,8 +10,8 @@ use matrix_sdk::{ api::{error::UnknownVersionError, MatrixVersion}, ServerName, UserId, }, - Client as MatrixClient, ClientBuildError as MatrixClientBuildError, - HttpError, IdParseError, RumaApiError, + Client as MatrixClient, ClientBuildError as MatrixClientBuildError, HttpError, IdParseError, + RumaApiError, }; use ruma::api::error::{DeserializationError, FromHttpResponseError}; use tracing::{debug, error}; @@ -297,7 +297,10 @@ impl ClientBuilder { process_id: String, session_delegate: Box, ) -> Arc { - self.enable_cross_process_refresh_lock_inner(process_id, session_delegate.into()) + let mut builder = unwrap_or_clone_arc(self); + builder.cross_process_refresh_lock_id = Some(process_id); + builder.session_delegate = Some(session_delegate.into()); + Arc::new(builder) } pub fn set_session_delegate( @@ -493,17 +496,6 @@ impl ClientBuilder { } impl ClientBuilder { - pub(crate) fn enable_cross_process_refresh_lock_inner( - self: Arc, - process_id: String, - session_delegate: Arc, - ) -> Arc { - let mut builder = unwrap_or_clone_arc(self); - builder.cross_process_refresh_lock_id = Some(process_id); - builder.session_delegate = Some(session_delegate); - Arc::new(builder) - } - pub(crate) async fn build_inner(self: Arc) -> Result { let builder = unwrap_or_clone_arc(self); let mut inner_builder = MatrixClient::builder();