From 94bdf812bf909de71168e69bf67253652c6a886e Mon Sep 17 00:00:00 2001 From: Mason Reed Date: Wed, 22 Jan 2025 17:45:24 -0500 Subject: [PATCH] Misc rust fmt --- rust/src/low_level_il/expression.rs | 3 ++- rust/src/low_level_il/instruction.rs | 2 +- rust/tests/low_level_il.rs | 12 ++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/rust/src/low_level_il/expression.rs b/rust/src/low_level_il/expression.rs index 2abe71585..2fc9f93dc 100644 --- a/rust/src/low_level_il/expression.rs +++ b/rust/src/low_level_il/expression.rs @@ -596,7 +596,8 @@ where visit!(op.source_mem_expr()); } // Do not have any sub expressions. - Pop(_) | Reg(_) | RegSplit(_) | Const(_) | ConstPtr(_) | Flag(_) | FlagBit(_) | ExternPtr(_) | FlagCond(_) | FlagGroup(_) | Unimpl(_) | Undef(_) => {} + Pop(_) | Reg(_) | RegSplit(_) | Const(_) | ConstPtr(_) | Flag(_) | FlagBit(_) + | ExternPtr(_) | FlagCond(_) | FlagGroup(_) | Unimpl(_) | Undef(_) => {} } VisitorAction::Sibling diff --git a/rust/src/low_level_il/instruction.rs b/rust/src/low_level_il/instruction.rs index eaee9c16a..5c3010eac 100644 --- a/rust/src/low_level_il/instruction.rs +++ b/rust/src/low_level_il/instruction.rs @@ -14,13 +14,13 @@ use super::operation; use super::operation::Operation; +use super::VisitorAction; use super::*; use crate::architecture::Architecture; use binaryninjacore_sys::BNGetLowLevelILByIndex; use binaryninjacore_sys::BNGetLowLevelILIndexForInstruction; use binaryninjacore_sys::BNLowLevelILInstruction; use std::fmt::{Debug, Display, Formatter}; -use super::VisitorAction; #[repr(transparent)] #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] diff --git a/rust/tests/low_level_il.rs b/rust/tests/low_level_il.rs index 86ac3ae6e..bbd31fc99 100644 --- a/rust/tests/low_level_il.rs +++ b/rust/tests/low_level_il.rs @@ -200,7 +200,11 @@ fn test_llil_visitor(_session: &Session) { // This is a flag instruction removed in LLIL. instructions_visited.push(LowLevelInstructionIndex(38)); for instr_idx in 0..41 { - if instructions_visited.iter().find(|x| x.0 == instr_idx).is_none() { + if instructions_visited + .iter() + .find(|x| x.0 == instr_idx) + .is_none() + { panic!("Instruction with index {:?} not visited", instr_idx); }; } @@ -215,7 +219,11 @@ fn test_llil_visitor(_session: &Session) { expressions_visited.push(LowLevelExpressionIndex(116)); expressions_visited.push(LowLevelExpressionIndex(121)); for expr_idx in 0..127 { - if expressions_visited.iter().find(|x| x.0 == expr_idx).is_none() { + if expressions_visited + .iter() + .find(|x| x.0 == expr_idx) + .is_none() + { panic!("Expression with index {:?} not visited", expr_idx); }; }