From 1672862fa16c14905d3535e78751f254e503d96d Mon Sep 17 00:00:00 2001 From: Dakota Brink Date: Fri, 17 Jan 2025 16:26:46 -0500 Subject: [PATCH] lint --- bindings_ffi/src/mls.rs | 2 +- .../groups/device_sync/backup/backup_exporter/file_export.rs | 2 +- xmtp_mls/src/groups/device_sync/backup/backup_importer.rs | 4 ++-- .../src/groups/device_sync/backup/export_stream/group_save.rs | 4 ++-- .../groups/device_sync/backup/export_stream/message_save.rs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bindings_ffi/src/mls.rs b/bindings_ffi/src/mls.rs index fb096a12e..df96e7383 100644 --- a/bindings_ffi/src/mls.rs +++ b/bindings_ffi/src/mls.rs @@ -625,7 +625,7 @@ impl From for FfiBackupMetadata { fn from(value: BackupMetadata) -> Self { Self { backup_version: value.backup_version, - elements: value.elements().into_iter().map(Into::into).collect(), + elements: value.elements().map(Into::into).collect(), start_ns: value.start_ns, end_ns: value.end_ns, exported_at_ns: value.exported_at_ns, diff --git a/xmtp_mls/src/groups/device_sync/backup/backup_exporter/file_export.rs b/xmtp_mls/src/groups/device_sync/backup/backup_exporter/file_export.rs index 49bfe43e1..d7db0cd9b 100644 --- a/xmtp_mls/src/groups/device_sync/backup/backup_exporter/file_export.rs +++ b/xmtp_mls/src/groups/device_sync/backup/backup_exporter/file_export.rs @@ -14,7 +14,7 @@ impl BackupExporter { let mut amount = self.read(&mut buffer).await?; while amount != 0 { - file.write(&buffer[..amount]).await?; + let _ = file.write(&buffer[..amount]).await?; amount = self.read(&mut buffer).await?; } diff --git a/xmtp_mls/src/groups/device_sync/backup/backup_importer.rs b/xmtp_mls/src/groups/device_sync/backup/backup_importer.rs index bbd0b8e5d..261568be1 100644 --- a/xmtp_mls/src/groups/device_sync/backup/backup_importer.rs +++ b/xmtp_mls/src/groups/device_sync/backup/backup_importer.rs @@ -79,7 +79,7 @@ impl BackupImporter { )); } - if amount == 0 && self.decoded.len() == 0 { + if amount == 0 && self.decoded.is_empty() { break; } } @@ -101,7 +101,7 @@ impl BackupImporter { Ok(()) }) .await - .map_err(|e| DeviceSyncError::Storage(e))?; + .map_err(DeviceSyncError::Storage)?; Ok(()) } diff --git a/xmtp_mls/src/groups/device_sync/backup/export_stream/group_save.rs b/xmtp_mls/src/groups/device_sync/backup/export_stream/group_save.rs index 7b32d4b26..de1764259 100644 --- a/xmtp_mls/src/groups/device_sync/backup/export_stream/group_save.rs +++ b/xmtp_mls/src/groups/device_sync/backup/export_stream/group_save.rs @@ -18,10 +18,10 @@ impl BackupRecordProvider for GroupSave { let mut query = groups::table.order_by(groups::id).into_boxed(); if let Some(start_ns) = streamer.start_ns { - query = query.filter(groups::created_at_ns.gt(start_ns as i64)); + query = query.filter(groups::created_at_ns.gt(start_ns)); } if let Some(end_ns) = streamer.end_ns { - query = query.filter(groups::created_at_ns.le(end_ns as i64)); + query = query.filter(groups::created_at_ns.le(end_ns)); } query = query.limit(Self::BATCH_SIZE).offset(streamer.offset); diff --git a/xmtp_mls/src/groups/device_sync/backup/export_stream/message_save.rs b/xmtp_mls/src/groups/device_sync/backup/export_stream/message_save.rs index 814fde976..68d245ec4 100644 --- a/xmtp_mls/src/groups/device_sync/backup/export_stream/message_save.rs +++ b/xmtp_mls/src/groups/device_sync/backup/export_stream/message_save.rs @@ -20,10 +20,10 @@ impl BackupRecordProvider for GroupMessageSave { .into_boxed(); if let Some(start_ns) = streamer.start_ns { - query = query.filter(group_messages::sent_at_ns.gt(start_ns as i64)); + query = query.filter(group_messages::sent_at_ns.gt(start_ns)); } if let Some(end_ns) = streamer.end_ns { - query = query.filter(group_messages::sent_at_ns.le(end_ns as i64)); + query = query.filter(group_messages::sent_at_ns.le(end_ns)); } query = query.limit(Self::BATCH_SIZE).offset(streamer.offset);