Fix clippy lints

sharkdp · Mar 21, 2024 · 48f3048 · 48f3048
1 parent b070b88
commit 48f3048
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 27 deletions.
diff --git a/numbat-cli/src/completer.rs b/numbat-cli/src/completer.rs
@@ -1,10 +1,7 @@
 use std::sync::{Arc, Mutex};
 
 use numbat::{unicode_input::UNICODE_INPUT, Context};
-use rustyline::{
-    self,
-    completion::{extract_word, Completer, Pair},
-};
+use rustyline::completion::{extract_word, Completer, Pair};
 
 pub struct NumbatCompleter {
     pub context: Arc<Mutex<Context>>,

diff --git a/numbat-cli/src/main.rs b/numbat-cli/src/main.rs
@@ -22,8 +22,7 @@ use anyhow::{bail, Context as AnyhowContext, Result};
 use clap::Parser;
 use rustyline::config::Configurer;
 use rustyline::{
-    self, error::ReadlineError, history::DefaultHistory, Completer, Editor, Helper, Hinter,
-    Validator,
+    error::ReadlineError, history::DefaultHistory, Completer, Editor, Helper, Hinter, Validator,
 };
 use rustyline::{EventHandler, Highlighter, KeyCode, KeyEvent, Modifiers};
 

diff --git a/numbat-wasm/src/jquery_terminal_formatter.rs b/numbat-wasm/src/jquery_terminal_formatter.rs
@@ -11,13 +11,13 @@ pub fn jt_format(class: Option<&str>, content: &str) -> String {
     }
 
     let content = html_escape::encode_text(content)
-        .replace("[", "&#91;")
-        .replace("]", "&#93;");
+        .replace('[', "&#91;")
+        .replace(']', "&#93;");
 
     if let Some(class) = class {
         format!("[[;;;hl-{class}]{content}]")
     } else {
-        content.into()
+        content
     }
 }
 
@@ -68,19 +68,19 @@ impl std::io::Write for JqueryTerminalWriter {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
         if let Some(color) = &self.color {
             if color.fg() == Some(&Color::Red) {
-                self.buffer.write("[[;;;hl-diagnostic-red]".as_bytes())?;
+                self.buffer.write_all("[[;;;hl-diagnostic-red]".as_bytes())?;
                 let size = self.buffer.write(buf)?;
-                self.buffer.write("]".as_bytes())?;
+                self.buffer.write_all("]".as_bytes())?;
                 Ok(size)
             } else if color.fg() == Some(&Color::Blue) {
-                self.buffer.write("[[;;;hl-diagnostic-blue]".as_bytes())?;
+                self.buffer.write_all("[[;;;hl-diagnostic-blue]".as_bytes())?;
                 let size = self.buffer.write(buf)?;
-                self.buffer.write("]".as_bytes())?;
+                self.buffer.write_all("]".as_bytes())?;
                 Ok(size)
             } else if color.bold() {
-                self.buffer.write("[[;;;hl-diagnostic-bold]".as_bytes())?;
+                self.buffer.write_all("[[;;;hl-diagnostic-bold]".as_bytes())?;
                 let size = self.buffer.write(buf)?;
-                self.buffer.write("]".as_bytes())?;
+                self.buffer.write_all("]".as_bytes())?;
                 Ok(size)
             } else {
                 self.buffer.write(buf)

diff --git a/numbat-wasm/src/lib.rs b/numbat-wasm/src/lib.rs
@@ -79,7 +79,7 @@ impl Numbat {
             FormatType::JqueryTerminal => Box::new(JqueryTerminalFormatter {}),
             FormatType::Html => Box::new(HtmlFormatter {}),
         };
-        fmt.format(&markup, indent).into()
+        fmt.format(markup, indent)
     }
 
     pub fn interpret(&mut self, code: &str) -> InterpreterOutput {
@@ -102,7 +102,7 @@ impl Numbat {
 
         match self
             .ctx
-            .interpret_with_settings(&mut settings, &code, CodeSource::Text)
+            .interpret_with_settings(&mut settings, code, CodeSource::Text)
         {
             Ok((statements, result)) => {
                 // Pretty print

diff --git a/numbat/src/ffi.rs b/numbat/src/ffi.rs
@@ -914,7 +914,7 @@ fn from_unixtime(args: &[Value]) -> Result<Value> {
 }
 
 fn random(args: &[Value]) -> Result<Value> {
-    assert!(args.len() == 0);
+    assert!(args.is_empty());
 
     let output = rand::random::<f64>();
 

diff --git a/numbat/src/lib.rs b/numbat/src/lib.rs
@@ -101,7 +101,7 @@ pub struct Context {
 }
 
 impl Context {
-    pub fn new(module_importer: impl ModuleImporter + Send + Sync + 'static) -> Self {
+    pub fn new(module_importer: impl ModuleImporter + 'static) -> Self {
         Context {
             prefix_transformer: Transformer::new(),
             typechecker: TypeChecker::default(),

diff --git a/numbat/src/parser.rs b/numbat/src/parser.rs
@@ -1142,7 +1142,7 @@ impl<'a> Parser<'a> {
         } else if let Some(token) = self.match_exact(TokenKind::StringInterpolationStart) {
             let mut parts = Vec::new();
 
-            self.interpolation(&mut parts, &token)?;
+            self.interpolation(&mut parts, token)?;
 
             let mut span_full_string = token.span;
             let mut has_end = false;
@@ -1153,7 +1153,7 @@ impl<'a> Parser<'a> {
                 span_full_string = span_full_string.extend(&inner_token.span);
                 match inner_token.kind {
                     TokenKind::StringInterpolationMiddle => {
-                        self.interpolation(&mut parts, &inner_token)?;
+                        self.interpolation(&mut parts, inner_token)?;
                     }
                     TokenKind::StringInterpolationEnd => {
                         parts.push(StringPart::Fixed(strip_first_and_last(&inner_token.lexeme)));

diff --git a/numbat/src/resolver.rs b/numbat/src/resolver.rs
@@ -53,7 +53,7 @@ pub struct Resolver {
 }
 
 impl Resolver {
-    pub(crate) fn new(importer: impl ModuleImporter + Send + 'static) -> Self {
+    pub(crate) fn new(importer: impl ModuleImporter + 'static) -> Self {
         Self {
             importer: Arc::new(importer),
             files: SimpleFiles::new(),
@@ -136,10 +136,7 @@ impl Resolver {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        ast::{Expression, Statement},
-        number::Number,
-    };
+    use crate::{ast::Expression, number::Number};
 
     use super::*;
 

diff --git a/numbat/src/tokenizer.rs b/numbat/src/tokenizer.rs
@@ -694,6 +694,7 @@ pub fn tokenize(input: &str, code_source_id: usize) -> Result<Vec<Token>> {
 }
 
 #[cfg(test)]
+#[allow(clippy::type_complexity)]
 fn tokenize_reduced(input: &str) -> Result<Vec<(String, TokenKind, (u32, u32))>, String> {
     Ok(tokenize(input, 0)
         .map_err(|e| {

diff --git a/numbat/src/typechecker.rs b/numbat/src/typechecker.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::result_large_err)]
 use std::{
     collections::{HashMap, HashSet},
     error::Error,

diff --git a/numbat/src/value.rs b/numbat/src/value.rs
@@ -99,7 +99,7 @@ impl PrettyPrint for Value {
             Value::String(s) => s.pretty_print(),
             Value::DateTime(dt) => crate::markup::string(crate::datetime::to_rfc2822_save(dt)),
             Value::FunctionReference(r) => crate::markup::string(r.to_string()),
-            Value::FormatSpecifiers(Some(s)) => crate::markup::string(s.to_string()),
+            Value::FormatSpecifiers(Some(s)) => crate::markup::string(s),
             Value::FormatSpecifiers(None) => crate::markup::empty(),
         }
     }