diff --git a/src/database/db_connection.rs b/src/database/db_connection.rs index d5612014..fff654a3 100644 --- a/src/database/db_connection.rs +++ b/src/database/db_connection.rs @@ -193,7 +193,7 @@ impl<'a> ConnectionTrait<'a> for DatabaseConnection { DatabaseConnection::MockDatabaseConnection(conn) => { let transaction = DatabaseTransaction::new_mock(Arc::clone(conn)) .await - .map_err(|e| TransactionError::Connection(e))?; + .map_err(TransactionError::Connection)?; transaction.run(_callback).await } DatabaseConnection::Disconnected => panic!("Disconnected"), @@ -202,10 +202,7 @@ impl<'a> ConnectionTrait<'a> for DatabaseConnection { #[cfg(feature = "mock")] fn is_mock_connection(&self) -> bool { - match self { - DatabaseConnection::MockDatabaseConnection(_) => true, - _ => false, - } + matches!(self, DatabaseConnection::MockDatabaseConnection(_)) } } diff --git a/src/database/transaction.rs b/src/database/transaction.rs index 3757052e..7230488b 100644 --- a/src/database/transaction.rs +++ b/src/database/transaction.rs @@ -110,15 +110,15 @@ impl DatabaseTransaction { { let res = callback(&self) .await - .map_err(|e| TransactionError::Transaction(e)); + .map_err(TransactionError::Transaction); if res.is_ok() { self.commit() .await - .map_err(|e| TransactionError::Connection(e))?; + .map_err(TransactionError::Connection)?; } else { self.rollback() .await - .map_err(|e| TransactionError::Connection(e))?; + .map_err(TransactionError::Connection)?; } res } @@ -341,7 +341,7 @@ impl<'a> ConnectionTrait<'a> for DatabaseTransaction { let transaction = self .begin() .await - .map_err(|e| TransactionError::Connection(e))?; + .map_err(TransactionError::Connection)?; transaction.run(_callback).await } } diff --git a/src/driver/mock.rs b/src/driver/mock.rs index b932eafd..ad6b2298 100644 --- a/src/driver/mock.rs +++ b/src/driver/mock.rs @@ -114,7 +114,7 @@ impl MockDatabaseConnection { statement: &Statement, ) -> Pin>>> { match self.query_all(statement.clone()) { - Ok(v) => Box::pin(futures::stream::iter(v.into_iter().map(|r| Ok(r)))), + Ok(v) => Box::pin(futures::stream::iter(v.into_iter().map(Ok))), Err(e) => Box::pin(futures::stream::iter(Some(Err(e)).into_iter())), } }