From 75db074b47f1fc0c7431ef16038b00f5bc8365ff Mon Sep 17 00:00:00 2001 From: Cameron Voell <1103838+cameronvoell@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:35:54 -0800 Subject: [PATCH] lint fix rust 1.8.4 (#1482) Co-authored-by: cameronvoell --- xmtp_mls/src/client.rs | 4 ++-- xmtp_mls/src/groups/scoped_client.rs | 32 ++++++++++++------------- xmtp_mls/src/groups/validated_commit.rs | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/xmtp_mls/src/client.rs b/xmtp_mls/src/client.rs index 989782cb0..fd328a837 100644 --- a/xmtp_mls/src/client.rs +++ b/xmtp_mls/src/client.rs @@ -392,10 +392,10 @@ where } /// Get the [`AssociationState`] for each `inbox_id` - pub async fn inbox_addresses<'a>( + pub async fn inbox_addresses( &self, refresh_from_network: bool, - inbox_ids: Vec>, + inbox_ids: Vec>, ) -> Result, ClientError> { let conn = self.store().conn()?; if refresh_from_network { diff --git a/xmtp_mls/src/groups/scoped_client.rs b/xmtp_mls/src/groups/scoped_client.rs index e745114a1..2dea0e6e1 100644 --- a/xmtp_mls/src/groups/scoped_client.rs +++ b/xmtp_mls/src/groups/scoped_client.rs @@ -64,17 +64,17 @@ pub trait LocalScopedGroupClient: Send + Sync + Sized { installation_ids: Vec>, ) -> Result, ClientError>; - async fn get_association_state<'a>( + async fn get_association_state( &self, conn: &DbConnection, - inbox_id: InboxIdRef<'a>, + inbox_id: InboxIdRef<'_>, to_sequence_id: Option, ) -> Result; - async fn batch_get_association_state<'a>( + async fn batch_get_association_state( &self, conn: &DbConnection, - identifiers: &[(InboxIdRef<'a>, Option)], + identifiers: &[(InboxIdRef<'_>, Option)], ) -> Result, ClientError>; async fn query_group_messages( @@ -201,10 +201,10 @@ where .await } - async fn get_association_state<'a>( + async fn get_association_state( &self, conn: &DbConnection, - inbox_id: InboxIdRef<'a>, + inbox_id: InboxIdRef<'_>, to_sequence_id: Option, ) -> Result { crate::Client::::get_association_state( @@ -216,10 +216,10 @@ where .await } - async fn batch_get_association_state<'a>( + async fn batch_get_association_state( &self, conn: &DbConnection, - identifiers: &[(InboxIdRef<'a>, Option)], + identifiers: &[(InboxIdRef<'_>, Option)], ) -> Result, ClientError> { crate::Client::::batch_get_association_state(self, conn, identifiers) .await @@ -294,10 +294,10 @@ where .await } - async fn get_association_state<'a>( + async fn get_association_state( &self, conn: &DbConnection, - inbox_id: InboxIdRef<'a>, + inbox_id: InboxIdRef<'_>, to_sequence_id: Option, ) -> Result { (**self) @@ -305,10 +305,10 @@ where .await } - async fn batch_get_association_state<'a>( + async fn batch_get_association_state( &self, conn: &DbConnection, - identifiers: &[(InboxIdRef<'a>, Option)], + identifiers: &[(InboxIdRef<'_>, Option)], ) -> Result, ClientError> { (**self) .batch_get_association_state(conn, identifiers) @@ -384,10 +384,10 @@ where .await } - async fn get_association_state<'a>( + async fn get_association_state( &self, conn: &DbConnection, - inbox_id: InboxIdRef<'a>, + inbox_id: InboxIdRef<'_>, to_sequence_id: Option, ) -> Result { (**self) @@ -395,10 +395,10 @@ where .await } - async fn batch_get_association_state<'a>( + async fn batch_get_association_state( &self, conn: &DbConnection, - identifiers: &[(InboxIdRef<'a>, Option)], + identifiers: &[(InboxIdRef<'_>, Option)], ) -> Result, ClientError> { (**self) .batch_get_association_state(conn, identifiers) diff --git a/xmtp_mls/src/groups/validated_commit.rs b/xmtp_mls/src/groups/validated_commit.rs index c9dcd8c18..9de1df223 100644 --- a/xmtp_mls/src/groups/validated_commit.rs +++ b/xmtp_mls/src/groups/validated_commit.rs @@ -456,7 +456,7 @@ struct ExpectedDiff { /// [`GroupMembership`] and the [`GroupMembership`] found in the [`StagedCommit`]. /// This requires loading the Inbox state from the network. /// Satisfies Rule 2 -async fn extract_expected_diff<'diff>( +async fn extract_expected_diff( conn: &DbConnection, client: impl ScopedGroupClient, staged_commit: &StagedCommit,