Appease two remaining Clippy lints (#689)

Part of #155 

Leaving the `needless_return` for a dedicated PR.

Author: Xanewok

.cargo/config.toml

@@ -6,17 +6,13 @@ incremental = true
 lto = true
 
 [build]
+# TODO: Replace with `[lints]` once we upgrade to Rust 1.74
+# https://blog.rust-lang.org/2023/11/16/Rust-1.74.0.html#lint-configuration-through-cargo
 rustflags = [
 	# rustc additional warnings:
 	"--warn",
 	"unused_crate_dependencies",
 	# clippy additional warnings:
 	"--warn",
 	"clippy::wildcard_imports",
-	# This is a list of allowed Clippy rules for the purposes of gradual migration.
-	# See https://github.com/NomicFoundation/slang/pull/626
-	"-A",
-	"clippy::comparison_chain",
-	"-A",
-	"clippy::should_implement_trait",
 ]

crates/codegen/parser/runtime/src/napi/napi_cursor.rs

@@ -33,6 +33,7 @@ impl Cursor {
     }
 
     #[napi]
+    #[allow(clippy::should_implement_trait)] // These are meant to be explicitly exposed to NAPI
     pub fn clone(&self) -> Self {
         Self(self.0.clone())
     }

crates/codegen/parser/runtime/src/support/context.rs

@@ -92,6 +92,7 @@ impl<'s> ParserContext<'s> {
         self.source[self.position.utf8..].chars().next()
     }
 
+    #[allow(clippy::should_implement_trait)]
     pub fn next(&mut self) -> Option<char> {
         self.undo_position = Some(self.position);
 

crates/solidity/outputs/cargo/crate/src/generated/napi/napi_cursor.rs

@@ -46,9 +46,7 @@ pub fn run(parser_name: &str, test_name: &str) -> Result<()> {
         let errors = output
             .errors()
             .iter()
-            .map(|error| {
-                error.to_error_report(source_id, &source, /* with_color */ false)
-            })
+            .map(|error| error.to_error_report(source_id, &source, /* with_color */ false))
             .collect();
 
         let cursor = output.create_tree_cursor();

crates/solidity/outputs/cargo/crate/src/generated/support/context.rs

@@ -67,27 +67,33 @@ impl Reporter {
 
         let failures_before_update = self.failed_tests.fetch_add(1, Ordering::Relaxed);
 
-        if failures_before_update < Self::MAX_PRINTED_FAILURES {
-            let reports = errors
-                .iter()
-                .take(Self::MAX_PRINTED_FAILURES - failures_before_update)
-                .map(|error| error.to_error_report(source_id, source, /* with_color */ true))
-                .collect::<Vec<String>>();
-
-            self.progress_bar.suspend(|| {
-                for report in reports {
+        match Self::MAX_PRINTED_FAILURES.checked_sub(failures_before_update) {
+            None => { /* Don't print more errors */ }
+            Some(0) => {
+                self.progress_bar.suspend(|| {
                     eprintln!();
-                    eprintln!("[{version}] {report}");
-                }
-            });
-        } else if failures_before_update == Self::MAX_PRINTED_FAILURES {
-            self.progress_bar.suspend(|| {
-                eprintln!();
-                eprintln!(
-                    "More than {max_failures} tests failed. Further errors will not be shown.",
-                    max_failures = Self::MAX_PRINTED_FAILURES
-                );
-            });
+                    eprintln!(
+                        "More than {max_failures} tests failed. Further errors will not be shown.",
+                        max_failures = Self::MAX_PRINTED_FAILURES
+                    );
+                });
+            }
+            Some(remaining) => {
+                let reports: Vec<_> = errors
+                    .iter()
+                    .take(remaining)
+                    .map(|error| {
+                        error.to_error_report(source_id, source, /* with_color */ true)
+                    })
+                    .collect();
+
+                self.progress_bar.suspend(|| {
+                    for report in reports {
+                        eprintln!();
+                        eprintln!("[{version}] {report}");
+                    }
+                });
+            }
         }
     }
 }