chore: clippy fix

Author: psteinroe

crates/pg_cli/src/execute/std_in.rs

@@ -14,7 +14,7 @@ pub(crate) fn run<'a>(
 ) -> Result<(), CliDiagnostic> {
     let workspace = &*session.app.workspace;
     let console = &mut *session.app.console;
-    let mut version = 0;
+    let version = 0;
 
     console.append(markup! {{content}});
     Ok(())

crates/pg_cli/src/execute/traverse.rs

@@ -1,4 +1,4 @@
-use super::process_file::{process_file, DiffKind, FileStatus, Message};
+use super::process_file::{process_file, FileStatus, Message};
 use super::{Execution, TraversalMode};
 use crate::cli_options::CliOptions;
 use crate::execute::diagnostics::PanicDiagnostic;

crates/pg_cli/src/lib.rs

@@ -4,7 +4,7 @@
 //! to parse commands and arguments, redirect the execution of the commands and
 //! execute the traversal of directory and files, based on the command that was passed.
 
-use pg_console::{markup, ColorMode, Console, ConsoleExt};
+use pg_console::{ColorMode, Console};
 use pg_fs::OsFileSystem;
 use pg_workspace_new::{App, DynRef, Workspace, WorkspaceRef};
 use std::env;
@@ -19,8 +19,7 @@ mod panic;
 mod reporter;
 mod service;
 
-use crate::cli_options::{CliOptions, ColorsArg};
-use crate::commands::CommandRunner;
+use crate::cli_options::ColorsArg;
 pub use crate::commands::{pg_lsp_command, PgLspCommand};
 pub use crate::logging::{setup_cli_subscriber, LoggingLevel};
 pub use diagnostics::CliDiagnostic;

crates/pg_commands/src/execute_statement.rs

@@ -16,11 +16,11 @@ impl ExecuteStatementCommand {
             match conn.execute(self.statement.as_str()).await {
                 Ok(res) => Ok(res),
                 Err(e) => {
-                    return Err(anyhow::anyhow!(e.to_string()));
+                    Err(anyhow::anyhow!(e.to_string()))
                 }
             }
         } else {
-            return Err(anyhow::anyhow!("No connection to database".to_string()));
+            Err(anyhow::anyhow!("No connection to database".to_string()))
         }
     }
 

crates/pg_completions/src/builder.rs

@@ -30,7 +30,7 @@ impl CompletionBuilder {
                 if idx == 0 {
                     item.preselected = Some(should_preselect_first_item);
                 }
-                item.into()
+                item
             })
             .collect();
 

crates/pg_completions/src/complete.rs

@@ -83,7 +83,7 @@ mod tests {
 
         let result = complete(p);
 
-        assert!(result.items.len() > 0);
+        assert!(!result.items.is_empty());
 
         let best_match = &result.items[0];
 
@@ -142,7 +142,7 @@ mod tests {
 
             let result = complete(p);
 
-            assert!(result.items.len() > 0);
+            assert!(!result.items.is_empty());
 
             let best_match = &result.items[0];
 
@@ -205,7 +205,7 @@ mod tests {
 
             let result = complete(p);
 
-            assert!(result.items.len() > 0);
+            assert!(!result.items.is_empty());
 
             let best_match = &result.items[0];
 

crates/pg_completions/src/context.rs

@@ -18,7 +18,7 @@ impl<'a> CompletionContext<'a> {
     pub fn new(params: &'a CompletionParams) -> Self {
         let mut tree = Self {
             tree: params.tree,
-            text: &params.text,
+            text: params.text,
             schema_cache: params.schema,
             position: usize::from(params.position),
 

crates/pg_hover/src/lib.rs

@@ -28,14 +28,12 @@ pub fn hover(params: HoverParams) -> Option<HoverResult> {
     let elem = if params.enriched_ast.is_some() {
         resolve::resolve_from_enriched_ast(params.position, params.enriched_ast.unwrap())
     } else if params.tree.is_some() {
-        resolve::resolve_from_tree_sitter(params.position, params.tree.unwrap(), &params.source)
+        resolve::resolve_from_tree_sitter(params.position, params.tree.unwrap(), params.source)
     } else {
         None
     };
 
-    if elem.is_none() {
-        return None;
-    }
+    elem.as_ref()?;
 
     match elem.unwrap() {
         Hoverable::Relation(r) => {
@@ -45,14 +43,14 @@ pub fn hover(params: HoverParams) -> Option<HoverResult> {
                 let mut content = t.name.to_owned();
 
                 if t.comment.is_some() {
-                    content.push_str("\n");
+                    content.push('\n');
                     content.push_str(t.comment.as_ref().unwrap());
                 }
 
-                return HoverResult {
+                HoverResult {
                     range: Some(r.range),
                     content,
-                };
+                }
             })
         }
     }

crates/pg_inlay_hints/src/functions_args.rs

@@ -25,18 +25,14 @@ impl InlayHintsResolver for FunctionArgHint {
         ChildrenIterator::new(root.to_owned())
             .filter_map(|n| match n {
                 pg_query_ext::NodeEnum::FuncCall(source_fn) => {
-                    if let Some(schema_fn) = pg_type_resolver::resolve_func_call(
+                    pg_type_resolver::resolve_func_call(
                         source_fn.as_ref(),
-                        &params.schema_cache,
-                    ) {
-                        Some(resolve_func_arg_hint(
+                        params.schema_cache,
+                    ).map(|schema_fn| resolve_func_arg_hint(
                             source_fn.as_ref(),
                             schema_fn,
-                            &params.schema_cache,
+                            params.schema_cache,
                         ))
-                    } else {
-                        None
-                    }
                 }
                 _ => None,
             })
@@ -61,7 +57,7 @@ fn resolve_func_arg_hint(
             )
             .unwrap(),
             content: InlayHintContent::FunctionArg(FunctionArgHint {
-                name: if schema_arg.name == "" {
+                name: if schema_arg.name.is_empty() {
                     None
                 } else {
                     Some(schema_arg.name.clone())

crates/pg_lint/src/rules/ban_drop_column.rs

@@ -20,22 +20,17 @@ pub fn ban_drop_column(params: &LinterParams) -> Vec<RuleViolation> {
                 }
             }
         }
-    } else {
-        match &params.ast {
-            pg_query_ext::NodeEnum::AlterTableStmt(stmt) => {
-                for cmd in &stmt.cmds {
-                    if let Some(pg_query_ext::NodeEnum::AlterTableCmd(cmd)) = &cmd.node {
-                        if cmd.subtype() == pg_query_ext::protobuf::AlterTableType::AtDropColumn {
-                            errs.push(RuleViolation::new(
-                                RuleViolationKind::BanDropColumn,
-                                None,
-                                None,
-                            ));
-                        }
-                    }
+    } else if let pg_query_ext::NodeEnum::AlterTableStmt(stmt) = &params.ast {
+        for cmd in &stmt.cmds {
+            if let Some(pg_query_ext::NodeEnum::AlterTableCmd(cmd)) = &cmd.node {
+                if cmd.subtype() == pg_query_ext::protobuf::AlterTableType::AtDropColumn {
+                    errs.push(RuleViolation::new(
+                        RuleViolationKind::BanDropColumn,
+                        None,
+                        None,
+                    ));
                 }
             }
-            _ => {}
         }
     }
 

crates/pg_lsp_new/src/capabilities.rs

@@ -1,7 +1,6 @@
 use pg_lsp_converters::{negotiated_encoding, PositionEncoding, WideEncoding};
 use tower_lsp::lsp_types::{
-    ClientCapabilities, CodeActionKind, CodeActionOptions, CodeActionProviderCapability,
-    DocumentOnTypeFormattingOptions, OneOf, PositionEncodingKind, SaveOptions, ServerCapabilities,
+    ClientCapabilities, PositionEncodingKind, SaveOptions, ServerCapabilities,
     TextDocumentSyncCapability, TextDocumentSyncKind, TextDocumentSyncOptions,
     TextDocumentSyncSaveOptions,
 };

crates/pg_lsp_new/src/handlers/text_document.rs

@@ -5,7 +5,7 @@ use pg_workspace_new::workspace::{
     ChangeFileParams, ChangeParams, CloseFileParams, GetFileContentParams, OpenFileParams,
 };
 use tower_lsp::lsp_types;
-use tracing::{error, field};
+use tracing::field;
 
 /// Handler for `textDocument/didOpen` LSP notification
 #[tracing::instrument(

crates/pg_lsp_new/src/session.rs

@@ -1,23 +1,16 @@
-use crate::diagnostics::LspError;
 use crate::documents::Document;
-use crate::utils;
 use anyhow::Result;
-use biome_deserialize::Merge;
-use futures::stream::futures_unordered::FuturesUnordered;
-use futures::StreamExt;
-use pg_configuration::{ConfigurationPathHint, PartialConfiguration};
-use pg_console::markup;
-use pg_diagnostics::{DiagnosticExt, Error, PrintDescription};
+use pg_configuration::ConfigurationPathHint;
+use pg_diagnostics::{DiagnosticExt, Error};
 use pg_fs::{FileSystem, PgLspPath};
 use pg_lsp_converters::{negotiated_encoding, PositionEncoding, WideEncoding};
 use pg_workspace_new::configuration::{load_configuration, LoadedConfiguration};
-use pg_workspace_new::settings::{PartialConfigurationExt, Settings};
+use pg_workspace_new::settings::PartialConfigurationExt;
 use pg_workspace_new::workspace::UpdateSettingsParams;
 use pg_workspace_new::Workspace;
 use pg_workspace_new::{DynRef, WorkspaceError};
 use rustc_hash::FxHashMap;
 use serde_json::Value;
-use std::ffi::OsStr;
 use std::path::PathBuf;
 use std::sync::atomic::Ordering;
 use std::sync::atomic::{AtomicBool, AtomicU8};
@@ -26,7 +19,7 @@ use std::sync::RwLock;
 use tokio::sync::Notify;
 use tokio::sync::OnceCell;
 use tower_lsp::lsp_types;
-use tower_lsp::lsp_types::{Diagnostic, Url};
+use tower_lsp::lsp_types::Url;
 use tower_lsp::lsp_types::{MessageType, Registration};
 use tower_lsp::lsp_types::{Unregistration, WorkspaceFolder};
 use tracing::{error, info};

crates/pg_lsp_new/src/utils.rs

@@ -11,7 +11,7 @@ use std::any::Any;
 use std::borrow::Cow;
 use std::fmt::{Debug, Display};
 use std::ops::{Add, Range};
-use std::{io, mem};
+use std::io;
 use text_size::{TextRange, TextSize};
 use tower_lsp::jsonrpc::Error as LspError;
 use tower_lsp::lsp_types;

crates/pg_query_ext_codegen/src/get_location.rs

@@ -103,8 +103,7 @@ fn location_idents(nodes: &[Node], exclude_nodes: &[&str]) -> Vec<TokenStream> {
             if node
                 .fields
                 .iter()
-                .find(|n| n.name == "location" && n.field_type == FieldType::Int32)
-                .is_some()
+                .any(|n| n.name == "location" && n.field_type == FieldType::Int32)
             {
                 quote! { Some(n.location) }
             } else {

crates/pg_query_ext_codegen/src/get_node_properties.rs

@@ -151,8 +151,8 @@ fn node_handlers(nodes: &[Node]) -> Vec<TokenStream> {
     nodes
         .iter()
         .map(|node| {
-            let string_property_handlers = string_property_handlers(&node);
-            let custom_handlers = custom_handlers(&node);
+            let string_property_handlers = string_property_handlers(node);
+            let custom_handlers = custom_handlers(node);
             quote! {
                 #custom_handlers
                 #(#string_property_handlers)*

crates/pg_query_ext_codegen/src/get_nodes.rs

@@ -96,7 +96,7 @@ fn node_handlers(nodes: &[Node], exclude_nodes: &[&str]) -> Vec<TokenStream> {
         .iter()
         .filter(|node| !exclude_nodes.contains(&node.name.as_str()))
         .map(|node| {
-            let property_handlers = property_handlers(&node);
+            let property_handlers = property_handlers(node);
             quote! {
                 #(#property_handlers)*
             }
@@ -117,7 +117,7 @@ fn property_handlers(node: &Node) -> Vec<TokenStream> {
                             handle_child(x.node.as_ref().unwrap().to_owned());
                         });
                 })
-            } else if field.field_type == FieldType::Node && field.is_one_of == false {
+            } else if field.field_type == FieldType::Node && !field.is_one_of {
                 if field.node_name == Some("Node".to_owned()) {
                     Some(quote! {
                         if n.#field_name.is_some() {

crates/pg_query_ext_codegen/src/node_iterator.rs

@@ -78,7 +78,7 @@ fn node_handlers(nodes: &[Node], exclude_nodes: &[&str]) -> Vec<TokenStream> {
         .iter()
         .filter(|node| !exclude_nodes.contains(&node.name.as_str()))
         .map(|node| {
-            let property_handlers = property_handlers(&node);
+            let property_handlers = property_handlers(node);
             quote! {
                 #(#property_handlers)*
             }
@@ -99,7 +99,7 @@ fn property_handlers(node: &Node) -> Vec<TokenStream> {
                             self.stack.push_back((x.node.as_ref().unwrap().to_owned(), current_depth));
                         });
                 })
-            } else if field.field_type == FieldType::Node && field.is_one_of == false {
+            } else if field.field_type == FieldType::Node && !field.is_one_of {
                 if field.node_name == Some("Node".to_owned()) {
                     Some(quote! {
                         if n.#field_name.is_some() {

crates/pg_query_proto_parser/src/proto_parser.rs

@@ -60,10 +60,7 @@ impl ProtoParser {
             .field
             .iter()
             .find(|e| e.type_name().split(".").last().unwrap() == type_name);
-        match variant {
-            Some(v) => Some(v.name.clone().unwrap().to_case(Case::UpperCamel)),
-            None => None,
-        }
+        variant.map(|v| v.name.clone().unwrap().to_case(Case::UpperCamel))
     }
 
     fn nodes(&self) -> Vec<Node> {

crates/pg_schema_cache/src/functions.rs

@@ -5,17 +5,14 @@ use sqlx::PgPool;
 use crate::schema_cache::SchemaCacheItem;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Default)]
 pub enum Behavior {
     Immutable,
     Stable,
+    #[default]
     Volatile,
 }
 
-impl Default for Behavior {
-    fn default() -> Self {
-        Behavior::Volatile
-    }
-}
 
 impl From<Option<String>> for Behavior {
     fn from(s: Option<String>) -> Self {

crates/pg_schema_cache/src/tables.rs

@@ -3,18 +3,15 @@ use sqlx::PgPool;
 use crate::schema_cache::SchemaCacheItem;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Default)]
 pub enum ReplicaIdentity {
+    #[default]
     Default,
     Index,
     Full,
     Nothing,
 }
 
-impl Default for ReplicaIdentity {
-    fn default() -> Self {
-        ReplicaIdentity::Default
-    }
-}
 
 impl From<String> for ReplicaIdentity {
     fn from(s: String) -> Self {

crates/pg_syntax/src/ast/builder.rs

@@ -25,7 +25,7 @@ impl AstBuilder {
             start: self.current_pos.try_into().unwrap(),
             end: None,
         });
-        if self.open_nodes.len() > 0 {
+        if !self.open_nodes.is_empty() {
             let parent = self.open_nodes.last().unwrap();
             self.inner.add_edge(parent.to_owned(), idx, ());
         }

crates/pg_syntax/src/lib.rs

@@ -13,7 +13,7 @@ use syntax_builder::{Syntax, SyntaxBuilder};
 pub fn parse_syntax(sql: &str, root: &pg_query_ext::NodeEnum) -> Syntax {
     let mut builder = SyntaxBuilder::new();
 
-    StatementParser::new(&root, sql, &mut builder).parse();
+    StatementParser::new(root, sql, &mut builder).parse();
 
     builder.finish()
 }