Skip to content

Commit

Permalink
lint fix rust 1.8.4 (#1482)
Browse files Browse the repository at this point in the history
Co-authored-by: cameronvoell <[email protected]>
  • Loading branch information
cameronvoell and cameronvoell authored Jan 9, 2025
1 parent 02bbd89 commit 75db074
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions xmtp_mls/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<InboxIdRef<'a>>,
inbox_ids: Vec<InboxIdRef<'_>>,
) -> Result<Vec<AssociationState>, ClientError> {
let conn = self.store().conn()?;
if refresh_from_network {
Expand Down
32 changes: 16 additions & 16 deletions xmtp_mls/src/groups/scoped_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ pub trait LocalScopedGroupClient: Send + Sync + Sized {
installation_ids: Vec<Vec<u8>>,
) -> Result<Vec<VerifiedKeyPackageV2>, 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<i64>,
) -> Result<AssociationState, ClientError>;

async fn batch_get_association_state<'a>(
async fn batch_get_association_state(
&self,
conn: &DbConnection,
identifiers: &[(InboxIdRef<'a>, Option<i64>)],
identifiers: &[(InboxIdRef<'_>, Option<i64>)],
) -> Result<Vec<AssociationState>, ClientError>;

async fn query_group_messages(
Expand Down Expand Up @@ -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<i64>,
) -> Result<AssociationState, ClientError> {
crate::Client::<ApiClient, Verifier>::get_association_state(
Expand All @@ -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<i64>)],
identifiers: &[(InboxIdRef<'_>, Option<i64>)],
) -> Result<Vec<AssociationState>, ClientError> {
crate::Client::<ApiClient, Verifier>::batch_get_association_state(self, conn, identifiers)
.await
Expand Down Expand Up @@ -294,21 +294,21 @@ 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<i64>,
) -> Result<AssociationState, ClientError> {
(**self)
.get_association_state(conn, inbox_id, to_sequence_id)
.await
}

async fn batch_get_association_state<'a>(
async fn batch_get_association_state(
&self,
conn: &DbConnection,
identifiers: &[(InboxIdRef<'a>, Option<i64>)],
identifiers: &[(InboxIdRef<'_>, Option<i64>)],
) -> Result<Vec<AssociationState>, ClientError> {
(**self)
.batch_get_association_state(conn, identifiers)
Expand Down Expand Up @@ -384,21 +384,21 @@ 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<i64>,
) -> Result<AssociationState, ClientError> {
(**self)
.get_association_state(conn, inbox_id, to_sequence_id)
.await
}

async fn batch_get_association_state<'a>(
async fn batch_get_association_state(
&self,
conn: &DbConnection,
identifiers: &[(InboxIdRef<'a>, Option<i64>)],
identifiers: &[(InboxIdRef<'_>, Option<i64>)],
) -> Result<Vec<AssociationState>, ClientError> {
(**self)
.batch_get_association_state(conn, identifiers)
Expand Down
2 changes: 1 addition & 1 deletion xmtp_mls/src/groups/validated_commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 75db074

Please sign in to comment.