From 16734ec7e42f440d30add63358a901fc3b401f2d Mon Sep 17 00:00:00 2001 From: bakaq Date: Fri, 6 Sep 2024 18:54:37 -0300 Subject: [PATCH] Fix Clippy --- build/instructions_template.rs | 49 +++++++++++++++++---------------- build/static_string_indexing.rs | 2 -- src/codegen.rs | 6 ++-- src/machine/compile.rs | 7 ++--- src/machine/dispatch.rs | 4 +-- src/machine/partial_string.rs | 3 +- src/machine/system_calls.rs | 2 +- src/parser/ast.rs | 3 +- 8 files changed, 37 insertions(+), 39 deletions(-) diff --git a/build/instructions_template.rs b/build/instructions_template.rs index b74afdc39..5e64f3d79 100644 --- a/build/instructions_template.rs +++ b/build/instructions_template.rs @@ -137,7 +137,7 @@ enum InlinedClauseType { #[allow(dead_code)] #[derive(ToDeriveInput, EnumDiscriminants)] #[strum_discriminants(derive(EnumProperty, EnumString))] -enum REPLCodePtr { +enum ReplCodePtr { #[strum_discriminants(strum(props(Arity = "4", Name = "$add_discontiguous_predicate")))] AddDiscontiguousPredicate, #[strum_discriminants(strum(props(Arity = "4", Name = "$add_dynamic_predicate")))] @@ -534,7 +534,7 @@ enum SystemClauseType { #[strum_discriminants(strum(props(Arity = "2", Name = "$shell")))] Shell, #[strum_discriminants(strum(props(Arity = "1", Name = "$pid")))] - PID, + Pid, #[strum_discriminants(strum(props(Arity = "4", Name = "$chars_base64")))] CharsBase64, #[strum_discriminants(strum(props(Arity = "1", Name = "$devour_whitespace")))] @@ -608,7 +608,7 @@ enum SystemClauseType { InferenceLimitExceeded, #[strum_discriminants(strum(props(Arity = "1", Name = "$argv")))] Argv, - REPL(REPLCodePtr), + Repl(ReplCodePtr), } #[allow(dead_code)] @@ -811,7 +811,7 @@ fn derive_input(ty: &Type) -> Option { let system_clause_type: Type = parse_quote! { SystemClauseType }; let compare_term_type: Type = parse_quote! { CompareTerm }; let compare_number_type: Type = parse_quote! { CompareNumber }; - let repl_code_ptr_type: Type = parse_quote! { REPLCodePtr }; + let repl_code_ptr_type: Type = parse_quote! { ReplCodePtr }; if ty == &clause_type { Some(ClauseType::to_derive_input()) @@ -826,7 +826,7 @@ fn derive_input(ty: &Type) -> Option { } else if ty == &compare_term_type { Some(CompareTerm::to_derive_input()) } else if ty == &repl_code_ptr_type { - Some(REPLCodePtr::to_derive_input()) + Some(ReplCodePtr::to_derive_input()) } else { None } @@ -983,6 +983,7 @@ fn generate_instruction_preface() -> TokenStream { } /// `IndexingInstruction` cf. page 110 of wambook. + #[allow(clippy::enum_variant_names)] #[derive(Clone, Debug)] pub enum IndexingInstruction { // The first index is the optimal argument being indexed. @@ -1867,7 +1868,7 @@ fn generate_instruction_preface() -> TokenStream { &Instruction::CallSetEnv | &Instruction::CallUnsetEnv | &Instruction::CallShell | - &Instruction::CallPID | + &Instruction::CallPid | &Instruction::CallCharsBase64 | &Instruction::CallDevourWhitespace | &Instruction::CallIsSTOEnabled | @@ -2104,7 +2105,7 @@ fn generate_instruction_preface() -> TokenStream { &Instruction::ExecuteSetEnv | &Instruction::ExecuteUnsetEnv | &Instruction::ExecuteShell | - &Instruction::ExecutePID | + &Instruction::ExecutePid | &Instruction::ExecuteCharsBase64 | &Instruction::ExecuteDevourWhitespace | &Instruction::ExecuteIsSTOEnabled | @@ -2357,7 +2358,7 @@ pub fn generate_instructions_rs() -> TokenStream { let builtin_type_variants = attributeless_enum::(); let inlined_type_variants = attributeless_enum::(); let system_clause_type_variants = attributeless_enum::(); - let repl_code_ptr_variants = attributeless_enum::(); + let repl_code_ptr_variants = attributeless_enum::(); let compare_number_variants = attributeless_enum::(); let compare_term_variants = attributeless_enum::(); @@ -2708,14 +2709,14 @@ pub fn generate_instructions_rs() -> TokenStream { clause_type_from_name_and_arity_arms.push(if !variant_fields.is_empty() { quote! { - (atom!(#name), #arity) => ClauseType::System(SystemClauseType::REPL( - REPLCodePtr::#ident(#(#variant_fields),*) + (atom!(#name), #arity) => ClauseType::System(SystemClauseType::Repl( + ReplCodePtr::#ident(#(#variant_fields),*) )) } } else { quote! { - (atom!(#name), #arity) => ClauseType::System(SystemClauseType::REPL( - REPLCodePtr::#ident + (atom!(#name), #arity) => ClauseType::System(SystemClauseType::Repl( + ReplCodePtr::#ident )) } }); @@ -2723,13 +2724,13 @@ pub fn generate_instructions_rs() -> TokenStream { clause_type_name_arms.push(if !variant_fields.is_empty() { quote! { ClauseType::System( - SystemClauseType::REPL(REPLCodePtr::#ident(..)) + SystemClauseType::Repl(ReplCodePtr::#ident(..)) ) => atom!(#name) } } else { quote! { ClauseType::System( - SystemClauseType::REPL(REPLCodePtr::#ident) + SystemClauseType::Repl(ReplCodePtr::#ident) ) => atom!(#name) } }); @@ -2743,14 +2744,14 @@ pub fn generate_instructions_rs() -> TokenStream { clause_type_to_instr_arms.push(if !variant_fields.is_empty() { quote! { - ClauseType::System(SystemClauseType::REPL( - REPLCodePtr::#ident(#(#placeholder_ids),*) + ClauseType::System(SystemClauseType::Repl( + ReplCodePtr::#ident(#(#placeholder_ids),*) )) => Instruction::#instr_ident(#(*#placeholder_ids),*) } } else { quote! { - ClauseType::System(SystemClauseType::REPL( - REPLCodePtr::#ident + ClauseType::System(SystemClauseType::Repl( + ReplCodePtr::#ident )) => Instruction::#instr_ident } }); @@ -3109,6 +3110,7 @@ pub fn generate_instructions_rs() -> TokenStream { quote! { #preface_tokens + #[allow(clippy::enum_variant_names)] #[derive(Clone, Debug)] pub enum CompareTerm { #( @@ -3116,6 +3118,7 @@ pub fn generate_instructions_rs() -> TokenStream { )* } + #[allow(clippy::enum_variant_names)] #[derive(Clone, Copy, Debug)] pub enum CompareNumber { #( @@ -3161,7 +3164,7 @@ pub fn generate_instructions_rs() -> TokenStream { } #[derive(Clone, Debug)] - pub enum REPLCodePtr { + pub enum ReplCodePtr { #( #repl_code_ptr_variants, )* @@ -3228,7 +3231,7 @@ pub fn generate_instructions_rs() -> TokenStream { } } - pub fn to_default(self) -> Instruction { + pub fn into_default(self) -> Instruction { match self { #( #to_default_arms, @@ -3237,7 +3240,7 @@ pub fn generate_instructions_rs() -> TokenStream { } } - pub fn to_execute(self) -> Instruction { + pub fn into_execute(self) -> Instruction { match self { #( #to_execute_arms, @@ -3418,8 +3421,8 @@ impl InstructionData { ); (name, arity, CountableInference::NotCounted) - } else if id == "REPLCodePtr" { - let (name, arity) = add_discriminant_data::( + } else if id == "ReplCodePtr" { + let (name, arity) = add_discriminant_data::( &variant, prefix, &mut self.repl_code_ptr_variants, diff --git a/build/static_string_indexing.rs b/build/static_string_indexing.rs index 02b853f66..c3d1701c9 100644 --- a/build/static_string_indexing.rs +++ b/build/static_string_indexing.rs @@ -156,8 +156,6 @@ pub fn index_static_strings(instruction_rs_path: &std::path::Path) -> TokenStrea let static_strs: &Vec<_> = &visitor.static_strs.into_iter().collect(); quote! { - use phf; - static STRINGS: [&str; #static_strs_len] = [ #( #static_strs, diff --git a/src/codegen.rs b/src/codegen.rs index a8049d684..5de855843 100644 --- a/src/codegen.rs +++ b/src/codegen.rs @@ -557,14 +557,14 @@ impl<'b> CodeGenerator<'b> { match call_policy { CallPolicy::Default => { if self.marker.in_tail_position { - code.push_back(call_instr.to_execute().to_default()); + code.push_back(call_instr.into_execute().into_default()); } else { - code.push_back(call_instr.to_default()) + code.push_back(call_instr.into_default()) } } CallPolicy::Counted => { if self.marker.in_tail_position { - code.push_back(call_instr.to_execute()); + code.push_back(call_instr.into_execute()); } else { code.push_back(call_instr) } diff --git a/src/machine/compile.rs b/src/machine/compile.rs index 7f967e8bd..e58f3553a 100644 --- a/src/machine/compile.rs +++ b/src/machine/compile.rs @@ -1194,11 +1194,8 @@ fn print_overwrite_warning( key: PredicateKey, is_dynamic: bool, ) { - if let CompilationTarget::Module(module_name) = compilation_target { - match module_name { - atom!("builtins") | atom!("loader") => return, - _ => {} - } + if let CompilationTarget::Module(atom!("builtins") | atom!("loader")) = compilation_target { + return; } match code_ptr.tag() { diff --git a/src/machine/dispatch.rs b/src/machine/dispatch.rs index 25c0cc01e..a3ace102f 100644 --- a/src/machine/dispatch.rs +++ b/src/machine/dispatch.rs @@ -4611,11 +4611,11 @@ impl Machine { self.shell(); step_or_fail!(self, self.machine_st.p = self.machine_st.cp); } - &Instruction::CallPID => { + &Instruction::CallPid => { self.pid(); step_or_fail!(self, self.machine_st.p += 1); } - &Instruction::ExecutePID => { + &Instruction::ExecutePid => { self.pid(); step_or_fail!(self, self.machine_st.p = self.machine_st.cp); } diff --git a/src/machine/partial_string.rs b/src/machine/partial_string.rs index c2d63d41d..6a6ba96d8 100644 --- a/src/machine/partial_string.rs +++ b/src/machine/partial_string.rs @@ -213,8 +213,7 @@ impl<'a> HeapPStrIter<'a> { self.brent_st.hare = orig_hare; } - #[allow(clippy::inherent_to_string)] - pub fn to_string(&mut self) -> String { + pub fn to_string_mut(&mut self) -> String { let mut buf = String::with_capacity(32); for iteratee in self.by_ref() { diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs index ce5803756..a092633ec 100644 --- a/src/machine/system_calls.rs +++ b/src/machine/system_calls.rs @@ -1040,7 +1040,7 @@ impl MachineState { self.heap.push(value); let mut iter = HeapPStrIter::new(&self.heap, h); - let string = iter.to_string(); + let string = iter.to_string_mut(); let at_terminator = iter.at_string_terminator(); self.heap.pop(); diff --git a/src/parser/ast.rs b/src/parser/ast.rs index acb11f9c9..06c1ab9e0 100644 --- a/src/parser/ast.rs +++ b/src/parser/ast.rs @@ -26,6 +26,7 @@ pub type Specifier = u32; pub const MAX_ARITY: usize = 1023; +#[allow(clippy::upper_case_acronyms)] #[derive(Debug, Clone, Copy, Eq, PartialEq)] pub enum OpDeclSpec { XFX = 0x0001, @@ -660,7 +661,7 @@ impl fmt::Display for Literal { } impl Literal { - pub fn to_atom(&self, atom_tbl: &Arc) -> Option { + pub fn as_atom(&self, atom_tbl: &Arc) -> Option { match self { Literal::Atom(atom) => Some(atom.defrock_brackets(atom_tbl)), _ => None,