From 0fbc7197acb270450307faf51d51a328ee0ecb8c Mon Sep 17 00:00:00 2001 From: lovasoa Date: Fri, 10 Jan 2025 23:12:59 +0100 Subject: [PATCH] clippy --- src/webserver/database/execute_queries.rs | 10 ++++---- src/webserver/database/sql.rs | 2 +- .../function_definition_macro.rs | 4 ++-- .../database/sqlpage_functions/functions.rs | 5 +--- src/webserver/database/syntax_tree.rs | 24 +++++++++---------- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/webserver/database/execute_queries.rs b/src/webserver/database/execute_queries.rs index 114e3b42..a4ed4783 100644 --- a/src/webserver/database/execute_queries.rs +++ b/src/webserver/database/execute_queries.rs @@ -235,10 +235,10 @@ fn vars_and_name<'a, 'b>( } } -async fn take_connection<'a, 'b>( +async fn take_connection<'a>( db: &'a Database, - conn: &'b mut DbConn, -) -> anyhow::Result<&'b mut PoolConnection> { + conn: &'a mut DbConn, +) -> anyhow::Result<&'a mut PoolConnection> { if let Some(c) = conn { return Ok(c); } @@ -307,10 +307,10 @@ fn clone_anyhow_err(source_file: &Path, err: &anyhow::Error) -> anyhow::Error { e } -async fn bind_parameters<'a, 'b>( +async fn bind_parameters<'a>( stmt: &'a StmtWithParams, request: &'a RequestInfo, - db_connection: &'b mut DbConn, + db_connection: &mut DbConn, ) -> anyhow::Result> { let sql = stmt.query.as_str(); log::debug!("Preparing statement: {}", sql); diff --git a/src/webserver/database/sql.rs b/src/webserver/database/sql.rs index 71b97f8c..df422fc1 100644 --- a/src/webserver/database/sql.rs +++ b/src/webserver/database/sql.rs @@ -332,7 +332,7 @@ fn extract_toplevel_functions(stmt: &mut Statement) -> Vec .enumerate() .flat_map(|(position, item)| { let mut items = Vec::with_capacity(1); - while it.peek().map_or(false, |x| x.position == position) { + while it.peek().is_some_and(|x| x.position == position) { items.push(it.next().unwrap().expr_to_insert); } if items.is_empty() { diff --git a/src/webserver/database/sqlpage_functions/function_definition_macro.rs b/src/webserver/database/sqlpage_functions/function_definition_macro.rs index 3ff3f3db..f9b229ad 100644 --- a/src/webserver/database/sqlpage_functions/function_definition_macro.rs +++ b/src/webserver/database/sqlpage_functions/function_definition_macro.rs @@ -52,11 +52,11 @@ macro_rules! sqlpage_functions { } } impl SqlPageFunctionName { - pub(crate) async fn evaluate<'a, 'b>( + pub(crate) async fn evaluate<'a>( &self, #[allow(unused_variables)] request: &'a RequestInfo, - db_connection: &'b mut Option>, + db_connection: &mut Option>, params: Vec>> ) -> anyhow::Result>> { use $crate::webserver::database::sqlpage_functions::function_traits::*; diff --git a/src/webserver/database/sqlpage_functions/functions.rs b/src/webserver/database/sqlpage_functions/functions.rs index 2f5c429f..f9996b58 100644 --- a/src/webserver/database/sqlpage_functions/functions.rs +++ b/src/webserver/database/sqlpage_functions/functions.rs @@ -367,10 +367,7 @@ async fn test_random_string() { assert_eq!(s.len(), 10); } -async fn read_file_bytes<'a>( - request: &'a RequestInfo, - path_str: &str, -) -> Result, anyhow::Error> { +async fn read_file_bytes(request: &RequestInfo, path_str: &str) -> Result, anyhow::Error> { let path = std::path::Path::new(path_str); // If the path is relative, it's relative to the web root, not the current working directory, // and it can be fetched from the on-database filesystem table diff --git a/src/webserver/database/syntax_tree.rs b/src/webserver/database/syntax_tree.rs index 80f11c2e..d1d7f121 100644 --- a/src/webserver/database/syntax_tree.rs +++ b/src/webserver/database/syntax_tree.rs @@ -110,10 +110,10 @@ impl SqlPageFunctionCall { }) } - pub async fn evaluate<'a, 'b>( + pub async fn evaluate<'a>( &self, request: &'a RequestInfo, - db_connection: &'b mut DbConn, + db_connection: &mut DbConn, ) -> anyhow::Result>> { let mut params = Vec::with_capacity(self.arguments.len()); for param in &self.arguments { @@ -149,10 +149,10 @@ impl std::fmt::Display for SqlPageFunctionCall { /// Extracts the value of a parameter from the request. /// Returns `Ok(None)` when NULL should be used as the parameter value. -pub(super) async fn extract_req_param<'a, 'b>( +pub(super) async fn extract_req_param<'a>( param: &StmtParam, request: &'a RequestInfo, - db_connection: &'b mut DbConn, + db_connection: &mut DbConn, ) -> anyhow::Result>> { Ok(match param { // sync functions @@ -181,10 +181,10 @@ pub(super) async fn extract_req_param<'a, 'b>( }) } -async fn concat_params<'a, 'b>( +async fn concat_params<'a>( args: &[StmtParam], request: &'a RequestInfo, - db_connection: &'b mut DbConn, + db_connection: &mut DbConn, ) -> anyhow::Result>> { let mut result = String::new(); for arg in args { @@ -196,10 +196,10 @@ async fn concat_params<'a, 'b>( Ok(Some(Cow::Owned(result))) } -async fn coalesce_params<'a, 'b>( +async fn coalesce_params<'a>( args: &[StmtParam], request: &'a RequestInfo, - db_connection: &'b mut DbConn, + db_connection: &mut DbConn, ) -> anyhow::Result>> { for arg in args { if let Some(arg) = Box::pin(extract_req_param(arg, request, db_connection)).await? { @@ -209,10 +209,10 @@ async fn coalesce_params<'a, 'b>( Ok(None) } -async fn json_object_params<'a, 'b>( +async fn json_object_params<'a>( args: &[StmtParam], request: &'a RequestInfo, - db_connection: &'b mut DbConn, + db_connection: &mut DbConn, ) -> anyhow::Result>> { use serde::{ser::SerializeMap, Serializer}; let mut result = Vec::new(); @@ -247,10 +247,10 @@ async fn json_object_params<'a, 'b>( Ok(Some(Cow::Owned(String::from_utf8(result)?))) } -async fn json_array_params<'a, 'b>( +async fn json_array_params<'a>( args: &[StmtParam], request: &'a RequestInfo, - db_connection: &'b mut DbConn, + db_connection: &mut DbConn, ) -> anyhow::Result>> { use serde::{ser::SerializeSeq, Serializer}; let mut result = Vec::new();