From 81dc66fa7bea70b22d299a6d54497c274f9bd1f1 Mon Sep 17 00:00:00 2001 From: Bartosz Sypytkowski Date: Wed, 23 Oct 2024 11:54:30 +0200 Subject: [PATCH] chore: fix clippy warnings --- services/appflowy-collaborate/src/group/cmd.rs | 2 +- .../src/group/group_init.rs | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/services/appflowy-collaborate/src/group/cmd.rs b/services/appflowy-collaborate/src/group/cmd.rs index c87abc34..62b49b6e 100644 --- a/services/appflowy-collaborate/src/group/cmd.rs +++ b/services/appflowy-collaborate/src/group/cmd.rs @@ -323,7 +323,7 @@ struct NullSender { impl Default for NullSender { fn default() -> Self { NullSender { - _marker: PhantomData::default(), + _marker: PhantomData, } } } diff --git a/services/appflowy-collaborate/src/group/group_init.rs b/services/appflowy-collaborate/src/group/group_init.rs index d523a829..aedcd6d1 100644 --- a/services/appflowy-collaborate/src/group/group_init.rs +++ b/services/appflowy-collaborate/src/group/group_init.rs @@ -341,7 +341,7 @@ impl CollabGroup { } pub async fn remove_user(&self, user: &RealtimeUser) { - if let Some(_) = self.state.subscribers.remove(user) { + if self.state.subscribers.remove(user).is_some() { trace!( "{} remove subscriber from group: {}", self.state.object_id, @@ -381,7 +381,12 @@ impl CollabGroup { )); let sub = Subscription::new(sink, subscriber_origin, subscriber_shutdown); - if let Some(_) = self.state.subscribers.insert((*user).clone(), sub) { + if self + .state + .subscribers + .insert((*user).clone(), sub) + .is_some() + { tracing::warn!("{}: remove old subscriber: {}", &self.state.object_id, user); } @@ -507,7 +512,7 @@ impl CollabGroup { state.metrics.acquire_collab_lock_count.inc(); // Spawn a blocking task to handle the message - let result = Self::handle_message(state, &payload, &message_origin, msg_id).await; + let result = Self::handle_message(state, payload, &message_origin, msg_id).await; match result { Ok(inner_result) => match inner_result { @@ -530,11 +535,9 @@ impl CollabGroup { let mut decoder = DecoderV1::from(payload); let reader = MessageReader::new(&mut decoder); let mut ack_response = None; - let mut is_sync_step2 = false; for msg in reader { match msg { Ok(msg) => { - is_sync_step2 = matches!(msg, Message::Sync(SyncMessage::SyncStep2(_))); match Self::handle_protocol_message(state, message_origin, msg).await { Ok(payload) => { state.metrics.apply_update_count.inc(); @@ -615,7 +618,7 @@ impl CollabGroup { if let Ok(sv) = state.state_vector.try_read() { // we optimistically try to obtain state vector lock for a fast track: // if we remote sv is up-to-date with current one, we don't need to do anything - match sv.partial_cmp(&remote_sv) { + match sv.partial_cmp(remote_sv) { Some(std::cmp::Ordering::Equal) => return Ok(None), // client and server are in sync Some(std::cmp::Ordering::Less) => { // server is behind client @@ -1067,7 +1070,7 @@ impl CollabPersister { async fn embeddings(&self, collab: &Collab) -> Result, AppError> { if let Some(indexer) = self.indexer.clone() { - let params = indexer.embedding_params(&collab)?; + let params = indexer.embedding_params(collab)?; let embeddings = indexer.embeddings(params).await?; Ok(embeddings) } else {