clean clippy

Author: juleswritescode

crates/pgt_cli/src/commands/mod.rs

@@ -15,7 +15,6 @@ use pgt_workspace::workspace::UpdateSettingsParams;
 use pgt_workspace::{DynRef, Workspace, WorkspaceError};
 use std::ffi::OsString;
 use std::path::PathBuf;
-
 pub(crate) mod check;
 pub(crate) mod clean;
 pub(crate) mod daemon;
@@ -24,6 +23,7 @@ pub(crate) mod version;
 
 #[derive(Debug, Clone, Bpaf)]
 #[bpaf(options, version(VERSION))]
+#[allow(clippy::large_enum_variant)]
 /// Postgres Tools official CLI. Use it to check the health of your project or run it to check single files.
 pub enum PgtCommand {
     /// Shows the version information and quit.

crates/pgt_cli/src/execute/std_in.rs

@@ -3,7 +3,7 @@
 use crate::{CliDiagnostic, CliSession};
 use pgt_console::{ConsoleExt, markup};
 
-pub(crate) fn run<'a>(session: CliSession, content: &'a str) -> Result<(), CliDiagnostic> {
+pub(crate) fn run(session: CliSession, content: &str) -> Result<(), CliDiagnostic> {
     let console = &mut *session.app.console;
 
     console.append(markup! {{content}});

crates/pgt_cli/src/service/mod.rs

@@ -70,11 +70,11 @@ type JsonRpcResult = Result<Box<RawValue>, TransportError>;
 /// This structs holds an instance of the `tokio` runtime, as well as the
 /// following fields:
 /// - `write_send` is a sender handle to the "write channel", an MPSC channel
-///     that's used to queue up requests to be sent to the server (for simplicity
-///     the requests are pushed to the channel as serialized byte buffers)
+///   that's used to queue up requests to be sent to the server (for simplicity
+///   the requests are pushed to the channel as serialized byte buffers)
 /// - `pending_requests` is handle to a shared hashmap where the keys are `u64`
-///     corresponding to request IDs, and the values are sender handles to oneshot
-///     channel instances that can be consumed to fulfill the associated request
+///   corresponding to request IDs, and the values are sender handles to oneshot
+///   channel instances that can be consumed to fulfill the associated request
 ///
 /// Creating a new `SocketTransport` instance requires providing a `tokio`
 /// runtime instance as well as the "read half" and "write half" of the socket
@@ -85,7 +85,7 @@ type JsonRpcResult = Result<Box<RawValue>, TransportError>;
 ///
 /// This concurrent handling of I/O is implemented using two "background tasks":
 /// - the `write_task` pulls outgoing messages from the "write channel" and
-///     writes them to the "write half" of the socket
+///   writes them to the "write half" of the socket
 /// - the `read_task` reads incoming messages from the "read half" of the
 ///   socket, then looks up a request with an ID corresponding to the received
 ///   message in the "pending requests" map. If a pending request is found, it's

crates/pgt_completions/src/providers/functions.rs

@@ -6,11 +6,11 @@ use crate::{
 pub fn complete_functions(ctx: &CompletionContext, builder: &mut CompletionBuilder) {
     let available_functions = &ctx.schema_cache.functions;
 
-    for foo in available_functions {
+    for func in available_functions {
         let item = CompletionItem {
-            label: foo.name.clone(),
-            score: CompletionRelevanceData::Function(foo).get_score(ctx),
-            description: format!("Schema: {}", foo.schema),
+            label: func.name.clone(),
+            score: CompletionRelevanceData::Function(func).get_score(ctx),
+            description: format!("Schema: {}", func.schema),
             preselected: false,
             kind: CompletionItemKind::Function,
         };

crates/pgt_diagnostics/src/display/diff.rs

@@ -99,11 +99,11 @@ pub(super) fn print_diff(fmt: &mut fmt::Formatter<'_>, diff: &TextEdit) -> io::R
 /// This function scans the list of DiffOps that make up the `diff` and derives
 /// the following data structures:
 /// - `modified_lines` is the set of [LineKey] that contain at least one insert
-///     or delete operation
+///   or delete operation
 /// - `inserted_lines` maps a [LineKey] to the list of diff operations that
-///     happen on the corresponding line
+///   happen on the corresponding line
 /// - `before_line_to_after` maps line numbers in the old revision of the text
-///     to line numbers in the new revision
+///   to line numbers in the new revision
 /// - `after_line` counts the number of lines in the new revision of the document
 /// - `before_line` counts the number of lines in the old revision of the document
 fn process_diff_ops<'diff>(

crates/pgt_diagnostics_macros/src/parse.rs

@@ -9,6 +9,7 @@ use syn::{
     token::Paren,
 };
 
+#[allow(clippy::large_enum_variant)]
 pub(crate) enum DeriveInput {
     DeriveStructInput(DeriveStructInput),
     DeriveEnumInput(DeriveEnumInput),

crates/pgt_lsp/src/handlers/code_actions.rs

@@ -63,7 +63,7 @@ pub fn get_actions(
 
     Ok(actions
         .into_iter()
-        .map(|ac| CodeActionOrCommand::CodeAction(ac))
+        .map(CodeActionOrCommand::CodeAction)
         .collect())
 }
 

crates/pgt_test_macros/src/lib.rs

@@ -164,7 +164,7 @@ impl Arguments {
 
             let span = self.pattern.lit.span();
             let test_name = syn::Ident::new(&test_name, span);
-            let foo = &self.test_function;
+            let func = &self.test_function;
 
             modules.insert(
                 path,
@@ -174,7 +174,7 @@ impl Arguments {
                         let test_fullpath = #test_fullpath;
                         let test_expected_fullpath = #test_expected_fullpath;
                         let test_dir = #test_dir;
-                        #foo(test_fullpath, test_expected_fullpath, test_dir);
+                        #func(test_fullpath, test_expected_fullpath, test_dir);
                     }
                 },
             )

crates/pgt_text_size/src/size.rs

@@ -5,7 +5,6 @@ use {
         fmt, iter,
         num::TryFromIntError,
         ops::{Add, AddAssign, Sub, SubAssign},
-        u32,
     },
 };
 

crates/pgt_workspace/src/configuration.rs

@@ -239,7 +239,7 @@ pub fn strip_jsonc_comments(jsonc_input: &str) -> String {
                         json_output.push(last_char);
                     }
                 } else {
-                    json_output.push_str(" ");
+                    json_output.push(' ');
                 }
                 last_char = Some(cur_char);
             }

crates/pgt_workspace/src/settings.rs

@@ -303,7 +303,7 @@ impl From<PartialDatabaseConfiguration> for DatabaseSettings {
             .map(|stringset| {
                 stringset.iter().any(|pattern| {
                     let glob = Glob::new(pattern)
-                        .expect(format!("Invalid pattern: {}", pattern).as_str())
+                        .unwrap_or_else(|_| panic!("Invalid pattern: {}", pattern))
                         .compile_matcher();
 
                     glob.is_match(format!("{}/{}", host, database))

crates/pgt_workspace/src/workspace/server.rs

@@ -337,7 +337,7 @@ impl Workspace for WorkspaceServer {
             }
         };
 
-        let conn = self.connection.write().unwrap();
+        let conn = self.connection.read().unwrap();
         let pool = match conn.get_pool() {
             Some(p) => p,
             None => {

xtask/codegen/src/generate_configuration.rs

@@ -536,13 +536,7 @@ fn generate_group_struct(
         let rule_option_type = quote! {
             pgt_analyser::options::#rule_name
         };
-        let rule_option = if kind == RuleCategory::Action {
-            quote! { Option<#rule_config_type<#rule_option_type>> }
-        } else {
-            quote! {
-                Option<#rule_config_type<#rule_option_type>>
-            }
-        };
+        let rule_option = quote! { Option<#rule_config_type<#rule_option_type>> };
         schema_lines_rules.push(quote! {
             #[doc = #summary]
             #[serde(skip_serializing_if = "Option::is_none")]
@@ -570,15 +564,9 @@ fn generate_group_struct(
             }
         });
 
-        if kind == RuleCategory::Action {
-            get_rule_configuration_line.push(quote! {
-                #rule => self.#rule_identifier.as_ref().map(|conf| (conf.level(), conf.get_options()))
-            });
-        } else {
-            get_rule_configuration_line.push(quote! {
-                #rule => self.#rule_identifier.as_ref().map(|conf| (conf.level(), conf.get_options()))
-            });
-        }
+        get_rule_configuration_line.push(quote! {
+            #rule => self.#rule_identifier.as_ref().map(|conf| (conf.level(), conf.get_options()))
+        });
     }
 
     let group_pascal_ident = Ident::new(&to_capitalized(group), Span::call_site());