Formatting

Author: stravant

objdiff-core/src/arch/mod.rs

@@ -1,16 +1,22 @@
 use alloc::{borrow::Cow, boxed::Box, format, string::String, vec::Vec};
-use core::{ffi::CStr, fmt::{self, Debug}};
+use core::{
+    ffi::CStr,
+    fmt::{self, Debug},
+};
 
 use anyhow::{Result, bail};
 use encoding_rs::SHIFT_JIS;
 use object::Endian as _;
 
 use crate::{
     diff::{
-        display::{ContextItem, HoverItem, InstructionPart}, DiffObjConfig
+        DiffObjConfig,
+        display::{ContextItem, HoverItem, InstructionPart},
     },
     obj::{
-        FlowAnalysisResult, InstructionArg, InstructionRef, Object, ParsedInstruction, Relocation, RelocationFlags, ResolvedInstructionRef, ResolvedSymbol, Section, Symbol, SymbolFlagSet, SymbolKind
+        FlowAnalysisResult, InstructionArg, InstructionRef, Object, ParsedInstruction, Relocation,
+        RelocationFlags, ResolvedInstructionRef, ResolvedSymbol, Section, Symbol, SymbolFlagSet,
+        SymbolKind,
     },
     util::ReallySigned,
 };

objdiff-core/src/arch/ppc/flow_analysis.rs

@@ -1,14 +1,23 @@
+use alloc::{
+    boxed::Box,
+    collections::{BTreeMap, BTreeSet},
+    format,
+    string::String,
+    vec::Vec,
+};
+use core::{
+    ffi::CStr,
+    ops::{Index, IndexMut},
+};
+
+use itertools::Itertools;
+use ppc750cl::Simm;
+
 use crate::{
     arch::DataType,
     obj::{FlowAnalysisResult, FlowAnalysisValue, Object, Relocation, Symbol},
     util::{RawDouble, RawFloat},
 };
-use alloc::collections::{BTreeMap, BTreeSet};
-use alloc::{boxed::Box, format, string::String, vec::Vec};
-use core::ffi::CStr;
-use core::ops::{Index, IndexMut};
-use itertools::Itertools;
-use ppc750cl::Simm;
 
 fn is_store_instruction(op: ppc750cl::Opcode) -> bool {
     use ppc750cl::Opcode;
@@ -165,9 +174,8 @@ impl RegisterState {
 
 impl Index<ppc750cl::GPR> for RegisterState {
     type Output = RegisterContent;
-    fn index(&self, gpr: ppc750cl::GPR) -> &Self::Output {
-        &self.gpr[gpr.0 as usize]
-    }
+
+    fn index(&self, gpr: ppc750cl::GPR) -> &Self::Output { &self.gpr[gpr.0 as usize] }
 }
 impl IndexMut<ppc750cl::GPR> for RegisterState {
     fn index_mut(&mut self, gpr: ppc750cl::GPR) -> &mut Self::Output {
@@ -177,9 +185,8 @@ impl IndexMut<ppc750cl::GPR> for RegisterState {
 
 impl Index<ppc750cl::FPR> for RegisterState {
     type Output = RegisterContent;
-    fn index(&self, fpr: ppc750cl::FPR) -> &Self::Output {
-        &self.fpr[fpr.0 as usize]
-    }
+
+    fn index(&self, fpr: ppc750cl::FPR) -> &Self::Output { &self.fpr[fpr.0 as usize] }
 }
 impl IndexMut<ppc750cl::FPR> for RegisterState {
     fn index_mut(&mut self, fpr: ppc750cl::FPR) -> &mut Self::Output {
@@ -296,9 +303,7 @@ impl PPCFlowAnalysisResult {
         self.argument_contents.insert((address, argument), value);
     }
 
-    fn new() -> Self {
-        PPCFlowAnalysisResult { argument_contents: Default::default() }
-    }
+    fn new() -> Self { PPCFlowAnalysisResult { argument_contents: Default::default() } }
 }
 
 impl FlowAnalysisResult for PPCFlowAnalysisResult {
@@ -372,9 +377,7 @@ fn fill_registers_from_relocation(
 // See: https://github.com/encounter/decomp-toolkit/blob/main/src/analysis/pass.rs
 const SLEDS: [&str; 6] = ["_savefpr_", "_restfpr_", "_savegpr_", "_restgpr_", "_savev", "_restv"];
 
-fn is_sled_function(name: &str) -> bool {
-    SLEDS.iter().any(|sled| name.starts_with(sled))
-}
+fn is_sled_function(name: &str) -> bool { SLEDS.iter().any(|sled| name.starts_with(sled)) }
 
 pub fn ppc_data_flow_analysis(
     obj: &Object,
@@ -383,6 +386,7 @@ pub fn ppc_data_flow_analysis(
     relocations: &[Relocation],
 ) -> Box<dyn FlowAnalysisResult> {
     use alloc::collections::VecDeque;
+
     use ppc750cl::InsIter;
     let instructions = InsIter::new(code, func_symbol.address as u32)
         .map(|(_addr, ins)| (ins.op, ins.basic().args))

objdiff-core/src/arch/ppc/mod.rs

@@ -1,9 +1,9 @@
 use alloc::{
+    boxed::Box,
     collections::{BTreeMap, BTreeSet},
     string::{String, ToString},
     vec,
     vec::Vec,
-    boxed::Box,
 };
 
 use anyhow::{Result, bail, ensure};
@@ -20,7 +20,7 @@ use crate::{
     },
     obj::{
         FlowAnalysisResult, InstructionRef, Object, Relocation, RelocationFlags,
-        ResolvedInstructionRef, ResolvedRelocation, Symbol, SymbolFlag, SymbolFlagSet
+        ResolvedInstructionRef, ResolvedRelocation, Symbol, SymbolFlag, SymbolFlagSet,
     },
 };
 
@@ -170,7 +170,7 @@ impl Arch for ArchPpc {
     ) -> Vec<Relocation> {
         generate_fake_pool_relocations_for_function(address, code, relocations, symbols)
     }
-    
+
     fn data_flow_analysis(
         &self,
         obj: &Object,

objdiff-core/src/diff/display.rs

@@ -12,9 +12,12 @@ use itertools::Itertools;
 use regex::Regex;
 
 use crate::{
-    diff::{DiffObjConfig, InstructionDiffKind, InstructionDiffRow, ObjectDiff, SymbolDiff}, obj::{
-        FlowAnalysisValue, InstructionArg, InstructionArgValue, Object, ParsedInstruction, ResolvedInstructionRef, ResolvedRelocation, SectionFlag, SectionKind, Symbol, SymbolFlag, SymbolKind
-    }
+    diff::{DiffObjConfig, InstructionDiffKind, InstructionDiffRow, ObjectDiff, SymbolDiff},
+    obj::{
+        FlowAnalysisValue, InstructionArg, InstructionArgValue, Object, ParsedInstruction,
+        ResolvedInstructionRef, ResolvedRelocation, SectionFlag, SectionKind, Symbol, SymbolFlag,
+        SymbolKind,
+    },
 };
 
 #[derive(Debug, Clone)]
@@ -44,7 +47,7 @@ pub enum DiffText<'a> {
 #[derive(Debug, Copy, Clone, Default, PartialEq, Eq, Hash)]
 pub enum DiffTextColor {
     #[default]
-    Normal,   // Grey
+    Normal, // Grey
     Dim,      // Dark grey
     Bright,   // White
     DataFlow, // Light blue

objdiff-core/src/obj/mod.rs

@@ -238,8 +238,12 @@ pub enum FlowAnalysisValue {
     Text(String),
 }
 
-pub trait FlowAnalysisResult : core::fmt::Debug + Send {
-    fn get_argument_value_at_address(&self, address: u64, argument: u8) -> Option<&FlowAnalysisValue>;
+pub trait FlowAnalysisResult: core::fmt::Debug + Send {
+    fn get_argument_value_at_address(
+        &self,
+        address: u64,
+        argument: u8,
+    ) -> Option<&FlowAnalysisValue>;
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Default)]
@@ -323,10 +327,8 @@ impl Object {
     pub fn symbol_by_name(&self, name: &str) -> Option<usize> {
         self.symbols.iter().position(|symbol| symbol.section.is_some() && symbol.name == name)
     }
-    
-    pub fn has_flow_analysis_result(&self) -> bool {
-        !self.flow_analysis_results.is_empty()
-    }
+
+    pub fn has_flow_analysis_result(&self) -> bool { !self.flow_analysis_results.is_empty() }
 }
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]

objdiff-core/src/obj/read.rs

@@ -467,20 +467,16 @@ fn perform_data_flow_analysis(obj: &mut Object, config: &DiffObjConfig) -> Resul
                     symbol.address,
                     code,
                     &section.relocations,
-                    &obj.symbols);
+                    &obj.symbols,
+                );
                 generated_relocations.push((section_index, relocations));
             }
 
             // Optional full data flow analysis
             if config.analyze_data_flow {
-                obj.arch.data_flow_analysis(
-                    &obj,
-                    symbol,
-                    code,
-                    &section.relocations,
-                ).and_then(|flow_result| {
-                    obj.flow_analysis_results.insert(symbol.address, flow_result)
-                });
+                obj.arch.data_flow_analysis(&obj, symbol, code, &section.relocations).and_then(
+                    |flow_result| obj.flow_analysis_results.insert(symbol.address, flow_result),
+                );
             }
         }
     }

objdiff-core/src/util.rs

@@ -65,39 +65,27 @@ pub fn align_data_slice_to(data: &mut Vec<u8>, align: u64) {
 #[derive(Copy, Clone, Debug)]
 pub struct RawFloat(pub f32);
 impl PartialEq for RawFloat {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.to_bits() == other.0.to_bits()
-    }
+    fn eq(&self, other: &Self) -> bool { self.0.to_bits() == other.0.to_bits() }
 }
 impl Eq for RawFloat {}
 impl Ord for RawFloat {
-    fn cmp(&self, other: &Self) -> core::cmp::Ordering {
-        self.0.to_bits().cmp(&other.0.to_bits())
-    }
+    fn cmp(&self, other: &Self) -> core::cmp::Ordering { self.0.to_bits().cmp(&other.0.to_bits()) }
 }
 impl PartialOrd for RawFloat {
-    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
+    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> { Some(self.cmp(other)) }
 }
 
 // Double where we specifically care about comparing the raw bits rather than
 // caring about IEEE semantics.
 #[derive(Copy, Clone, Debug)]
 pub struct RawDouble(pub f64);
 impl PartialEq for RawDouble {
-    fn eq(&self, other: &Self) -> bool {
-        self.0.to_bits() == other.0.to_bits()
-    }
+    fn eq(&self, other: &Self) -> bool { self.0.to_bits() == other.0.to_bits() }
 }
 impl Eq for RawDouble {}
 impl Ord for RawDouble {
-    fn cmp(&self, other: &Self) -> core::cmp::Ordering {
-        self.0.to_bits().cmp(&other.0.to_bits())
-    }
+    fn cmp(&self, other: &Self) -> core::cmp::Ordering { self.0.to_bits().cmp(&other.0.to_bits()) }
 }
 impl PartialOrd for RawDouble {
-    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
+    fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> { Some(self.cmp(other)) }
 }

objdiff-gui/src/views/appearance.rs

@@ -23,7 +23,7 @@ pub struct Appearance {
     #[serde(skip)]
     pub highlight_color: Color32, // WHITE
     #[serde(skip)]
-    pub dataflow_color: Color32, // 
+    pub dataflow_color: Color32, //
     #[serde(skip)]
     pub replace_color: Color32, // LIGHT_BLUE
     #[serde(skip)]

objdiff-gui/src/views/diff.rs

@@ -284,7 +284,8 @@ pub fn diff_view_ui(
 
             // Only need to check the first Object. Technically the first could not have a flow analysis
             // result while the second does but we don't want to waste space on two separate checkboxes.
-            if result.first_obj.as_ref().is_some_and(|(first, _)| first.has_flow_analysis_result()) {
+            if result.first_obj.as_ref().is_some_and(|(first, _)| first.has_flow_analysis_result())
+            {
                 let mut placeholder = diff_config.show_data_flow;
                 if ui
                     .checkbox(&mut placeholder, "Show data flow")

objdiff-gui/src/views/symbol_diff.rs

@@ -356,7 +356,8 @@ impl DiffViewState {
                 let Ok(mut state) = state.write() else {
                     return;
                 };
-                state.config.diff_obj_config.show_data_flow = !state.config.diff_obj_config.show_data_flow;
+                state.config.diff_obj_config.show_data_flow =
+                    !state.config.diff_obj_config.show_data_flow;
             }
         }
     }