From b431985207c40bbe07dc88e8eb470d2eca97eb8c Mon Sep 17 00:00:00 2001 From: TomAFrench Date: Wed, 13 Sep 2023 17:19:51 +0000 Subject: [PATCH] chore: address clippy errors from nightly --- compiler/noirc_evaluator/src/ssa/ir/map.rs | 2 +- compiler/noirc_evaluator/src/ssa/opt/constant_folding.rs | 2 +- compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs | 4 +--- compiler/noirc_frontend/src/ast/statement.rs | 2 +- compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs | 2 +- compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs | 2 +- compiler/noirc_frontend/src/hir/def_map/mod.rs | 4 ++-- compiler/noirc_frontend/src/hir/type_check/mod.rs | 5 +---- 8 files changed, 9 insertions(+), 14 deletions(-) diff --git a/compiler/noirc_evaluator/src/ssa/ir/map.rs b/compiler/noirc_evaluator/src/ssa/ir/map.rs index 10d6adfbd6a..b6055973f1c 100644 --- a/compiler/noirc_evaluator/src/ssa/ir/map.rs +++ b/compiler/noirc_evaluator/src/ssa/ir/map.rs @@ -52,7 +52,7 @@ impl std::hash::Hash for Id { impl PartialOrd for Id { fn partial_cmp(&self, other: &Self) -> Option { - self.index.partial_cmp(&other.index) + Some(self.cmp(other)) } } diff --git a/compiler/noirc_evaluator/src/ssa/opt/constant_folding.rs b/compiler/noirc_evaluator/src/ssa/opt/constant_folding.rs index 9eda52e0475..e71e23d2032 100644 --- a/compiler/noirc_evaluator/src/ssa/opt/constant_folding.rs +++ b/compiler/noirc_evaluator/src/ssa/opt/constant_folding.rs @@ -125,7 +125,7 @@ impl Context { fn resolve_instruction( instruction_id: InstructionId, dfg: &DataFlowGraph, - constrained_values: &mut HashMap, + constrained_values: &HashMap, ) -> Instruction { let instruction = dfg[instruction_id].clone(); diff --git a/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs b/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs index 652869bdc9d..20250f5470e 100644 --- a/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs +++ b/compiler/noirc_evaluator/src/ssa/ssa_gen/mod.rs @@ -527,9 +527,7 @@ impl<'a> FunctionContext<'a> { ) -> Values { match expr { // If we're constraining an equality to be true then constrain the two sides directly. - Expression::Binary(Binary { lhs, operator, rhs, .. }) - if operator == &BinaryOpKind::Equal => - { + Expression::Binary(Binary { lhs, operator: BinaryOpKind::Equal, rhs, .. }) => { let lhs = self.codegen_non_tuple_expression(lhs); let rhs = self.codegen_non_tuple_expression(rhs); self.builder.set_location(location).insert_constrain(lhs, rhs, assert_message); diff --git a/compiler/noirc_frontend/src/ast/statement.rs b/compiler/noirc_frontend/src/ast/statement.rs index 51afa688082..3d9ab1e6ec4 100644 --- a/compiler/noirc_frontend/src/ast/statement.rs +++ b/compiler/noirc_frontend/src/ast/statement.rs @@ -125,7 +125,7 @@ impl PartialEq for Ident { impl PartialOrd for Ident { fn partial_cmp(&self, other: &Self) -> Option { - self.0.contents.partial_cmp(&other.0.contents) + Some(self.cmp(other)) } } diff --git a/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs b/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs index c55335e4443..11321d673a7 100644 --- a/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs +++ b/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs @@ -530,13 +530,13 @@ fn take_errors_filter_self_not_resolved(resolver: Resolver<'_>) -> Vec { &ident.0.contents != "Self" } _ => true, }) + .cloned() .collect() } diff --git a/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs b/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs index 2679059cebd..813c222319e 100644 --- a/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs +++ b/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs @@ -470,7 +470,7 @@ impl<'a> ModCollector<'a> { }; // Parse the AST for the module we just found and then recursively look for it's defs - let ast = parse_file(&mut context.file_manager, child_file_id, errors); + let ast = parse_file(&context.file_manager, child_file_id, errors); // Add module into def collector and get a ModuleId if let Some(child_mod_id) = diff --git a/compiler/noirc_frontend/src/hir/def_map/mod.rs b/compiler/noirc_frontend/src/hir/def_map/mod.rs index 4c7f241efaa..9a55fc3afd1 100644 --- a/compiler/noirc_frontend/src/hir/def_map/mod.rs +++ b/compiler/noirc_frontend/src/hir/def_map/mod.rs @@ -86,7 +86,7 @@ impl CrateDefMap { // First parse the root file. let root_file_id = context.crate_graph[crate_id].root_file_id; - let ast = parse_file(&mut context.file_manager, root_file_id, errors); + let ast = parse_file(&context.file_manager, root_file_id, errors); #[cfg(feature = "aztec")] let ast = aztec_library::transform(ast, &crate_id, context, errors); @@ -214,7 +214,7 @@ pub struct Contract { /// Given a FileId, fetch the File, from the FileManager and parse it's content pub fn parse_file( - fm: &mut FileManager, + fm: &FileManager, file_id: FileId, all_errors: &mut Vec, ) -> ParsedModule { diff --git a/compiler/noirc_frontend/src/hir/type_check/mod.rs b/compiler/noirc_frontend/src/hir/type_check/mod.rs index ea1793b7e76..a2f9361ad3a 100644 --- a/compiler/noirc_frontend/src/hir/type_check/mod.rs +++ b/compiler/noirc_frontend/src/hir/type_check/mod.rs @@ -90,10 +90,7 @@ pub fn type_check_func(interner: &mut NodeInterner, func_id: FuncId) -> Vec (noirc_errors::Span, bool) { +fn function_info(interner: &NodeInterner, function_body_id: &ExprId) -> (noirc_errors::Span, bool) { let (expr_span, empty_function) = if let HirExpression::Block(block) = interner.expression(function_body_id) { let last_stmt = block.statements().last();