From 5ea0dbf77a891df125d1b3ccc97f99c5e52899a1 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 13 Feb 2024 03:04:33 -0500
Subject: [PATCH] chore: some more clippy lints

---
 cli/src/generate/render.rs             | 20 ++++++++++----------
 cli/src/tests/helpers/query_helpers.rs |  6 +++---
 cli/src/util.rs                        |  1 +
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/cli/src/generate/render.rs b/cli/src/generate/render.rs
index d01811fc..f111ed08 100644
--- a/cli/src/generate/render.rs
+++ b/cli/src/generate/render.rs
@@ -346,12 +346,12 @@ impl Generator {
         for symbol in &self.parse_table.symbols {
             if *symbol != Symbol::end() {
                 self.symbol_order.insert(*symbol, i);
-                add_line!(self, "{} = {},", self.symbol_ids[&symbol], i);
+                add_line!(self, "{} = {},", self.symbol_ids[symbol], i);
                 i += 1;
             }
         }
         for alias in &self.unique_aliases {
-            add_line!(self, "{} = {},", self.alias_ids[&alias], i);
+            add_line!(self, "{} = {},", self.alias_ids[alias], i);
             i += 1;
         }
         dedent!(self);
@@ -370,13 +370,13 @@ impl Generator {
                         alias.value.as_str()
                     }),
             );
-            add_line!(self, "[{}] = \"{}\",", self.symbol_ids[&symbol], name);
+            add_line!(self, "[{}] = \"{}\",", self.symbol_ids[symbol], name);
         }
         for alias in &self.unique_aliases {
             add_line!(
                 self,
                 "[{}] = \"{}\",",
-                self.alias_ids[&alias],
+                self.alias_ids[alias],
                 self.sanitize_string(&alias.value)
             );
         }
@@ -401,8 +401,8 @@ impl Generator {
             add_line!(
                 self,
                 "[{}] = {},",
-                self.alias_ids[&alias],
-                self.alias_ids[&alias],
+                self.alias_ids[alias],
+                self.alias_ids[alias],
             );
         }
 
@@ -446,7 +446,7 @@ impl Generator {
         );
         indent!(self);
         for symbol in &self.parse_table.symbols {
-            add_line!(self, "[{}] = {{", self.symbol_ids[&symbol]);
+            add_line!(self, "[{}] = {{", self.symbol_ids[symbol]);
             indent!(self);
             if let Some(Alias { is_named, .. }) = self.default_aliases.get(symbol) {
                 add_line!(self, ".visible = true,");
@@ -478,7 +478,7 @@ impl Generator {
             add_line!(self, "}},");
         }
         for alias in &self.unique_aliases {
-            add_line!(self, "[{}] = {{", self.alias_ids[&alias]);
+            add_line!(self, "[{}] = {{", self.alias_ids[alias]);
             indent!(self);
             add_line!(self, ".visible = true,");
             add_line!(self, ".named = {},", alias.is_named);
@@ -510,7 +510,7 @@ impl Generator {
             indent!(self);
             for (j, alias) in production_info.alias_sequence.iter().enumerate() {
                 if let Some(alias) = alias {
-                    add_line!(self, "[{}] = {},", j, self.alias_ids[&alias]);
+                    add_line!(self, "[{}] = {},", j, self.alias_ids[alias]);
                 }
             }
             dedent!(self);
@@ -554,7 +554,7 @@ impl Generator {
         indent!(self);
         for (symbol, alias_ids) in alias_ids_by_symbol {
             let symbol_id = &self.symbol_ids[symbol];
-            let public_symbol_id = &self.symbol_ids[&self.symbol_map[&symbol]];
+            let public_symbol_id = &self.symbol_ids[&self.symbol_map[symbol]];
             add_line!(self, "{symbol_id}, {},", 1 + alias_ids.len());
             indent!(self);
             add_line!(self, "{public_symbol_id},");
diff --git a/cli/src/tests/helpers/query_helpers.rs b/cli/src/tests/helpers/query_helpers.rs
index 2f157489..608d4914 100644
--- a/cli/src/tests/helpers/query_helpers.rs
+++ b/cli/src/tests/helpers/query_helpers.rs
@@ -263,11 +263,11 @@ impl Pattern {
     }
 }
 
-impl ToString for Pattern {
-    fn to_string(&self) -> String {
+impl std::fmt::Display for Pattern {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let mut result = String::new();
         self.write_to_string(&mut result, 0);
-        result
+        write!(f, "{result}")
     }
 }
 
diff --git a/cli/src/util.rs b/cli/src/util.rs
index 4ac9a082..fd4f4699 100644
--- a/cli/src/util.rs
+++ b/cli/src/util.rs
@@ -22,6 +22,7 @@ svg { width: 100%; }
 
 ";
 
+#[must_use]
 pub fn lang_not_found_for_path(path: &Path, loader_config: &LoaderConfig) -> String {
     let path = path.display();
     format!(