Skip to content

Commit d531a7c

Browse files
committed
ffi(client builder): inline enable_cross_process_refresh_lock_inner into its one caller
No functional changes.
1 parent 84a57ce commit d531a7c

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

bindings/matrix-sdk-ffi/src/client_builder.rs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use matrix_sdk::{
1010
api::{error::UnknownVersionError, MatrixVersion},
1111
ServerName, UserId,
1212
},
13-
Client as MatrixClient, ClientBuildError as MatrixClientBuildError,
14-
HttpError, IdParseError, RumaApiError,
13+
Client as MatrixClient, ClientBuildError as MatrixClientBuildError, HttpError, IdParseError,
14+
RumaApiError,
1515
};
1616
use ruma::api::error::{DeserializationError, FromHttpResponseError};
1717
use tracing::{debug, error};
@@ -297,7 +297,10 @@ impl ClientBuilder {
297297
process_id: String,
298298
session_delegate: Box<dyn ClientSessionDelegate>,
299299
) -> Arc<Self> {
300-
self.enable_cross_process_refresh_lock_inner(process_id, session_delegate.into())
300+
let mut builder = unwrap_or_clone_arc(self);
301+
builder.cross_process_refresh_lock_id = Some(process_id);
302+
builder.session_delegate = Some(session_delegate.into());
303+
Arc::new(builder)
301304
}
302305

303306
pub fn set_session_delegate(
@@ -493,17 +496,6 @@ impl ClientBuilder {
493496
}
494497

495498
impl ClientBuilder {
496-
pub(crate) fn enable_cross_process_refresh_lock_inner(
497-
self: Arc<Self>,
498-
process_id: String,
499-
session_delegate: Arc<dyn ClientSessionDelegate>,
500-
) -> Arc<Self> {
501-
let mut builder = unwrap_or_clone_arc(self);
502-
builder.cross_process_refresh_lock_id = Some(process_id);
503-
builder.session_delegate = Some(session_delegate);
504-
Arc::new(builder)
505-
}
506-
507499
pub(crate) async fn build_inner(self: Arc<Self>) -> Result<Client, ClientBuildError> {
508500
let builder = unwrap_or_clone_arc(self);
509501
let mut inner_builder = MatrixClient::builder();

0 commit comments

Comments
 (0)