From da2cfdc31d2422818f502c2a2c4b40831c94b343 Mon Sep 17 00:00:00 2001 From: Elad Kaplan Date: Fri, 10 Jan 2025 16:51:03 +0200 Subject: [PATCH] Address clippy warnings for Rust stable 1.84 --- src/db.rs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/db.rs b/src/db.rs index 408487a13..270aa5972 100644 --- a/src/db.rs +++ b/src/db.rs @@ -312,9 +312,7 @@ async fn has_id_column( let result = db .query_one(Statement::from_string(DatabaseBackend::Postgres, query)) .await?; - result.map_or(false, |row| { - row.try_get::("", "exists").unwrap_or(false) - }) + result.is_some_and(|row| row.try_get::("", "exists").unwrap_or(false)) } DatabaseBackend::Sqlite => { let query = format!( @@ -325,9 +323,7 @@ async fn has_id_column( let result = db .query_one(Statement::from_string(DatabaseBackend::Sqlite, query)) .await?; - result.map_or(false, |row| { - row.try_get::("", "count").unwrap_or(0) > 0 - }) + result.is_some_and(|row| row.try_get::("", "count").unwrap_or(0) > 0) } DatabaseBackend::MySql => { return Err(Error::Message( @@ -358,9 +354,7 @@ async fn is_auto_increment( let result = db .query_one(Statement::from_string(DatabaseBackend::Postgres, query)) .await?; - result.map_or(false, |row| { - row.try_get::("", "is_serial").unwrap_or(false) - }) + result.is_some_and(|row| row.try_get::("", "is_serial").unwrap_or(false)) } DatabaseBackend::Sqlite => { let query = @@ -368,9 +362,9 @@ async fn is_auto_increment( let result = db .query_one(Statement::from_string(DatabaseBackend::Sqlite, query)) .await?; - result.map_or(false, |row| { + result.is_some_and(|row| { row.try_get::("", "sql") - .map_or(false, |sql| sql.to_lowercase().contains("autoincrement")) + .is_ok_and(|sql| sql.to_lowercase().contains("autoincrement")) }) } DatabaseBackend::MySql => {