From da0d1dd6d820fd9e0823c88756c0bb0744094e8a Mon Sep 17 00:00:00 2001 From: NotAFile Date: Tue, 5 Apr 2022 13:36:00 +0200 Subject: [PATCH] clippy fix --- src/builtin_cells.rs | 2 -- src/frontend.rs | 8 ++++---- src/frontend/types.rs | 6 +----- src/parser/adt.rs | 3 +-- src/parser/block_expression.rs | 5 ++--- src/parser/expression.rs | 2 +- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/builtin_cells.rs b/src/builtin_cells.rs index 37e7787..36e95b3 100644 --- a/src/builtin_cells.rs +++ b/src/builtin_cells.rs @@ -1,5 +1,3 @@ -use crate::frontend::types::TypeStruct; -use crate::frontend::Callable; use crate::rtlil; use crate::rtlil::SigSpec; diff --git a/src/frontend.rs b/src/frontend.rs index ad7bcab..c8378d8 100644 --- a/src/frontend.rs +++ b/src/frontend.rs @@ -347,7 +347,7 @@ impl Context { let mut new_type = callee_def.ret_type; - if genargs.len() != 0 { + if !genargs.is_empty() { // need to infer generic arguments for inf_res in inferred_args { match inf_res { @@ -370,7 +370,7 @@ impl Context { let mut new_expr = expr.clone(); new_expr.typ = new_type; new_expr.kind = typed_ir::ExprKind::Call(typed_ir::Call { - called: call.called.clone(), + called: call.called, args: args_typed, genargs, }); @@ -412,7 +412,7 @@ impl Context { let args = callsig .args .iter() - .map(|(name, typ)| { + .map(|(_name, typ)| { let mut out = String::new(); self.types.pretty_type(&mut out, *typ)?; Ok(out) @@ -421,7 +421,7 @@ impl Context { let genargs = callsig .genargs .iter() - .map(|(name, typ)| { + .map(|(_name, typ)| { let mut type_str = String::new(); self.types.pretty_type(&mut type_str, *typ)?; Ok(type_str) diff --git a/src/frontend/types.rs b/src/frontend/types.rs index c372854..c22edd5 100644 --- a/src/frontend/types.rs +++ b/src/frontend/types.rs @@ -246,11 +246,7 @@ impl TypingContext { match kind { TypeKind::ElabType(_) => todo!(), TypeKind::Logic(data) => { - if let ElabValue::Concrete(_) = data.value { - true - } else { - false - } + matches!(data.value, ElabValue::Concrete(_)) } TypeKind::UInt(_) => todo!(), TypeKind::Callable(_) => todo!(), diff --git a/src/parser/adt.rs b/src/parser/adt.rs index a52515c..518b820 100644 --- a/src/parser/adt.rs +++ b/src/parser/adt.rs @@ -1,4 +1,3 @@ -use super::declaration::{declaration, NetDecl}; use super::tokens::{token, Token, TokenKind as tk, TokenSpan}; use super::IResult; use nom::multi::separated_list0; @@ -31,7 +30,7 @@ fn state_variant(input: TokenSpan) -> IResult { )), )), |(name, param)| StateVariant { - name: name.clone(), + name, params: param, }, )(input) diff --git a/src/parser/block_expression.rs b/src/parser/block_expression.rs index cc3bc09..370f979 100644 --- a/src/parser/block_expression.rs +++ b/src/parser/block_expression.rs @@ -2,15 +2,14 @@ use nom::{ branch::alt, combinator::map, error::context, - multi::{many1, separated_list1}, + multi::separated_list1, sequence::{delimited, separated_pair, tuple}, }; use crate::parser::{ - assign_statement, expression, expression::{expression, Expression}, tokens::{token, TokenKind as tk, TokenSpan}, - Assign, IResult, Span, + IResult, }; #[derive(Debug, Clone)] diff --git a/src/parser/expression.rs b/src/parser/expression.rs index 5408544..3c02a9f 100644 --- a/src/parser/expression.rs +++ b/src/parser/expression.rs @@ -6,7 +6,7 @@ use nom::{ branch::alt, combinator::{map, opt}, multi::separated_list0, - sequence::{delimited, preceded, separated_pair, tuple}, + sequence::{delimited, tuple}, }; #[derive(Debug, Clone)]