Skip to content

Commit

Permalink
Fix Clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
@bakaq
bakaq committed Sep 7, 2024
1 parent d32f3ee commit 16734ec
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 39 deletions.
49 changes: 26 additions & 23 deletions build/instructions_template.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")))]
Expand Down Expand Up @@ -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")))]
Expand Down Expand Up @@ -608,7 +608,7 @@ enum SystemClauseType {
InferenceLimitExceeded,
#[strum_discriminants(strum(props(Arity = "1", Name = "$argv")))]
Argv,
REPL(REPLCodePtr),
Repl(ReplCodePtr),
}

#[allow(dead_code)]
Expand Down Expand Up @@ -811,7 +811,7 @@ fn derive_input(ty: &Type) -> Option<DeriveInput> {
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())
Expand All @@ -826,7 +826,7 @@ fn derive_input(ty: &Type) -> Option<DeriveInput> {
} 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
}
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -2357,7 +2358,7 @@ pub fn generate_instructions_rs() -> TokenStream {
let builtin_type_variants = attributeless_enum::<BuiltInClauseType>();
let inlined_type_variants = attributeless_enum::<InlinedClauseType>();
let system_clause_type_variants = attributeless_enum::<SystemClauseType>();
let repl_code_ptr_variants = attributeless_enum::<REPLCodePtr>();
let repl_code_ptr_variants = attributeless_enum::<ReplCodePtr>();
let compare_number_variants = attributeless_enum::<CompareNumber>();
let compare_term_variants = attributeless_enum::<CompareTerm>();

Expand Down Expand Up @@ -2708,28 +2709,28 @@ 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
))
}
});

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)
}
});
Expand All @@ -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
}
});
Expand Down Expand Up @@ -3109,13 +3110,15 @@ pub fn generate_instructions_rs() -> TokenStream {
quote! {
#preface_tokens

#[allow(clippy::enum_variant_names)]
#[derive(Clone, Debug)]
pub enum CompareTerm {
#(
#compare_term_variants,
)*
}

#[allow(clippy::enum_variant_names)]
#[derive(Clone, Copy, Debug)]
pub enum CompareNumber {
#(
Expand Down Expand Up @@ -3161,7 +3164,7 @@ pub fn generate_instructions_rs() -> TokenStream {
}

#[derive(Clone, Debug)]
pub enum REPLCodePtr {
pub enum ReplCodePtr {
#(
#repl_code_ptr_variants,
)*
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -3418,8 +3421,8 @@ impl InstructionData {
);

(name, arity, CountableInference::NotCounted)
} else if id == "REPLCodePtr" {
let (name, arity) = add_discriminant_data::<REPLCodePtrDiscriminants>(
} else if id == "ReplCodePtr" {
let (name, arity) = add_discriminant_data::<ReplCodePtrDiscriminants>(
&variant,
prefix,
&mut self.repl_code_ptr_variants,
Expand Down
2 changes: 0 additions & 2 deletions build/static_string_indexing.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/codegen.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
7 changes: 2 additions & 5 deletions src/machine/compile.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions src/machine/dispatch.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions src/machine/partial_string.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/machine/system_calls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion src/parser/ast.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -660,7 +661,7 @@ impl fmt::Display for Literal {
}

impl Literal {
pub fn to_atom(&self, atom_tbl: &Arc<AtomTable>) -> Option<Atom> {
pub fn as_atom(&self, atom_tbl: &Arc<AtomTable>) -> Option<Atom> {
match self {
Literal::Atom(atom) => Some(atom.defrock_brackets(atom_tbl)),
_ => None,
Expand Down

0 comments on commit 16734ec

Please sign in to comment.