progress

Author: psteinroe

crates/pgt_analyse/src/categories.rs

@@ -32,7 +32,7 @@ impl TryFrom<&str> for RuleCategory {
             "lint" => Ok(Self::Lint),
             "action" => Ok(Self::Action),
             "transformation" => Ok(Self::Transformation),
-            _ => Err(format!("Invalid Rule Category: {}", value)),
+            _ => Err(format!("Invalid Rule Category: {value}")),
         }
     }
 }

crates/pgt_analyser/src/lib.rs

@@ -150,7 +150,7 @@ mod tests {
             let text = markup_to_string(markup! {
                 {PrintDiagnostic::simple(result)}
             });
-            eprintln!("{}", text);
+            eprintln!("{text}");
         }
         println!("*******************");
 

crates/pgt_analyser/tests/rules_tests.rs

@@ -23,7 +23,7 @@ fn rule_test(full_path: &'static str, _: &str, _: &str) {
     };
 
     let query =
-        read_to_string(full_path).unwrap_or_else(|_| panic!("Failed to read file: {} ", full_path));
+        read_to_string(full_path).unwrap_or_else(|_| panic!("Failed to read file: {full_path} "));
 
     let options = AnalyserOptions::default();
     let analyser = Analyser::new(AnalyserConfig {

crates/pgt_cli/src/service/unix.rs

@@ -77,7 +77,7 @@ fn spawn_daemon(
     }
 
     if let Some(log_file_name_prefix) = log_file_name_prefix {
-        cmd.arg(format!("--log-prefix-name={}", log_file_name_prefix));
+        cmd.arg(format!("--log-prefix-name={log_file_name_prefix}"));
     }
 
     // Create a new session for the process and make it the leader, this will

crates/pgt_completions/benches/sanitization.rs

@@ -35,7 +35,7 @@ fn to_params<'a>(
 
 pub fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("small sql, adjusted", |b| {
-        let content = format!("select {} from users;", CURSOR_POS);
+        let content = format!("select {CURSOR_POS} from users;");
 
         let cache = SchemaCache::default();
         let (sql, pos) = sql_and_pos(content.as_str());
@@ -52,16 +52,15 @@ pub fn criterion_benchmark(c: &mut Criterion) {
   u.rolname as "owner!"
 from
   pg_namespace n,
-        {}
+        {CURSOR_POS}
 where
   n.nspowner = u.oid
   and (
     pg_has_role(n.nspowner, 'USAGE')
     or has_schema_privilege(n.oid, 'CREATE, USAGE')
   )
   and not pg_catalog.starts_with(n.nspname, 'pg_temp_')
-  and not pg_catalog.starts_with(n.nspname, 'pg_toast_temp_');"#,
-            CURSOR_POS
+  and not pg_catalog.starts_with(n.nspname, 'pg_toast_temp_');"#
         );
 
         let cache = SchemaCache::default();
@@ -98,7 +97,7 @@ where
       ix.indisunique as is_unique,
       ix.indrelid as table_oid
     from
-        {}
+        {CURSOR_POS}
     where
       c.relkind = 'i'
   )
@@ -128,8 +127,7 @@ from
 where
   -- system columns, such as `cmax` or `tableoid`, have negative `attnum`s
   atts.attnum >= 0;
-"#,
-            CURSOR_POS
+"#
         );
 
         let cache = SchemaCache::default();
@@ -140,7 +138,7 @@ where
     });
 
     c.bench_function("small sql, unadjusted", |b| {
-        let content = format!("select e{} from users;", CURSOR_POS);
+        let content = format!("select e{CURSOR_POS} from users;");
 
         let cache = SchemaCache::default();
         let (sql, pos) = sql_and_pos(content.as_str());
@@ -157,16 +155,15 @@ where
   u.rolname as "owner!"
 from
   pg_namespace n,
-  pg_r{}
+  pg_r{CURSOR_POS}
 where
   n.nspowner = u.oid
   and (
     pg_has_role(n.nspowner, 'USAGE')
     or has_schema_privilege(n.oid, 'CREATE, USAGE')
   )
   and not pg_catalog.starts_with(n.nspname, 'pg_temp_')
-  and not pg_catalog.starts_with(n.nspname, 'pg_toast_temp_');"#,
-            CURSOR_POS
+  and not pg_catalog.starts_with(n.nspname, 'pg_toast_temp_');"#
         );
 
         let cache = SchemaCache::default();
@@ -235,8 +232,7 @@ where
   -- system columns, such as `cmax` or `tableoid`, have negative `attnum`s
   atts.attnum >= 0
 order by
-  sch{} "#,
-            CURSOR_POS
+  sch{CURSOR_POS} "#
         );
 
         let cache = SchemaCache::default();

crates/pgt_completions/src/builder.rs

@@ -76,7 +76,7 @@ impl<'a> CompletionBuilder<'a> {
                     detail: item.detail,
 
                     // wonderous Rust syntax ftw
-                    sort_text: format!("{:0>padding$}", idx, padding = max_padding),
+                    sort_text: format!("{idx:0>max_padding$}"),
                     completion_text: item.completion_text,
                 }
             })

crates/pgt_completions/src/providers/helper.rs

@@ -52,7 +52,7 @@ pub(crate) fn with_schema_or_alias(
 
     if schema_or_alias_name.is_none_or(|s| s == "public") || is_already_prefixed_with_schema_name {
         if single_leading_quote {
-            format!(r#"{}""#, item_name)
+            format!(r#"{item_name}""#)
         } else {
             item_name.to_string()
         }
@@ -64,7 +64,7 @@ pub(crate) fn with_schema_or_alias(
         } else if with_quotes {
             format!(r#"{}"."{}"#, schema_or_als.replace('"', ""), item_name)
         } else {
-            format!("{}.{}", schema_or_als, item_name)
+            format!("{schema_or_als}.{item_name}")
         }
     }
 }

crates/pgt_completions/src/test_helper.rs

@@ -106,15 +106,13 @@ impl CompletionAssertion {
             CompletionAssertion::LabelNotExists(label) => {
                 assert_ne!(
                     &item.label, label,
-                    "Expected label {} not to exist, but found it",
-                    label
+                    "Expected label {label} not to exist, but found it"
                 );
             }
             CompletionAssertion::KindNotExists(kind) => {
                 assert_ne!(
                     &item.kind, kind,
-                    "Expected kind {:?} not to exist, but found it",
-                    kind
+                    "Expected kind {kind:?} not to exist, but found it"
                 );
             }
             CompletionAssertion::LabelAndDesc(label, desc) => {

crates/pgt_configuration/src/lib.rs

@@ -103,7 +103,7 @@ impl PartialConfiguration {
     /// Returns the initial configuration.
     pub fn init() -> Self {
         Self {
-            schema: Some(format!("{}/schemas/{VERSION}/schema.json", PGLS_WEBSITE)),
+            schema: Some(format!("{PGLS_WEBSITE}/schemas/{VERSION}/schema.json")),
             extends: Some(StringSet::default()),
             files: Some(PartialFilesConfiguration {
                 ignore: Some(Default::default()),

crates/pgt_hover/src/hoverables/column.rs

@@ -24,14 +24,14 @@ impl ToHoverMarkdown for pgt_schema_cache::Column {
         _schema_cache: &SchemaCache,
     ) -> Result<bool, std::fmt::Error> {
         if let Some(comment) = &self.comment {
-            write!(writer, "Comment: '{}'", comment)?;
+            write!(writer, "Comment: '{comment}'")?;
             writeln!(writer)?;
         }
 
         if let Some(tname) = self.type_name.as_ref() {
-            write!(writer, "{}", tname)?;
+            write!(writer, "{tname}")?;
             if let Some(l) = self.varchar_length {
-                write!(writer, "({})", l)?;
+                write!(writer, "({l})")?;
             }
         } else {
             write!(writer, "typeid: {}", self.type_id)?;
@@ -61,7 +61,7 @@ impl ToHoverMarkdown for pgt_schema_cache::Column {
     ) -> Result<bool, std::fmt::Error> {
         if let Some(default) = &self.default_expr {
             writeln!(writer)?;
-            write!(writer, "Default: {}", default)?;
+            write!(writer, "Default: {default}")?;
             Ok(true)
         } else {
             Ok(false)