fix clippy lints

Author: elkowar

Cargo.toml

@@ -13,7 +13,6 @@ regex = "1"
 itertools = "0.10"
 thiserror = "1.0"
 maplit = "1.0"
-codespan-reporting = "0.11"
 logos = "0.12"
 
 serde = {version = "1.0", features = ["derive"]}

examples/errors.rs

@@ -5,20 +5,6 @@ use serde::{Deserialize, Serialize};
 #[derive(Eq, PartialEq, Clone, Copy, Serialize, Deserialize)]
 pub struct Span(pub usize, pub usize);
 
-pub trait MaybeSpanned {
-    fn try_span(&self) -> Option<Span>;
-}
-
-impl MaybeSpanned for Span {
-    fn try_span(&self) -> Option<Span> {
-        Some(*self)
-    }
-}
-
-pub fn span_between(a: impl MaybeSpanned, b: impl MaybeSpanned) -> Option<Span> {
-    Some(Span(a.try_span()?.0, b.try_span()?.1))
-}
-
 impl std::fmt::Display for Span {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}..{}", self.0, self.1)
@@ -65,11 +51,6 @@ pub enum SimplExpr {
     JsonAccess(Span, Box<SimplExpr>, Box<SimplExpr>),
     FunctionCall(Span, String, Vec<SimplExpr>),
 }
-impl MaybeSpanned for SimplExpr {
-    fn try_span(&self) -> Option<Span> {
-        Some(self.span())
-    }
-}
 
 impl std::fmt::Display for SimplExpr {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

src/ast.rs

@@ -1,4 +1,4 @@
-use crate::ast::{MaybeSpanned, Span};
+use crate::ast::Span;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use std::{convert::TryFrom, fmt, iter::FromIterator};
@@ -26,12 +26,6 @@ impl ConversionError {
 #[derive(Clone, Deserialize, Serialize, Default, Eq)]
 pub struct DynVal(pub String, pub Option<Span>);
 
-impl MaybeSpanned for DynVal {
-    fn try_span(&self) -> Option<Span> {
-        self.1
-    }
-}
-
 impl From<String> for DynVal {
     fn from(s: String) -> Self {
         DynVal(s, None)
@@ -98,7 +92,7 @@ impl_try_from!(impl From<DynVal> {
     for f64 => |x| x.as_f64();
     for i32 => |x| x.as_i32();
     for bool => |x| x.as_bool();
-    for Vec<String> => |x| x.as_vec();
+    //for Vec<String> => |x| x.as_vec();
 });
 
 impl_primval_from!(bool, i32, u32, f32, u8, f64, &str);
@@ -145,26 +139,24 @@ impl DynVal {
         self.0.parse().map_err(|e| ConversionError::new(self.clone(), "bool", Box::new(e)))
     }
 
-    pub fn as_vec(&self) -> Result<Vec<String>> {
-        match self.0.strip_prefix('[').and_then(|x| x.strip_suffix(']')) {
-            Some(content) => {
-                let mut items: Vec<String> = content.split(',').map(|x: &str| x.to_string()).collect();
-                let mut removed = 0;
-                for times_ran in 0..items.len() {
-                    // escapes `,` if there's a `\` before em
-                    if items[times_ran - removed].ends_with('\\') {
-                        items[times_ran - removed].pop();
-                        let it = items.remove((times_ran + 1) - removed);
-                        items[times_ran - removed] += ",";
-                        items[times_ran - removed] += &it;
-                        removed += 1;
-                    }
-                }
-                Ok(items)
-            }
-            None => Err(ConversionError { value: self.clone(), target_type: "vec", source: None }),
-        }
-    }
+    // pub fn as_vec(&self) -> Result<Vec<String>> {
+    // match self.0.strip_prefix('[').and_then(|x| x.strip_suffix(']')) {
+    // Some(content) => {
+    // let mut items: Vec<String> = content.split(',').map(|x: &str| x.to_string()).collect();
+    // let mut removed = 0;
+    // for times_ran in 0..items.len() {
+    //// escapes `,` if there's a `\` before em
+    // if items[times_ran - removed].ends_with('\\') {
+    // items[times_ran - removed].pop();
+    // let it = items.remove((times_ran + 1) - removed);
+    // items[times_ran - removed] += ",";
+    // items[times_ran - removed] += &it;
+    // removed += 1;
+    //}
+    // Ok(items)
+    //}
+    // None => Err(ConversionError { value: self.clone(), target_type: "vec", source: None }),
+    //}
 
     pub fn as_json_value(&self) -> Result<serde_json::Value> {
         serde_json::from_str::<serde_json::Value>(&self.0)

src/dynval.rs

@@ -3,7 +3,6 @@ use crate::{
     dynval,
     parser::lexer::{self, LexicalError},
 };
-use codespan_reporting::diagnostic;
 
 pub type Result<T> = std::result::Result<T, Error>;
 #[derive(thiserror::Error, Debug)]
@@ -42,32 +41,6 @@ impl Error {
             _ => None,
         }
     }
-
-    pub fn pretty_diagnostic(&self) -> diagnostic::Diagnostic<usize> {
-        let diag = diagnostic::Diagnostic::error().with_message(format!("{}", self));
-        if let Some(span) = self.get_span() {
-            diag.with_labels(vec![diagnostic::Label::primary(0, span.0..span.1)])
-        } else {
-            diag
-        }
-    }
-}
-
-pub trait ErrorExt {
-    fn at(self, span: Span) -> Error;
-}
-impl ErrorExt for Box<dyn std::error::Error> {
-    fn at(self, span: Span) -> Error {
-        Error::Spanned(span, self)
-    }
-}
-pub trait ResultExt<T> {
-    fn at(self, span: Span) -> std::result::Result<T, Error>;
-}
-impl<T, E: std::error::Error + 'static> ResultExt<T> for std::result::Result<T, E> {
-    fn at(self, span: Span) -> std::result::Result<T, Error> {
-        self.map_err(|x| Error::Spanned(span, Box::new(x)))
-    }
 }
 
 fn get_parse_error_span(err: &lalrpop_util::ParseError<usize, lexer::Token, lexer::LexicalError>) -> Option<Span> {

src/error.rs

@@ -51,7 +51,7 @@ type VarName = String;
 
 pub trait FunctionSource {
     type Err;
-    fn run_fn(&self, name: &str, args: &Vec<DynVal>) -> Result<DynVal, Self::Err>;
+    fn run_fn(&self, name: &str, args: &[DynVal]) -> Result<DynVal, Self::Err>;
 }
 
 impl SimplExpr {
@@ -139,6 +139,7 @@ impl SimplExpr {
                     BinOp::Mod => DynVal::from(a.as_f64()? % b.as_f64()?),
                     BinOp::GT => DynVal::from(a.as_f64()? > b.as_f64()?),
                     BinOp::LT => DynVal::from(a.as_f64()? < b.as_f64()?),
+                    #[allow(clippy::useless_conversion)]
                     BinOp::Elvis => DynVal::from(if a.0.is_empty() { b } else { a }),
                     BinOp::RegexMatch => {
                         let regex = regex::Regex::new(&b.as_string()?)?;

src/eval.rs

@@ -9,7 +9,10 @@ pub mod parser;
 use ast::SimplExpr;
 use lalrpop_util::lalrpop_mod;
 
-lalrpop_mod!(pub simplexpr_parser);
+lalrpop_mod!(
+    #[allow(clippy::all)]
+    pub simplexpr_parser
+);
 
 pub fn parse_string(s: &str) -> Result<SimplExpr, error::Error> {
     parser::parse_string(s)

src/lib.rs

@@ -9,7 +9,7 @@ use crate::{
 pub fn parse_string(s: &str) -> Result<SimplExpr> {
     let lexer = lexer::Lexer::new(s);
     let parser = crate::simplexpr_parser::ExprParser::new();
-    Ok(parser.parse(lexer).map_err(|e| Error::from_parse_error(e))?)
+    parser.parse(lexer).map_err(Error::from_parse_error)
 }
 
 #[cfg(test)]