Merge pull request #2665 from input-output-hk/jpraynaud/fix-rust-1.89

fix: Rust `1.89` clippy warnings

Author: jpraynaud

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "mithril-dmq"
 description = "Mechanisms to publish and consume messages of a 'Decentralized Message Queue network' through a DMQ node"
-version = "0.1.6"
+version = "0.1.7"
 authors.workspace = true
 documentation.workspace = true
 edition.workspace = true

internal/mithril-dmq/Cargo.toml

@@ -51,7 +51,7 @@ impl<M: TryFromBytes + Debug> DmqConsumerPallas<M> {
     }
 
     /// Gets the cached `DmqClient`, creating a new one if it does not exist.
-    async fn get_client(&self) -> StdResult<MutexGuard<Option<DmqClient>>> {
+    async fn get_client(&self) -> StdResult<MutexGuard<'_, Option<DmqClient>>> {
         {
             // Run this in a separate block to avoid dead lock on the Mutex
             let client_lock = self.client.lock().await;

internal/mithril-dmq/src/consumer/pallas.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-persistence"
-version = "0.2.57"
+version = "0.2.58"
 description = "Common types, interfaces, and utilities to persist data for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }

internal/mithril-persistence/Cargo.toml

@@ -317,7 +317,7 @@ mod tests {
             .read::<i64, _>(0)
     }
 
-    fn create_db_checker(connection: &ConnectionThreadSafe) -> DatabaseVersionChecker {
+    fn create_db_checker(connection: &ConnectionThreadSafe) -> DatabaseVersionChecker<'_> {
         DatabaseVersionChecker::new(
             discard_logger(),
             ApplicationNodeType::Aggregator,

internal/mithril-persistence/src/database/version_checker.rs

@@ -8,7 +8,7 @@ use crate::sqlite::{EntityCursor, Query, SqliteConnection, Transaction};
 /// Extension trait for the [SqliteConnection] type.
 pub trait ConnectionExtensions {
     /// Begin a transaction on the connection.
-    fn begin_transaction(&self) -> StdResult<Transaction>;
+    fn begin_transaction(&self) -> StdResult<Transaction<'_>>;
 
     /// Execute the given sql query and return the value of the first cell read.
     fn query_single_cell<Q: AsRef<str>, T: ReadableWithIndex>(
@@ -18,7 +18,7 @@ pub trait ConnectionExtensions {
     ) -> StdResult<T>;
 
     /// Fetch entities from the database using the given query.
-    fn fetch<Q: Query>(&self, query: Q) -> StdResult<EntityCursor<Q::Entity>>;
+    fn fetch<Q: Query>(&self, query: Q) -> StdResult<EntityCursor<'_, Q::Entity>>;
 
     /// Fetch the first entity from the database returned using the given query.
     fn fetch_first<Q: Query>(&self, query: Q) -> StdResult<Option<Q::Entity>> {
@@ -39,7 +39,7 @@ pub trait ConnectionExtensions {
 }
 
 impl ConnectionExtensions for SqliteConnection {
-    fn begin_transaction(&self) -> StdResult<Transaction> {
+    fn begin_transaction(&self) -> StdResult<Transaction<'_>> {
         Ok(Transaction::begin(self)?)
     }
 
@@ -54,7 +54,7 @@ impl ConnectionExtensions for SqliteConnection {
         statement.read::<T, _>(0).with_context(|| "Read query error")
     }
 
-    fn fetch<Q: Query>(&self, query: Q) -> StdResult<EntityCursor<Q::Entity>> {
+    fn fetch<Q: Query>(&self, query: Q) -> StdResult<EntityCursor<'_, Q::Entity>> {
         let (condition, params) = query.filters().expand();
         let sql = query.get_definition(&condition);
         let cursor = prepare_statement(self, &sql)?.into_iter().bind(&params[..])?;

internal/mithril-persistence/src/sqlite/connection_extensions.rs

@@ -47,7 +47,7 @@ impl SqliteConnectionPool {
     }
 
     /// Get a connection from the pool
-    pub fn connection(&self) -> StdResult<ResourcePoolItem<SqlitePooledConnection>> {
+    pub fn connection(&self) -> StdResult<ResourcePoolItem<'_, SqlitePooledConnection>> {
         let timeout = Duration::from_millis(1000);
         let connection = self.connection_pool.acquire_resource(timeout)?;
 

internal/mithril-persistence/src/sqlite/connection_pool.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.7.78"
+version = "0.7.79"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -53,10 +53,10 @@ impl DependenciesBuilder {
             let _ = connection.execute("pragma analysis_limit=400; pragma optimize;");
         }
 
-        if let Some(pool) = &self.sqlite_connection_cardano_transaction_pool {
-            if let Ok(connection) = pool.connection() {
-                let _ = connection.execute("pragma analysis_limit=400; pragma optimize;");
-            }
+        if let Some(pool) = &self.sqlite_connection_cardano_transaction_pool
+            && let Ok(connection) = pool.connection()
+        {
+            let _ = connection.execute("pragma analysis_limit=400; pragma optimize;");
         }
     }
 

mithril-aggregator/src/dependency_injection/builder/support/sqlite.rs

@@ -46,15 +46,14 @@ impl CloudUploader {
 impl FileUploader for CloudUploader {
     async fn upload_without_retry(&self, file_path: &Path) -> StdResult<FileUri> {
         let remote_file_path = self.remote_folder.join(get_file_name(file_path)?);
-        if !self.allow_overwrite {
-            if let Some(file_uri) = self
+        if !self.allow_overwrite
+            && let Some(file_uri) = self
                 .cloud_backend_uploader
                 .file_exists(&remote_file_path)
                 .await
                 .with_context(|| "checking if file exists in cloud")?
-            {
-                return Ok(file_uri);
-            }
+        {
+            return Ok(file_uri);
         }
 
         let file_uri = self