chore: rust 2024

Cargo.toml

@@ -5,12 +5,12 @@ resolver = "2"
 [workspace.package]
 authors      = ["Supabase Communnity"]
 categories   = ["development-tools", "postgres", "supabase"]
-edition      = "2021"
+edition      = "2024"
 homepage     = "https://supabase.com/"
 keywords     = ["linter", "typechecker", "postgres", "language-server"]
 license      = "MIT"
 repository   = "https://github.com/supabase-community/postgres_lsp"
-rust-version = "1.82.0"
+rust-version = "1.85.0"
 
 [workspace.dependencies]
 # supporting crates unrelated to postgres
@@ -31,7 +31,7 @@ quote                    = "1.0.33"
 rayon                    = "1.10.0"
 regex                    = "1.11.1"
 rustc-hash               = "2.0.0"
-schemars                 = { version = "0.8.21", features = ["indexmap2", "smallvec"] }
+schemars                 = { version = "0.8.22", features = ["indexmap2", "smallvec"] }
 serde                    = "1.0.195"
 serde_json               = "1.0.114"
 similar                  = "2.6.0"

crates/pglt_analyse/src/categories.rs

@@ -1,4 +1,4 @@
-use enumflags2::{bitflags, BitFlags};
+use enumflags2::{BitFlags, bitflags};
 use std::borrow::Cow;
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
@@ -288,8 +288,8 @@ impl schemars::JsonSchema for RuleCategories {
         String::from("RuleCategories")
     }
 
-    fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-        <Vec<RuleCategory>>::json_schema(gen)
+    fn json_schema(r#gen: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
+        <Vec<RuleCategory>>::json_schema(r#gen)
     }
 }
 

crates/pglt_analyse/src/lib.rs

@@ -11,7 +11,7 @@ pub use pglt_diagnostics::category_concat;
 
 pub use crate::categories::{
     ActionCategory, RefactorKind, RuleCategories, RuleCategoriesBuilder, RuleCategory,
-    SourceActionKind, SUPPRESSION_ACTION_CATEGORY,
+    SUPPRESSION_ACTION_CATEGORY, SourceActionKind,
 };
 pub use crate::filter::{AnalysisFilter, GroupKey, RuleFilter, RuleKey};
 pub use crate::options::{AnalyserOptions, AnalyserRules};

crates/pglt_analyse/src/macros.rs

@@ -24,7 +24,7 @@ macro_rules! declare_lint_rule {
     ( $( #[doc = $doc:literal] )+ $vis:vis $id:ident {
         version: $version:literal,
         name: $name:tt,
-        $( $key:ident: $value:expr, )*
+        $( $key:ident: $value:expr_2021, )*
     } ) => {
 
         pglt_analyse::declare_rule!(
@@ -53,7 +53,7 @@ macro_rules! declare_rule {
         ( $( #[doc = $doc:literal] )+ $vis:vis $id:ident {
         version: $version:literal,
         name: $name:tt,
-        $( $key:ident: $value:expr, )*
+        $( $key:ident: $value:expr_2021, )*
     } ) => {
         $( #[doc = $doc] )*
         $vis enum $id {}

crates/pglt_analyse/src/registry.rs

@@ -1,10 +1,10 @@
 use std::{borrow, collections::BTreeSet};
 
 use crate::{
+    AnalyserOptions,
     context::RuleContext,
     filter::{AnalysisFilter, GroupKey, RuleKey},
     rule::{GroupCategory, Rule, RuleDiagnostic, RuleGroup},
-    AnalyserOptions,
 };
 
 pub trait RegistryVisitor {

crates/pglt_analyse/src/rule.rs

@@ -1,5 +1,5 @@
 use pglt_console::fmt::Display;
-use pglt_console::{markup, MarkupBuf};
+use pglt_console::{MarkupBuf, markup};
 use pglt_diagnostics::advice::CodeSuggestionAdvice;
 use pglt_diagnostics::{
     Advices, Category, Diagnostic, DiagnosticTags, Location, LogCategory, MessageAndDescription,

crates/pglt_analyser/src/lib.rs

@@ -72,8 +72,9 @@ mod tests {
 
     use pglt_analyse::{AnalyserOptions, AnalysisFilter, RuleFilter};
     use pglt_console::{
+        Markup,
         fmt::{Formatter, Termcolor},
-        markup, Markup,
+        markup,
     };
     use pglt_diagnostics::PrintDiagnostic;
     use termcolor::NoColor;

crates/pglt_analyser/src/lint/safety/adding_required_field.rs

@@ -1,4 +1,4 @@
-use pglt_analyse::{context::RuleContext, declare_lint_rule, Rule, RuleDiagnostic, RuleSource};
+use pglt_analyse::{Rule, RuleDiagnostic, RuleSource, context::RuleContext, declare_lint_rule};
 use pglt_console::markup;
 
 declare_lint_rule! {

crates/pglt_analyser/src/lint/safety/ban_drop_column.rs

@@ -1,4 +1,4 @@
-use pglt_analyse::{context::RuleContext, declare_lint_rule, Rule, RuleDiagnostic, RuleSource};
+use pglt_analyse::{Rule, RuleDiagnostic, RuleSource, context::RuleContext, declare_lint_rule};
 use pglt_console::markup;
 
 declare_lint_rule! {

crates/pglt_analyser/src/lint/safety/ban_drop_not_null.rs

@@ -1,4 +1,4 @@
-use pglt_analyse::{context::RuleContext, declare_lint_rule, Rule, RuleDiagnostic, RuleSource};
+use pglt_analyse::{Rule, RuleDiagnostic, RuleSource, context::RuleContext, declare_lint_rule};
 use pglt_console::markup;
 
 declare_lint_rule! {

crates/pglt_analyser/src/lint/safety/ban_drop_table.rs

@@ -1,4 +1,4 @@
-use pglt_analyse::{context::RuleContext, declare_lint_rule, Rule, RuleDiagnostic, RuleSource};
+use pglt_analyse::{Rule, RuleDiagnostic, RuleSource, context::RuleContext, declare_lint_rule};
 use pglt_console::markup;
 
 declare_lint_rule! {

crates/pglt_cli/src/changed.rs

@@ -18,7 +18,11 @@ pub(crate) fn get_changed_files(
         (Some(since), Some(_)) => since,
         (Some(since), None) => since,
         (None, Some(branch)) => branch,
-        (None, None) => return Err(CliDiagnostic::incompatible_end_configuration("The `--changed` flag was set, but couldn't determine the base to compare against. Either set configuration.vcs.default_branch or use the --since argument.")),
+        (None, None) => {
+            return Err(CliDiagnostic::incompatible_end_configuration(
+                "The `--changed` flag was set, but couldn't determine the base to compare against. Either set configuration.vcs.default_branch or use the --since argument.",
+            ));
+        }
     };
 
     let changed_files = fs.get_changed_files(base)?;

crates/pglt_cli/src/cli_options.rs

@@ -1,5 +1,5 @@
-use crate::logging::LoggingKind;
 use crate::LoggingLevel;
+use crate::logging::LoggingKind;
 use bpaf::Bpaf;
 use pglt_configuration::ConfigurationPathHint;
 use pglt_diagnostics::Severity;
@@ -208,7 +208,10 @@ impl FromStr for MaxDiagnostics {
                 if let Ok(value) = s.parse::<u32>() {
                     Ok(MaxDiagnostics::Limit(value))
                 } else {
-                    Err(format!("Invalid value provided. Provide 'none' to lift the limit, or a number between 0 and {}.", u32::MAX))
+                    Err(format!(
+                        "Invalid value provided. Provide 'none' to lift the limit, or a number between 0 and {}.",
+                        u32::MAX
+                    ))
                 }
             }
         }

crates/pglt_cli/src/commands/check.rs

@@ -4,10 +4,10 @@ use biome_deserialize::Merge;
 use pglt_configuration::PartialConfiguration;
 use pglt_console::Console;
 use pglt_fs::FileSystem;
-use pglt_workspace::{configuration::LoadedConfiguration, DynRef, Workspace, WorkspaceError};
+use pglt_workspace::{DynRef, Workspace, WorkspaceError, configuration::LoadedConfiguration};
 use std::ffi::OsString;
 
-use super::{get_files_to_process_with_cli_options, CommandRunner};
+use super::{CommandRunner, get_files_to_process_with_cli_options};
 
 pub(crate) struct CheckCommandPayload {
     pub(crate) configuration: Option<PartialConfiguration>,

crates/pglt_cli/src/commands/daemon.rs

@@ -1,21 +1,21 @@
 use crate::{
-    open_transport,
+    CliDiagnostic, CliSession, open_transport,
     service::{self, ensure_daemon, open_socket, run_daemon},
-    CliDiagnostic, CliSession,
 };
-use pglt_console::{markup, ConsoleExt};
+use pglt_console::{ConsoleExt, markup};
 use pglt_lsp::ServerFactory;
-use pglt_workspace::{workspace::WorkspaceClient, TransportError, WorkspaceError};
+use pglt_workspace::{TransportError, WorkspaceError, workspace::WorkspaceClient};
 use std::{env, fs, path::PathBuf};
 use tokio::io;
 use tokio::runtime::Runtime;
 use tracing::subscriber::Interest;
-use tracing::{debug_span, metadata::LevelFilter, Instrument, Metadata};
+use tracing::{Instrument, Metadata, debug_span, metadata::LevelFilter};
 use tracing_appender::rolling::Rotation;
 use tracing_subscriber::{
+    Layer,
     layer::{Context, Filter},
     prelude::*,
-    registry, Layer,
+    registry,
 };
 use tracing_tree::HierarchicalLayer;
 
@@ -49,22 +49,25 @@ pub(crate) fn start(
 pub(crate) fn stop(session: CliSession) -> Result<(), CliDiagnostic> {
     let rt = Runtime::new()?;
 
-    if let Some(transport) = open_transport(rt)? {
-        let client = WorkspaceClient::new(transport)?;
-        match client.shutdown() {
-            // The `ChannelClosed` error is expected since the server can
-            // shutdown before sending a response
-            Ok(()) | Err(WorkspaceError::TransportError(TransportError::ChannelClosed)) => {}
-            Err(err) => return Err(CliDiagnostic::from(err)),
-        };
+    match open_transport(rt)? {
+        Some(transport) => {
+            let client = WorkspaceClient::new(transport)?;
+            match client.shutdown() {
+                // The `ChannelClosed` error is expected since the server can
+                // shutdown before sending a response
+                Ok(()) | Err(WorkspaceError::TransportError(TransportError::ChannelClosed)) => {}
+                Err(err) => return Err(CliDiagnostic::from(err)),
+            };
 
-        session.app.console.log(markup! {
-            "The server was successfully stopped"
-        });
-    } else {
-        session.app.console.log(markup! {
-            "The server was not running"
-        });
+            session.app.console.log(markup! {
+                "The server was successfully stopped"
+            });
+        }
+        _ => {
+            session.app.console.log(markup! {
+                "The server was not running"
+            });
+        }
     }
 
     Ok(())

crates/pglt_cli/src/commands/init.rs

@@ -1,6 +1,6 @@
 use crate::{CliDiagnostic, CliSession};
 use pglt_configuration::PartialConfiguration;
-use pglt_console::{markup, ConsoleExt};
+use pglt_console::{ConsoleExt, markup};
 use pglt_fs::ConfigName;
 use pglt_workspace::configuration::create_config;
 

crates/pglt_cli/src/commands/mod.rs

@@ -1,15 +1,15 @@
 use crate::changed::{get_changed_files, get_staged_files};
-use crate::cli_options::{cli_options, CliOptions, CliReporter, ColorsArg};
+use crate::cli_options::{CliOptions, CliReporter, ColorsArg, cli_options};
 use crate::execute::Stdin;
 use crate::logging::LoggingKind;
 use crate::{
-    execute_mode, setup_cli_subscriber, CliDiagnostic, CliSession, Execution, LoggingLevel, VERSION,
+    CliDiagnostic, CliSession, Execution, LoggingLevel, VERSION, execute_mode, setup_cli_subscriber,
 };
 use bpaf::Bpaf;
-use pglt_configuration::{partial_configuration, PartialConfiguration};
+use pglt_configuration::{PartialConfiguration, partial_configuration};
 use pglt_console::Console;
 use pglt_fs::FileSystem;
-use pglt_workspace::configuration::{load_configuration, LoadedConfiguration};
+use pglt_workspace::configuration::{LoadedConfiguration, load_configuration};
 use pglt_workspace::settings::PartialConfigurationExt;
 use pglt_workspace::workspace::UpdateSettingsParams;
 use pglt_workspace::{DynRef, Workspace, WorkspaceError};
@@ -183,7 +183,7 @@ impl PgltCommand {
             | PgltCommand::Stop
             | PgltCommand::Init
             | PgltCommand::RunServer { .. }
-            | PgltCommand::Clean { .. }
+            | PgltCommand::Clean
             | PgltCommand::PrintSocket => None,
         }
     }

crates/pglt_cli/src/commands/version.rs

@@ -1,5 +1,5 @@
 use pglt_console::fmt::Formatter;
-use pglt_console::{fmt, markup, ConsoleExt};
+use pglt_console::{ConsoleExt, fmt, markup};
 use pglt_workspace::workspace::ServerInfo;
 
 use crate::{CliDiagnostic, CliSession, VERSION};

crates/pglt_cli/src/execute/mod.rs

@@ -4,13 +4,13 @@ mod std_in;
 pub(crate) mod traverse;
 
 use crate::cli_options::{CliOptions, CliReporter};
-use crate::execute::traverse::{traverse, TraverseResult};
+use crate::execute::traverse::{TraverseResult, traverse};
 use crate::reporter::github::{GithubReporter, GithubReporterVisitor};
 use crate::reporter::gitlab::{GitLabReporter, GitLabReporterVisitor};
 use crate::reporter::junit::{JunitReporter, JunitReporterVisitor};
 use crate::reporter::terminal::{ConsoleReporter, ConsoleReporterVisitor};
 use crate::{CliDiagnostic, CliSession, DiagnosticsPayload, Reporter};
-use pglt_diagnostics::{category, Category};
+use pglt_diagnostics::{Category, category};
 use pglt_fs::PgLTPath;
 use std::borrow::Borrow;
 use std::ffi::OsString;
@@ -103,7 +103,7 @@ pub enum TraversalMode {
 impl Display for TraversalMode {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            TraversalMode::Dummy { .. } => write!(f, "dummy"),
+            TraversalMode::Dummy => write!(f, "dummy"),
             TraversalMode::Check { .. } => write!(f, "check"),
         }
     }
@@ -165,33 +165,33 @@ impl Execution {
 
     pub(crate) fn as_diagnostic_category(&self) -> &'static Category {
         match self.traversal_mode {
-            TraversalMode::Dummy { .. } => category!("dummy"),
+            TraversalMode::Dummy => category!("dummy"),
             TraversalMode::Check { .. } => category!("check"),
         }
     }
 
     pub(crate) const fn is_dummy(&self) -> bool {
-        matches!(self.traversal_mode, TraversalMode::Dummy { .. })
+        matches!(self.traversal_mode, TraversalMode::Dummy)
     }
 
     /// Whether the traversal mode requires write access to files
     pub(crate) const fn requires_write_access(&self) -> bool {
         match self.traversal_mode {
-            TraversalMode::Dummy { .. } => false,
+            TraversalMode::Dummy => false,
             TraversalMode::Check { .. } => false,
         }
     }
 
     pub(crate) fn as_stdin_file(&self) -> Option<&Stdin> {
         match &self.traversal_mode {
-            TraversalMode::Dummy { .. } => None,
+            TraversalMode::Dummy => None,
             TraversalMode::Check { stdin, .. } => stdin.as_ref(),
         }
     }
 
     pub(crate) fn is_vcs_targeted(&self) -> bool {
         match &self.traversal_mode {
-            TraversalMode::Dummy { .. } => false,
+            TraversalMode::Dummy => false,
             TraversalMode::Check { vcs_targeted, .. } => {
                 vcs_targeted.staged || vcs_targeted.changed
             }
@@ -205,7 +205,7 @@ impl Execution {
     /// Returns [true] if the user used the `--write`/`--fix` option
     pub(crate) fn is_write(&self) -> bool {
         match self.traversal_mode {
-            TraversalMode::Dummy { .. } => false,
+            TraversalMode::Dummy => false,
             TraversalMode::Check { .. } => false,
         }
     }
@@ -223,7 +223,10 @@ pub fn execute_mode(
     execution.max_diagnostics = if cli_options.reporter.is_default() {
         cli_options.max_diagnostics.into()
     } else {
-        info!("Removing the limit of --max-diagnostics, because of a reporter different from the default one: {}", cli_options.reporter);
+        info!(
+            "Removing the limit of --max-diagnostics, because of a reporter different from the default one: {}",
+            cli_options.reporter
+        );
         u32::MAX
     };