Reformat for edition 2024

Author: encounter

src/analysis/cfa.rs

@@ -5,15 +5,15 @@ use std::{
     ops::{Add, AddAssign, BitAnd, Sub},
 };
 
-use anyhow::{bail, ensure, Context, Result};
+use anyhow::{Context, Result, bail, ensure};
 use itertools::Itertools;
 
 use crate::{
     analysis::{
+        RelocationTarget,
         executor::{ExecCbData, ExecCbResult, Executor},
         slices::{FunctionSlices, TailCallResult},
         vm::{BranchTarget, GprValue, StepResult, VM},
-        RelocationTarget,
     },
     obj::{
         ObjInfo, ObjSection, ObjSectionKind, ObjSymbol, ObjSymbolFlagSet, ObjSymbolFlags,
@@ -312,11 +312,7 @@ impl AnalyzerState {
             .functions
             .iter()
             .filter_map(|(&addr, info)| {
-                if info.is_unfinalized() {
-                    info.slices.clone().map(|s| (addr, s))
-                } else {
-                    None
-                }
+                if info.is_unfinalized() { info.slices.clone().map(|s| (addr, s)) } else { None }
             })
             .collect_vec();
         for (addr, mut slices) in unfinalized {

src/analysis/executor.rs

@@ -1,4 +1,4 @@
-use anyhow::{ensure, Result};
+use anyhow::{Result, ensure};
 use fixedbitset::FixedBitSet;
 use ppc750cl::Ins;
 

src/analysis/mod.rs

@@ -1,6 +1,6 @@
 use std::{collections::BTreeSet, num::NonZeroU32};
 
-use anyhow::{anyhow, bail, ensure, Context, Result};
+use anyhow::{Context, Result, anyhow, bail, ensure};
 use ppc750cl::Ins;
 
 use crate::{

src/analysis/pass.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, ensure, Result};
+use anyhow::{Result, bail, ensure};
 use flagset::FlagSet;
 use itertools::Itertools;
 use memchr::memmem;

src/analysis/signatures.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use itertools::Itertools;
 
 use crate::{

src/analysis/slices.rs

@@ -1,19 +1,19 @@
 use std::{
-    collections::{btree_map, BTreeMap, BTreeSet},
+    collections::{BTreeMap, BTreeSet, btree_map},
     ops::Range,
 };
 
-use anyhow::{bail, ensure, Context, Result};
+use anyhow::{Context, Result, bail, ensure};
 use ppc750cl::{Ins, Opcode};
 
 use crate::{
     analysis::{
+        RelocationTarget,
         cfa::{FunctionInfo, SectionAddress},
         disassemble,
         executor::{ExecCbData, ExecCbResult, Executor},
         uniq_jump_table_entries,
-        vm::{section_address_for, BranchTarget, GprValue, StepResult, VM},
-        RelocationTarget,
+        vm::{BranchTarget, GprValue, StepResult, VM, section_address_for},
     },
     obj::{ObjInfo, ObjKind, ObjSection, ObjSymbolKind},
 };
@@ -205,7 +205,11 @@ impl FunctionSlices {
                     }
                 };
                 if invalid_seq {
-                    bail!("Found multiple functions inside a symbol: {:#010X} and {:#010X}. Check symbols.txt?", prologue, addr)
+                    bail!(
+                        "Found multiple functions inside a symbol: {:#010X} and {:#010X}. Check symbols.txt?",
+                        prologue,
+                        addr
+                    )
                 }
             } else {
                 self.prologue = Some(addr);

src/analysis/tracker.rs

@@ -3,19 +3,19 @@ use std::{
     mem::take,
 };
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use cwextab::decode_extab;
 use ppc750cl::Opcode;
 use tracing::{debug_span, info_span};
 use tracing_attributes::instrument;
 
 use crate::{
     analysis::{
+        RelocationTarget,
         cfa::SectionAddress,
         executor::{ExecCbData, ExecCbResult, Executor},
         relocation_target_for, uniq_jump_table_entries,
-        vm::{is_store_op, BranchTarget, GprValue, StepResult, VM},
-        RelocationTarget,
+        vm::{BranchTarget, GprValue, StepResult, VM, is_store_op},
     },
     obj::{
         ObjDataKind, ObjInfo, ObjKind, ObjReloc, ObjRelocKind, ObjSection, ObjSectionKind,

src/analysis/vm.rs

@@ -1,9 +1,9 @@
 use std::num::NonZeroU32;
 
-use ppc750cl::{Argument, Ins, Opcode, GPR};
+use ppc750cl::{Argument, GPR, Ins, Opcode};
 
 use crate::{
-    analysis::{cfa::SectionAddress, relocation_target_for, RelocationTarget},
+    analysis::{RelocationTarget, cfa::SectionAddress, relocation_target_for},
     obj::{ObjInfo, ObjKind},
 };
 

src/argp_version.rs

@@ -4,7 +4,7 @@
 //! For now, this only adds a --version/-V option which causes early-exit.
 use std::ffi::OsStr;
 
-use argp::{parser::ParseGlobalOptions, EarlyExit, FromArgs, TopLevelCommand};
+use argp::{EarlyExit, FromArgs, TopLevelCommand, parser::ParseGlobalOptions};
 
 struct ArgsOrVersion<T>(T)
 where T: FromArgs;

src/cmd/alf.rs

@@ -1,4 +1,4 @@
-use std::io::{stdout, Write};
+use std::io::{Write, stdout};
 
 use anyhow::Result;
 use argp::FromArgs;