From 1c2ccefb49cb55fa470209a76acd31d3b61ef1aa Mon Sep 17 00:00:00 2001 From: Jan Ferdinand Sauer Date: Sat, 8 Jun 2024 09:09:52 +0200 Subject: [PATCH] style: Enable additional lints --- Cargo.toml | 6 ++++++ .../src/codegen/tasm.rs | 1 + triton-vm/src/error.rs | 2 +- triton-vm/src/parser.rs | 8 ++++---- triton-vm/src/profiler.rs | 3 +++ triton-vm/src/program.rs | 15 +++++++-------- triton-vm/src/table/ram_table.rs | 4 ++-- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 40fbe364..4b651a07 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -99,13 +99,19 @@ range_plus_one = "warn" redundant_else = "warn" ref_binding_to_reference = "warn" ref_option_ref = "warn" +return_self_not_must_use = "warn" same_functions_in_if_condition = "warn" should_panic_without_expect = "warn" stable_sort_primitive = "warn" +struct_field_names = "warn" +trivially_copy_pass_by_ref = "warn" unchecked_duration_subtraction = "warn" +uninlined_format_args = "warn" unnecessary_box_returns = "warn" unnecessary_join = "warn" unnecessary_wraps = "warn" +unnested_or_patterns = "warn" +unreadable_literal = "warn" unused_async = "warn" used_underscore_binding = "warn" verbose_bit_mask = "warn" diff --git a/constraint-evaluation-generator/src/codegen/tasm.rs b/constraint-evaluation-generator/src/codegen/tasm.rs index 40d2f465..ef0dcfee 100644 --- a/constraint-evaluation-generator/src/codegen/tasm.rs +++ b/constraint-evaluation-generator/src/codegen/tasm.rs @@ -89,6 +89,7 @@ impl Codegen for TasmBackend { quote!( #uses #[doc = #doc_comment] + #[allow(clippy::unreadable_literal)] pub fn air_constraint_evaluation_tasm( mem_layout: TasmConstraintEvaluationMemoryLayout, ) -> Vec { diff --git a/triton-vm/src/error.rs b/triton-vm/src/error.rs index b625b76a..7f6ec9f9 100644 --- a/triton-vm/src/error.rs +++ b/triton-vm/src/error.rs @@ -427,6 +427,6 @@ mod tests { let program = triton_program!(push 4294967297 push 1 and halt); let_assert!(Err(err) = program.run([].into(), [].into())); let_assert!(InstructionError::FailedU32Conversion(element) = err.source); - assert!(4294967297 == element.value()); + assert!(4_294_967_297 == element.value()); } } diff --git a/triton-vm/src/parser.rs b/triton-vm/src/parser.rs index fb1d6365..563dfe49 100644 --- a/triton-vm/src/parser.rs +++ b/triton-vm/src/parser.rs @@ -89,7 +89,7 @@ pub fn pretty_print_error(s: &str, mut e: VerboseError<&str>) -> String { let (_root_s, root_error) = e.errors[0].clone(); if matches!( root_error, - VerboseErrorKind::Nom(ErrorKind::Fail) | VerboseErrorKind::Nom(ErrorKind::Eof) + VerboseErrorKind::Nom(ErrorKind::Fail | ErrorKind::Eof) ) { e.errors.remove(0); } @@ -510,7 +510,7 @@ fn label_addr(s_orig: &str) -> ParseResult { } let (s, addr_part_1) = take_while(is_label_char)(s)?; - Ok((s, format!("{}{}", addr_part_0, addr_part_1))) + Ok((s, format!("{addr_part_0}{addr_part_1}"))) } fn is_label_start_char(c: char) -> bool { @@ -620,7 +620,7 @@ fn type_hint_variable_name(s: &str) -> ParseResult { let (s, variable_name_start) = take_while1(is_type_hint_variable_name_start_character)(s)?; let (s, variable_name_end) = take_while(is_type_hint_variable_name_character)(s)?; let (s, _) = whitespace0(s)?; - let variable_name = format!("{}{}", variable_name_start, variable_name_end); + let variable_name = format!("{variable_name_start}{variable_name_end}"); Ok((s, variable_name)) } @@ -632,7 +632,7 @@ fn type_hint_type_name(s: &str) -> ParseResult> { let (s, type_name_start) = take_while1(is_type_hint_type_name_start_character)(s)?; let (s, type_name_end) = take_while(is_type_hint_type_name_character)(s)?; let (s, _) = whitespace0(s)?; - let type_name = format!("{}{}", type_name_start, type_name_end); + let type_name = format!("{type_name_start}{type_name_end}"); Ok((s, Some(type_name))) } diff --git a/triton-vm/src/profiler.rs b/triton-vm/src/profiler.rs index fc49d684..c97084e3 100644 --- a/triton-vm/src/profiler.rs +++ b/triton-vm/src/profiler.rs @@ -416,16 +416,19 @@ pub struct VMPerformanceProfile { } impl VMPerformanceProfile { + #[must_use] pub fn with_cycle_count(mut self, cycle_count: usize) -> Self { self.cycle_count = Some(cycle_count); self } + #[must_use] pub fn with_padded_height(mut self, padded_height: usize) -> Self { self.padded_height = Some(padded_height); self } + #[must_use] pub fn with_fri_domain_len(mut self, fri_domain_len: usize) -> Self { self.fri_domain_len = Some(fri_domain_len); self diff --git a/triton-vm/src/program.rs b/triton-vm/src/program.rs index 95447d7c..a1c6bd11 100644 --- a/triton-vm/src/program.rs +++ b/triton-vm/src/program.rs @@ -963,14 +963,13 @@ mod tests { let program = triton_program!(halt); let digest = program.hash::(); - let expected_digest = [ - 4843866011885844809, - 16618866032559590857, - 18247689143239181392, - 7637465675240023996, - 9104890367162237026, - ] - .map(BFieldElement::new); + let expected_digest = bfe_array![ + 0x4338_de79_520b_3949_u64, + 0xe6a2_129b_2885_0dc9_u64, + 0xfd3c_d098_6a86_0450_u64, + 0x69fd_ba91_0ceb_a7bc_u64, + 0x7e5b_118c_9594_c062_u64, + ]; let expected_digest = Digest::new(expected_digest); assert!(expected_digest == digest); diff --git a/triton-vm/src/table/ram_table.rs b/triton-vm/src/table/ram_table.rs index 98957431..91ace01f 100644 --- a/triton-vm/src/table/ram_table.rs +++ b/triton-vm/src/table/ram_table.rs @@ -661,8 +661,8 @@ pub(crate) mod tests { let rp = [1, 2, 3].map(BFieldElement::new); let (a, b) = RamTable::bezout_coefficient_polynomials_coefficients(&rp); - let expected_a = [0x9, 0x7fffffff7ffffffc, 0x0].map(BFieldElement::new); - let expected_b = [0x5, 0xfffffffefffffffb, 0x7fffffff80000002].map(BFieldElement::new); + let expected_a = [9, 0x7fff_ffff_7fff_fffc, 0].map(BFieldElement::new); + let expected_b = [5, 0xffff_fffe_ffff_fffb, 0x7fff_ffff_8000_0002].map(BFieldElement::new); assert_eq!(expected_a, *a); assert_eq!(expected_b, *b);