From 8cc74b2af71526f6b949f06d091510bf1f280d97 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bennet=20Ble=C3=9Fmann?= Date: Thu, 31 Jul 2025 21:26:08 +0200 Subject: [PATCH] fix clippy::uninlined_format_args --- build/instructions_template.rs | 6 +++--- build/static_string_indexing.rs | 4 ++-- src/forms.rs | 6 +++--- src/functor_macro.rs | 4 ++-- src/heap_print.rs | 12 ++++++------ src/machine/loader.rs | 4 ++-- src/machine/machine_indices.rs | 2 +- src/machine/mock_wam.rs | 12 +++--------- src/machine/system_calls.rs | 12 ++++++------ src/parser/ast.rs | 14 +++++++------- 10 files changed, 35 insertions(+), 41 deletions(-) diff --git a/build/instructions_template.rs b/build/instructions_template.rs index dc2ed9f7..2f760ea1 100644 --- a/build/instructions_template.rs +++ b/build/instructions_template.rs @@ -3262,14 +3262,14 @@ where let disc = match DiscriminantT::from_str(id.to_string().as_str()) { Ok(disc) => disc, Err(_) => { - panic!("can't generate discriminant {}", id); + panic!("can't generate discriminant {id}"); } }; match disc.get_str(key) { Some(prop) => prop, None => { - panic!("can't find property {} of discriminant {:?}", key, disc); + panic!("can't find property {key} of discriminant {disc:?}"); } } } @@ -3387,7 +3387,7 @@ impl InstructionData { (name, arity, CountableInference::HasDefault) } else { - panic!("type ID is: {}", id); + panic!("type ID is: {id}"); }; let v_ident = variant diff --git a/build/static_string_indexing.rs b/build/static_string_indexing.rs index bffb5c13..a577a517 100644 --- a/build/static_string_indexing.rs +++ b/build/static_string_indexing.rs @@ -126,14 +126,14 @@ pub fn index_static_strings(instruction_rs_path: &std::path::Path) -> TokenStrea match file.read_to_string(&mut src) { Ok(_) => {} Err(e) => { - panic!("error reading file: {:?}", e); + panic!("error reading file: {e:?}"); } } let syntax = match syn::parse_file(&src) { Ok(s) => s, Err(e) => { - panic!("parse error: {} in file {:?}", e, path); + panic!("parse error: {e} in file {path:?}"); } }; Ok(syntax) diff --git a/src/forms.rs b/src/forms.rs index 1418b570..409da51e 100644 --- a/src/forms.rs +++ b/src/forms.rs @@ -627,9 +627,9 @@ impl Default for Number { impl fmt::Display for Number { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { - Number::Float(fl) => write!(f, "{}", fl), - Number::Integer(n) => write!(f, "{}", n), - Number::Rational(r) => write!(f, "{}", r), + Number::Float(fl) => write!(f, "{fl}"), + Number::Integer(n) => write!(f, "{n}"), + Number::Rational(r) => write!(f, "{r}"), Number::Fixnum(n) => write!(f, "{}", n.get_num()), } } diff --git a/src/functor_macro.rs b/src/functor_macro.rs index ba19f682..54bcb28c 100644 --- a/src/functor_macro.rs +++ b/src/functor_macro.rs @@ -739,12 +739,12 @@ mod tests { ] ); - println!("{:?}", stub); + println!("{stub:?}"); // now the error form let lineless_error_form = functor!(atom!("error"), [functor(stub), functor(culprit)]); - println!("{:?}", lineless_error_form); + println!("{lineless_error_form:?}"); let mut heap = Heap::new(); let mut functor_writer = Heap::functor_writer(lineless_error_form); diff --git a/src/heap_print.rs b/src/heap_print.rs index 9cc3a2d0..57fef895 100644 --- a/src/heap_print.rs +++ b/src/heap_print.rs @@ -831,13 +831,13 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> { read_heap_cell!(cell, (HeapCellValueTag::Lis | HeapCellValueTag::Str, h) => { - Some(format!("{}", h)) + Some(format!("{h}")) } (HeapCellValueTag::Var | HeapCellValueTag::AttrVar, h) => { - Some(format!("_{}", h)) + Some(format!("_{h}")) } (HeapCellValueTag::StackVar, h) => { - Some(format!("_s_{}", h)) + Some(format!("_s_{h}")) } _ => { None @@ -1002,7 +1002,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> { #[inline] fn print_ip_addr(&mut self, ip: IpAddr) { push_char!(self, '\''); - append_str!(self, &format!("{}", ip)); + append_str!(self, &format!("{ip}")); push_char!(self, '\''); } @@ -1039,7 +1039,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> { self.print_rational(max_depth, r, *op); } n => { - let output_str = format!("{}", n); + let output_str = format!("{n}"); push_space_if_amb!(self, &output_str, { append_str!(self, &output_str); @@ -1086,7 +1086,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> { match self.op_dir.get(&(atom!("rdiv"), Fixity::In)) { Some(op_desc) => { if r.is_int() { - let output_str = format!("{}", r); + let output_str = format!("{r}"); push_space_if_amb!(self, &output_str, { append_str!(self, &output_str); diff --git a/src/machine/loader.rs b/src/machine/loader.rs index 685a69a0..08282f68 100644 --- a/src/machine/loader.rs +++ b/src/machine/loader.rs @@ -1407,10 +1407,10 @@ impl MachineState { term_stack.push(Term::Literal(Cell::default(), Literal::try_from(addr).unwrap())); } (HeapCellValueTag::StackVar, h) => { - term_stack.push(Term::Var(Cell::default(), VarPtr::from(format!("s_{}", h)))); + term_stack.push(Term::Var(Cell::default(), VarPtr::from(format!("s_{h}")))); } (HeapCellValueTag::Var | HeapCellValueTag::AttrVar, h) => { - term_stack.push(Term::Var(Cell::default(), VarPtr::from(format!("_{}", h)))); + term_stack.push(Term::Var(Cell::default(), VarPtr::from(format!("_{h}")))); } (HeapCellValueTag::Atom, (name, arity)) => { let h = iter.focus().value() as usize; diff --git a/src/machine/machine_indices.rs b/src/machine/machine_indices.rs index 4f04c2b1..07d77f6a 100644 --- a/src/machine/machine_indices.rs +++ b/src/machine/machine_indices.rs @@ -206,7 +206,7 @@ impl VarKey { #[inline] pub(crate) fn to_string(&self) -> String { match self { - VarKey::AnonVar(h) => format!("_{}", h), + VarKey::AnonVar(h) => format!("_{h}"), VarKey::VarPtr(var) => var.borrow().to_string(), } } diff --git a/src/machine/mock_wam.rs b/src/machine/mock_wam.rs index b7201b71..941ff81e 100644 --- a/src/machine/mock_wam.rs +++ b/src/machine/mock_wam.rs @@ -195,15 +195,11 @@ pub fn all_cells_marked_and_unforwarded(heap: &Heap, offset: usize) { assert!( cell.get_mark_bit(), - "cell {:?} at index {} is not marked", - cell, - curr_idx + "cell {cell:?} at index {curr_idx} is not marked" ); assert!( !cell.get_forwarding_bit(), - "cell {:?} at index {} is forwarded", - cell, - curr_idx + "cell {cell:?} at index {curr_idx} is forwarded" ); } } @@ -227,9 +223,7 @@ pub fn all_cells_unmarked(iter: &impl SizedHeap) { assert!( !cell.get_mark_bit(), - "cell {:?} at index {} is still marked", - cell, - curr_idx + "cell {cell:?} at index {curr_idx} is still marked" ); } } diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs index 6c861ae6..244d56af 100644 --- a/src/machine/system_calls.rs +++ b/src/machine/system_calls.rs @@ -2916,7 +2916,7 @@ impl Machine { let string = match Number::try_from((n, &self.machine_st.arena.f64_tbl)) { Ok(Number::Float(OrderedFloat(n))) => { - format!("{0:<20?}", n) + format!("{n:<20?}") } Ok(Number::Fixnum(n)) => n.get_num().to_string(), Ok(Number::Integer(n)) => n.to_string(), @@ -3245,7 +3245,7 @@ impl Machine { let n: u32 = (&*n).try_into().unwrap(); let n = char::try_from(n); if let Ok(c) = n { - write!(&mut stream, "{}", c).unwrap(); + write!(&mut stream, "{c}").unwrap(); return Ok(()); } } @@ -3253,7 +3253,7 @@ impl Machine { let n = n.get_num(); if let Some(c) = u32::try_from(n).ok().and_then(char::from_u32) { - write!(&mut stream, "{}", c).unwrap(); + write!(&mut stream, "{c}").unwrap(); return Ok(()); } } @@ -3295,13 +3295,13 @@ impl Machine { read_heap_cell!(addr, (HeapCellValueTag::Atom, (name, _arity)) => { if let Some(c) = name.as_char() { - write!(&mut stream, "{}", c).unwrap(); + write!(&mut stream, "{c}").unwrap(); return Ok(()); } } /* (HeapCellValueTag::Char, c) => { - write!(&mut stream, "{}", c).unwrap(); + write!(&mut stream, "{c}").unwrap(); return Ok(()); } */ @@ -8622,7 +8622,7 @@ impl Machine { ]; for spec in SPECIFIERS { - fstr.push_str(&format!("'{}'=\"%{}\", ", spec, spec).to_string()); + fstr.push_str(&format!("'{spec}'=\"%{spec}\", ")); } fstr.push_str("finis]."); diff --git a/src/parser/ast.rs b/src/parser/ast.rs index aa9ea077..654b2901 100644 --- a/src/parser/ast.rs +++ b/src/parser/ast.rs @@ -268,8 +268,8 @@ impl RegType { impl fmt::Display for RegType { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { - RegType::Perm(val) => write!(f, "Y{}", val), - RegType::Temp(val) => write!(f, "X{}", val), + RegType::Perm(val) => write!(f, "Y{val}"), + RegType::Temp(val) => write!(f, "X{val}"), } } } @@ -291,10 +291,10 @@ impl VarReg { impl fmt::Display for VarReg { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { - VarReg::Norm(RegType::Perm(reg)) => write!(f, "Y{}", reg), - VarReg::Norm(RegType::Temp(reg)) => write!(f, "X{}", reg), - VarReg::ArgAndNorm(RegType::Perm(reg), arg) => write!(f, "Y{} A{}", reg, arg), - VarReg::ArgAndNorm(RegType::Temp(reg), arg) => write!(f, "X{} A{}", reg, arg), + VarReg::Norm(RegType::Perm(reg)) => write!(f, "Y{reg}"), + VarReg::Norm(RegType::Temp(reg)) => write!(f, "X{reg}"), + VarReg::ArgAndNorm(RegType::Perm(reg), arg) => write!(f, "Y{reg} A{arg}"), + VarReg::ArgAndNorm(RegType::Temp(reg), arg) => write!(f, "X{reg} A{arg}"), } } } @@ -830,7 +830,7 @@ impl Var { #[inline(always)] pub fn to_string(&self) -> String { match self { - Var::InSitu(n) | Var::Generated(n) => format!("_{}", n), + Var::InSitu(n) | Var::Generated(n) => format!("_{n}"), Var::Named(value) => value.as_ref().clone(), } } -- 2.54.0