edition 2024 format

src/build.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, ensure, Context, Result};
+use anyhow::{Context, Result, bail, ensure};
 use rustfix::diagnostics::Diagnostic;
 use serde::Deserialize;
 use std::{
@@ -10,7 +10,7 @@ use std::{
     rc::Rc,
 };
 
-use crate::{dylib_flag::RustFunction, EnvVar, Options};
+use crate::{EnvVar, Options, dylib_flag::RustFunction};
 
 #[derive(Debug, Clone)]
 pub struct Build {

src/expand.rs

@@ -1,18 +1,18 @@
 // this code is pretty neat i guess but i dont have a use for it right now
 #![allow(dead_code)]
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use cargo::{
     core::{
+        Workspace,
         compiler::{BuildContext, Unit, UnitInterner},
         manifest::TargetSourcePath,
-        Workspace,
     },
     ops::{self, CompileOptions},
-    util::{command_prelude::CompileMode, Config},
+    util::{Config, command_prelude::CompileMode},
 };
 use std::{collections::BTreeSet, fmt::Debug, ops::Not, path::Path, process::Command};
-use syn::{visit_mut::VisitMut, File, Item, ItemExternCrate, ItemMod, ItemUse, Visibility};
+use syn::{File, Item, ItemExternCrate, ItemMod, ItemUse, Visibility, visit_mut::VisitMut};
 
 fn cargo_expand(cargo_dir: &TargetSourcePath) -> Result<syn::File> {
     let cargo_dir = cargo_dir

src/lib.rs

@@ -4,7 +4,7 @@ extern crate tracing;
 use std::{
     path::PathBuf,
     str::FromStr,
-    sync::{atomic::AtomicBool, Arc},
+    sync::{Arc, atomic::AtomicBool},
 };
 
 mod build;
@@ -23,7 +23,7 @@ use anyhow::{Context, Result};
 use dylib_flag::RustFunction;
 use processor::{Minimizer, PassSelection};
 use tracing::Level;
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry};
+use tracing_subscriber::{EnvFilter, Registry, layer::SubscriberExt, util::SubscriberInitExt};
 
 use crate::processor::Pass;
 

src/main.rs

@@ -2,13 +2,13 @@
 extern crate tracing;
 
 use std::sync::{
-    atomic::{AtomicBool, Ordering},
     Arc,
+    atomic::{AtomicBool, Ordering},
 };
 
 use anyhow::Result;
 use cargo_minimize::{Cargo, Parser};
-use tracing::{error, Level};
+use tracing::{Level, error};
 
 fn main() -> Result<()> {
     let Cargo::Minimize(options) = Cargo::parse();

src/passes/everybody_loops.rs

@@ -1,7 +1,7 @@
 use quote::ToTokens;
 use syn::{parse_quote, visit_mut::VisitMut};
 
-use crate::processor::{tracking, Pass, PassController, ProcessState, SourceFile};
+use crate::processor::{Pass, PassController, ProcessState, SourceFile, tracking};
 
 struct Visitor<'a> {
     current_path: Vec<String>,
@@ -25,9 +25,11 @@ impl<'a> Visitor<'a> {
 impl VisitMut for Visitor<'_> {
     fn visit_block_mut(&mut self, block: &mut syn::Block) {
         match block.stmts.as_slice() {
-            [syn::Stmt::Expr(syn::Expr::Loop(syn::ExprLoop {
+            [
-                body: loop_body, ..
+                syn::Stmt::Expr(syn::Expr::Loop(syn::ExprLoop {
-            }))] if loop_body.stmts.is_empty() => {}
+                    body: loop_body, ..
+                })),
+            ] if loop_body.stmts.is_empty() => {}
             // Empty bodies are empty already, no need to loopify them.
             [] => {}
             _ if self.checker.can_process(&self.current_path) => {

src/passes/field_deleter.rs

@@ -1,7 +1,7 @@
 use quote::ToTokens;
-use syn::{visit_mut::VisitMut, Fields};
+use syn::{Fields, visit_mut::VisitMut};
 
-use crate::processor::{tracking, Pass, PassController, ProcessState, SourceFile};
+use crate::processor::{Pass, PassController, ProcessState, SourceFile, tracking};
 
 struct Visitor<'a> {
     current_path: Vec<String>,

src/passes/item_deleter.rs

@@ -1,11 +1,11 @@
 use quote::ToTokens;
 use syn::{
-    visit_mut::VisitMut, Item, ItemConst, ItemEnum, ItemExternCrate, ItemFn, ItemMacro, ItemMacro2,
+    Item, ItemConst, ItemEnum, ItemExternCrate, ItemFn, ItemMacro, ItemMacro2, ItemMod, ItemStatic,
-    ItemMod, ItemStatic, ItemStruct, ItemTrait, ItemTraitAlias, ItemType, ItemUnion, ItemUse,
+    ItemStruct, ItemTrait, ItemTraitAlias, ItemType, ItemUnion, ItemUse, Signature,
-    Signature,
+    visit_mut::VisitMut,
 };
 
-use crate::processor::{tracking, Pass, PassController, ProcessState, SourceFile};
+use crate::processor::{Pass, PassController, ProcessState, SourceFile, tracking};
 
 struct Visitor<'a> {
     current_path: Vec<String>,

src/passes/privatize.rs

@@ -1,7 +1,7 @@
 use quote::ToTokens;
-use syn::{parse_quote, visit_mut::VisitMut, Visibility};
+use syn::{Visibility, parse_quote, visit_mut::VisitMut};
 
-use crate::processor::{tracking, Pass, PassController, ProcessState, SourceFile};
+use crate::processor::{Pass, PassController, ProcessState, SourceFile, tracking};
 
 struct Visitor<'a> {
     pub_crate: Visibility,

src/passes/split_use.rs

@@ -1,9 +1,9 @@
 use std::ops::DerefMut;
 
-use crate::processor::{tracking, Pass, PassController, ProcessState, SourceFile};
+use crate::processor::{Pass, PassController, ProcessState, SourceFile, tracking};
 use quote::ToTokens;
 
-use syn::{visit_mut::VisitMut, Item, ItemUse, UseName, UsePath, UseRename, UseTree};
+use syn::{Item, ItemUse, UseName, UsePath, UseRename, UseTree, visit_mut::VisitMut};
 
 struct Visitor<'a> {
     process_state: ProcessState,

src/processor/checker.rs

@@ -134,7 +134,9 @@ impl PassController {
     pub fn does_not_reproduce(&mut self) {
         match &mut self.state {
             PassControllerState::InitialCollection { candidates: _ } => {
-                unreachable!("we should have made no changes on initial collection, what do you mean it does not reproduce?!?")
+                unreachable!(
+                    "we should have made no changes on initial collection, what do you mean it does not reproduce?!?"
+                )
             }
             PassControllerState::Bisecting {
                 committed,
@@ -194,7 +196,9 @@ impl PassController {
                 }
             }
             PassControllerState::Bisecting { current, .. } => {
-                unreachable!("Pass said it didn't change anything in the bisection phase, nora forgot what this means: {current:?}");
+                unreachable!(
+                    "Pass said it didn't change anything in the bisection phase, nora forgot what this means: {current:?}"
+                );
             }
             PassControllerState::Success { .. } => {}
         }
@@ -247,11 +251,7 @@ impl PassController {
 pub const fn div_ceil(lhs: usize, rhs: usize) -> usize {
     let d = lhs / rhs;
     let r = lhs % rhs;
-    if r > 0 && rhs > 0 {
+    if r > 0 && rhs > 0 { d + 1 } else { d }
-        d + 1
-    } else {
-        d
-    }
 }
 
 /// Splits an owned container in half.

src/processor/mod.rs

@@ -3,11 +3,11 @@ mod files;
 mod reaper;
 
 pub(crate) use self::files::SourceFile;
-use crate::{build::Build, processor::files::Changes, Options};
+use crate::{Options, build::Build, processor::files::Changes};
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use owo_colors::OwoColorize;
-use std::sync::atomic::Ordering;
 use std::sync::Arc;
+use std::sync::atomic::Ordering;
 use std::{collections::HashSet, ffi::OsStr, fmt::Debug, sync::atomic::AtomicBool};
 
 pub(crate) use self::checker::PassController;
@@ -61,7 +61,9 @@ impl std::str::FromStr for PassSelection {
         let values = s.split(',').collect::<Vec<_>>();
         let have_negative = values.iter().any(|v| v.starts_with("no-"));
         if have_negative && !values.iter().all(|v| v.starts_with("no-")) {
-            return Err("Pass exclusion is supported, by mixing positive pass selection with negative is not allowed (because it's pointless and confusing)");
+            return Err(
+                "Pass exclusion is supported, by mixing positive pass selection with negative is not allowed (because it's pointless and confusing)",
+            );
         }
         let actual_values = values
             .into_iter()

src/processor/reaper.rs

@@ -2,13 +2,13 @@
 
 use crate::build::Build;
 
-use super::{files::Changes, tracking, Minimizer, Pass, PassController, ProcessState, SourceFile};
+use super::{Minimizer, Pass, PassController, ProcessState, SourceFile, files::Changes, tracking};
 use anyhow::{Context, Result};
 use proc_macro2::Span;
 use quote::ToTokens;
-use rustfix::{diagnostics::Diagnostic, Suggestion};
+use rustfix::{Suggestion, diagnostics::Diagnostic};
 use std::{collections::HashMap, ops::Range, path::Path};
-use syn::{visit_mut::VisitMut, ImplItem, Item};
+use syn::{ImplItem, Item, visit_mut::VisitMut};
 
 fn file_for_suggestion(suggestion: &Suggestion) -> &Path {
     Path::new(&suggestion.solutions[0].replacements[0].snippet.file_name)