clippy

Author: lovasoa

src/webserver/database/csv_import.rs

@@ -38,16 +38,16 @@ enum CopyCsvOption<'a> {
 impl<'a> CopyCsvOption<'a> {
     fn delimiter(&self) -> Option<char> {
         match self {
-            CopyCsvOption::Legacy(CopyLegacyOption::Delimiter(c)) => Some(*c),
-            CopyCsvOption::New(CopyOption::Delimiter(c)) => Some(*c),
+            CopyCsvOption::Legacy(CopyLegacyOption::Delimiter(c))
+            | CopyCsvOption::New(CopyOption::Delimiter(c)) => Some(*c),
             _ => None,
         }
     }
 
     fn quote(&self) -> Option<char> {
         match self {
-            CopyCsvOption::CopyLegacyCsvOption(CopyLegacyCsvOption::Quote(c)) => Some(*c),
-            CopyCsvOption::New(CopyOption::Quote(c)) => Some(*c),
+            CopyCsvOption::CopyLegacyCsvOption(CopyLegacyCsvOption::Quote(c))
+            | CopyCsvOption::New(CopyOption::Quote(c)) => Some(*c),
             _ => None,
         }
     }
@@ -69,14 +69,14 @@ impl<'a> CopyCsvOption<'a> {
 
     fn escape(&self) -> Option<char> {
         match self {
-            CopyCsvOption::New(CopyOption::Escape(c)) => Some(*c),
-            CopyCsvOption::CopyLegacyCsvOption(CopyLegacyCsvOption::Escape(c)) => Some(*c),
+            CopyCsvOption::New(CopyOption::Escape(c))
+            | CopyCsvOption::CopyLegacyCsvOption(CopyLegacyCsvOption::Escape(c)) => Some(*c),
             _ => None,
         }
     }
 }
 
-pub fn extract_csv_import(stmt: &mut Statement) -> Option<CsvImport> {
+pub fn extract_csv_copy_statement(stmt: &mut Statement) -> Option<CsvImport> {
     if let Statement::Copy {
         source: CopySource::Table {
             table_name,

src/webserver/database/sql.rs

@@ -1,4 +1,4 @@
-use super::csv_import::{extract_csv_import, CsvImport};
+use super::csv_import::{extract_csv_copy_statement, CsvImport};
 use super::sql_pseudofunctions::{func_call_to_param, StmtParam};
 use crate::file_cache::AsyncFromStrWithState;
 use crate::utils::add_value_to_map;
@@ -103,7 +103,7 @@ fn parse_single_statement(parser: &mut Parser<'_>, db_kind: AnyKind) -> Option<P
             value: StmtWithParams { query, params },
         });
     }
-    if let Some(csv_import) = extract_csv_import(&mut stmt) {
+    if let Some(csv_import) = extract_csv_copy_statement(&mut stmt) {
         return Some(ParsedStatement::CsvImport(csv_import));
     }
     Some(ParsedStatement::StmtWithParams(StmtWithParams {