style: apply stable rustfmt formatting

Author: mark-pro

src/cli/clean/mod.rs

@@ -79,10 +79,14 @@ pub(crate) fn format_clean_plan(plan: &CleanPlan) -> String {
     let mut sections = Vec::new();
 
     if !deleted_candidates.is_empty() {
-        let mut lines = vec!["Tracked branches missing locally and ready to stop tracking:".to_string()];
+        let mut lines =
+            vec!["Tracked branches missing locally and ready to stop tracking:".to_string()];
 
         for candidate in deleted_candidates {
-            lines.push(format!("- {} no longer exists locally", candidate.branch_name));
+            lines.push(format!(
+                "- {} no longer exists locally",
+                candidate.branch_name
+            ));
 
             for restack in &candidate.restack_plan {
                 lines.push(format!(
@@ -166,8 +170,16 @@ fn format_blocked_branch(blocked: &crate::core::clean::BlockedBranch) -> String
 pub(crate) fn confirm_cleanup(plan: &CleanPlan) -> io::Result<bool> {
     let missing_count = plan.deleted_local_count();
     let merged_count = plan.merged_count();
-    let merged_label = if merged_count == 1 { "branch" } else { "branches" };
-    let missing_label = if missing_count == 1 { "branch" } else { "branches" };
+    let merged_label = if merged_count == 1 {
+        "branch"
+    } else {
+        "branches"
+    };
+    let missing_label = if missing_count == 1 {
+        "branch"
+    } else {
+        "branches"
+    };
 
     let prompt = match (missing_count, merged_count) {
         (0, merged) => format!("Delete {merged} merged {merged_label}? [y/N] "),

src/cli/operation/mod.rs

@@ -149,8 +149,10 @@ pub fn render_sections(sections: &[OperationSection], final_view: bool) -> Strin
 fn render_section(section: &OperationSection, final_view: bool) -> String {
     let roots = if final_view
         && section.promote_children_on_deleted_root
-        && matches!(section.root.status, BranchStatus::Deleted | BranchStatus::Archived)
-    {
+        && matches!(
+            section.root.status,
+            BranchStatus::Deleted | BranchStatus::Archived
+        ) {
         section.root.children.as_slice()
     } else {
         std::slice::from_ref(&section.root)

src/core/clean/apply.rs

@@ -5,9 +5,8 @@ use crate::core::git;
 use crate::core::graph::BranchGraph;
 use crate::core::restack;
 use crate::core::store::{
-    BranchArchiveReason,
-    PendingCleanCandidate, PendingCleanCandidateKind, PendingCleanOperation, PendingOperationKind,
-    PendingOperationState, open_initialized, record_branch_archived,
+    BranchArchiveReason, PendingCleanCandidate, PendingCleanCandidateKind, PendingCleanOperation,
+    PendingOperationKind, PendingOperationState, open_initialized, record_branch_archived,
 };
 use crate::core::workflow::{self, RestackExecutionEvent};
 
@@ -308,8 +307,8 @@ where
             )?,
         )?,
         PendingCleanCandidateKind::IntegratedIntoParent => {
-            let Some(parent_branch_name) =
-                BranchGraph::new(&session.state).parent_branch_name(&node, &session.config.trunk_branch)
+            let Some(parent_branch_name) = BranchGraph::new(&session.state)
+                .parent_branch_name(&node, &session.config.trunk_branch)
             else {
                 return Err(io::Error::other(format!(
                     "tracked parent for '{}' is missing from dig",
@@ -422,12 +421,16 @@ where
     }
 }
 
-fn pending_clean_candidate_from_clean_candidate(candidate: &CleanCandidate) -> PendingCleanCandidate {
+fn pending_clean_candidate_from_clean_candidate(
+    candidate: &CleanCandidate,
+) -> PendingCleanCandidate {
     PendingCleanCandidate {
         branch_name: candidate.branch_name.clone(),
         kind: match &candidate.reason {
             CleanReason::DeletedLocally => PendingCleanCandidateKind::DeletedLocally,
-            CleanReason::IntegratedIntoParent { .. } => PendingCleanCandidateKind::IntegratedIntoParent,
+            CleanReason::IntegratedIntoParent { .. } => {
+                PendingCleanCandidateKind::IntegratedIntoParent
+            }
         },
     }
 }

src/core/clean/plan.rs

@@ -62,14 +62,11 @@ fn plan_for_requested_branch(
     };
 
     if !git::branch_exists(&node.branch_name)? {
-        let candidates = deleted_local::collect_deleted_local_subtree_steps(
-            state,
-            trunk_branch,
-            node.id,
-        )?
-        .into_iter()
-        .map(clean_candidate_from_deleted_step)
-        .collect();
+        let candidates =
+            deleted_local::collect_deleted_local_subtree_steps(state, trunk_branch, node.id)?
+                .into_iter()
+                .map(clean_candidate_from_deleted_step)
+                .collect();
 
         return Ok(CleanPlan {
             trunk_branch: trunk_branch.to_string(),
@@ -236,7 +233,9 @@ fn evaluate_integrated_branch(
     }))
 }
 
-fn clean_candidate_from_deleted_step(step: deleted_local::DeletedLocalBranchStep) -> CleanCandidate {
+fn clean_candidate_from_deleted_step(
+    step: deleted_local::DeletedLocalBranchStep,
+) -> CleanCandidate {
     CleanCandidate {
         node_id: step.node_id,
         branch_name: step.branch_name,

src/core/deleted_local.rs

@@ -2,11 +2,11 @@ use std::io;
 
 use uuid::Uuid;
 
+use crate::core::git;
 use crate::core::graph::{BranchGraph, BranchTreeNode};
 use crate::core::restack::{self, RestackAction, RestackPreview};
 use crate::core::store::types::DigState;
 use crate::core::store::{BranchArchiveReason, ParentRef, StoreSession, record_branch_archived};
-use crate::core::git;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub(crate) struct DeletedLocalBranchStep {
@@ -95,7 +95,9 @@ fn collect_deleted_local_steps_with_scope(
     let mut simulated_state = state.clone();
     let mut steps = Vec::new();
 
-    while let Some(step) = next_deleted_local_step_with_scope(&simulated_state, trunk_branch, scope)? {
+    while let Some(step) =
+        next_deleted_local_step_with_scope(&simulated_state, trunk_branch, scope)?
+    {
         simulate_deleted_local_step(&mut simulated_state, &step)?;
         steps.push(step);
     }
@@ -117,7 +119,11 @@ fn next_deleted_local_step_with_scope(
         };
 
         if !git::branch_exists(&node.branch_name)? {
-            missing_nodes.push((graph.branch_depth(node.id), node.branch_name.clone(), node.id));
+            missing_nodes.push((
+                graph.branch_depth(node.id),
+                node.branch_name.clone(),
+                node.id,
+            ));
         }
     }
 
@@ -154,9 +160,10 @@ fn plan_deleted_local_step(
     trunk_branch: &str,
     node_id: Uuid,
 ) -> io::Result<DeletedLocalBranchStep> {
-    let node = state.find_branch_by_id(node_id).cloned().ok_or_else(|| {
-        io::Error::new(io::ErrorKind::NotFound, "tracked branch was not found")
-    })?;
+    let node = state
+        .find_branch_by_id(node_id)
+        .cloned()
+        .ok_or_else(|| io::Error::new(io::ErrorKind::NotFound, "tracked branch was not found"))?;
     let graph = BranchGraph::new(state);
     let (new_parent_branch_name, new_parent) =
         resolve_replacement_parent(state, trunk_branch, &node.parent)?;

tests/clean.rs

@@ -22,9 +22,7 @@ fn clean_untracks_deleted_middle_branch_and_restacks_descendants() {
         let stdout = strip_ansi(&String::from_utf8(output.stdout).unwrap());
 
         assert!(output.status.success());
-        assert!(stdout.contains(
-            "Tracked branches missing locally and ready to stop tracking:"
-        ));
+        assert!(stdout.contains("Tracked branches missing locally and ready to stop tracking:"));
         assert!(stdout.contains("Stop tracking 1 missing branch? [y/N]"));
         assert!(stdout.contains("No longer tracked by dig:"));
         assert!(stdout.contains("- feat/auth"));
@@ -96,9 +94,9 @@ fn clean_untracks_missing_branches_before_cleaning_newly_unblocked_merged_parent
         let stdout = strip_ansi(&String::from_utf8(output.stdout).unwrap());
 
         assert!(output.status.success());
-        assert!(stdout.contains(
-            "Delete 1 merged branch and stop tracking 1 missing branch? [y/N]"
-        ));
+        assert!(
+            stdout.contains("Delete 1 merged branch and stop tracking 1 missing branch? [y/N]")
+        );
         assert!(stdout.contains("No longer tracked by dig:"));
         assert!(stdout.contains("- feat/users"));
         assert!(stdout.contains("Deleted:"));