From d0e513451ecf46a306392a9070b67db096d0940d Mon Sep 17 00:00:00 2001 From: monsterkrampe Date: Mon, 30 Jun 2025 08:48:48 +0200 Subject: [PATCH] Apply clippy suggestions --- bin/src/main.rs | 8 ++++---- lib/src/datatypes/bdd.rs | 4 ++-- lib/src/obdd.rs | 2 +- lib/src/parser.rs | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bin/src/main.rs b/bin/src/main.rs index 17a707e..77d8cf6 100644 --- a/bin/src/main.rs +++ b/bin/src/main.rs @@ -204,14 +204,14 @@ impl App { Some("nai") => { let naive_adf = adf.hybrid_step_opt(false); for ac_counts in naive_adf.formulacounts(false) { - print!("{:?} ", ac_counts); + print!("{ac_counts:?} "); } println!(); } Some("mem") => { let naive_adf = adf.hybrid_step_opt(false); for ac_counts in naive_adf.formulacounts(true) { - print!("{:?}", ac_counts); + print!("{ac_counts:?}"); } println!(); } @@ -383,13 +383,13 @@ impl App { match self.counter.as_deref() { Some("nai") => { for ac_counts in adf.formulacounts(false) { - print!("{:?} ", ac_counts); + print!("{ac_counts:?} "); } println!(); } Some("mem") => { for ac_counts in adf.formulacounts(true) { - print!("{:?}", ac_counts); + print!("{ac_counts:?}"); } println!(); } diff --git a/lib/src/datatypes/bdd.rs b/lib/src/datatypes/bdd.rs index 4eb3161..31a7fff 100644 --- a/lib/src/datatypes/bdd.rs +++ b/lib/src/datatypes/bdd.rs @@ -275,8 +275,8 @@ mod test { let term: Term = Term::from(value); let var = Var::from(value); // display - assert_eq!(format!("{}", term), format!("Term({})", value)); - assert_eq!(format!("{}", var), format!("Var({})", value)); + assert_eq!(format!("{term}"), format!("Term({})", value)); + assert_eq!(format!("{var}"), format!("Var({})", value)); //deref assert_eq!(value, *term); true diff --git a/lib/src/obdd.rs b/lib/src/obdd.rs index a19fa96..a4bd34d 100644 --- a/lib/src/obdd.rs +++ b/lib/src/obdd.rs @@ -690,7 +690,7 @@ mod test { let a1 = bdd.and(v1, v2); let _a2 = bdd.or(a1, v3); - assert_eq!(format!("{}", bdd), " \n0 BddNode: Var(18446744073709551614), lo: Term(0), hi: Term(0)\n1 BddNode: Var(18446744073709551615), lo: Term(1), hi: Term(1)\n2 BddNode: Var(0), lo: Term(0), hi: Term(1)\n3 BddNode: Var(1), lo: Term(0), hi: Term(1)\n4 BddNode: Var(2), lo: Term(0), hi: Term(1)\n5 BddNode: Var(0), lo: Term(0), hi: Term(3)\n6 BddNode: Var(1), lo: Term(4), hi: Term(1)\n7 BddNode: Var(0), lo: Term(4), hi: Term(6)\n"); + assert_eq!(format!("{bdd}"), " \n0 BddNode: Var(18446744073709551614), lo: Term(0), hi: Term(0)\n1 BddNode: Var(18446744073709551615), lo: Term(1), hi: Term(1)\n2 BddNode: Var(0), lo: Term(0), hi: Term(1)\n3 BddNode: Var(1), lo: Term(0), hi: Term(1)\n4 BddNode: Var(2), lo: Term(0), hi: Term(1)\n5 BddNode: Var(0), lo: Term(0), hi: Term(3)\n6 BddNode: Var(1), lo: Term(4), hi: Term(1)\n7 BddNode: Var(0), lo: Term(4), hi: Term(6)\n"); } #[test] diff --git a/lib/src/parser.rs b/lib/src/parser.rs index bd211ff..2ca312e 100644 --- a/lib/src/parser.rs +++ b/lib/src/parser.rs @@ -94,25 +94,25 @@ impl std::fmt::Debug for Formula { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { Formula::Atom(a) => { - write!(f, "{}", a)?; + write!(f, "{a}")?; } Formula::Not(n) => { - write!(f, "not({:?})", n)?; + write!(f, "not({n:?})")?; } Formula::And(f1, f2) => { - write!(f, "and({:?},{:?})", f1, f2)?; + write!(f, "and({f1:?},{f2:?})")?; } Formula::Or(f1, f2) => { - write!(f, "or({:?},{:?})", f1, f2)?; + write!(f, "or({f1:?},{f2:?})")?; } Formula::Imp(f1, f2) => { - write!(f, "imp({:?},{:?})", f1, f2)?; + write!(f, "imp({f1:?},{f2:?})")?; } Formula::Xor(f1, f2) => { - write!(f, "xor({:?},{:?})", f1, f2)?; + write!(f, "xor({f1:?},{f2:?})")?; } Formula::Iff(f1, f2) => { - write!(f, "iff({:?},{:?})", f1, f2)?; + write!(f, "iff({f1:?},{f2:?})")?; } Formula::Bot => { write!(f, "Const(B)")?; @@ -481,7 +481,7 @@ mod test { let (_remain, result) = AdfParser::formula(input).unwrap(); assert_eq!( - format!("{:?}", result), + format!("{result:?}"), "and(or(not(a),iff( iff left ,b)),xor(imp(c,d),e))" );