style: apply formatting to bookmark bump implementation

Author: obayemi

cli/src/commands/bookmark/bump.rs

@@ -30,29 +30,26 @@ use crate::ui::Ui;
 
 /// Move a bookmark to the latest non-empty descendant
 ///
-/// Finds the closest bookmark on the specified revision or any of its ancestors,
-/// then moves that bookmark forward to the topologically latest non-empty descendant.
+/// Finds the closest bookmark on the specified revision or any of its
+/// ancestors, then moves that bookmark forward to the topologically latest
+/// non-empty descendant.
 ///
-/// This is useful for advancing a bookmark after making several commits, without
-/// having to manually specify the bookmark name or target revision.
+/// This is useful for advancing a bookmark after making several commits,
+/// without having to manually specify the bookmark name or target revision.
 ///
 /// If multiple bookmarks exist on the same commit, the alphabetically first one
 /// is selected.
 ///
-/// Example: After creating commits on top of a bookmarked commit, move the bookmark
-/// forward to the latest non-empty commit:
+/// Example: After creating commits on top of a bookmarked commit, move the
+/// bookmark forward to the latest non-empty commit:
 ///
 /// ```shell
 /// $ jj bookmark bump
 /// ```
 #[derive(clap::Args, Clone, Debug)]
 pub struct BookmarkBumpArgs {
     /// Revision to start searching for bookmarks from (searches ancestors too)
-    #[arg(
-        long, short,
-        value_name = "REVSET",
-        default_value = "@"
-    )]
+    #[arg(long, short, value_name = "REVSET", default_value = "@")]
     from: RevisionArg,
 
     /// Allow moving the bookmark backwards or sideways
@@ -70,35 +67,28 @@ pub fn cmd_bookmark_bump(
     let from_commit = workspace_command.resolve_single_rev(ui, &args.from)?;
 
     let (bookmark_name, bookmark_commit) = {
-        let ancestors_expression = workspace_command
-            .parse_revset(ui, &RevisionArg::from(format!("::{}", from_commit.id().hex())))?;
+        let ancestors_expression = workspace_command.parse_revset(
+            ui,
+            &RevisionArg::from(format!("::{}", from_commit.id().hex())),
+        )?;
         let store = repo.store();
         let ancestors = ancestors_expression.evaluate()?;
-        
-        let ancestor_ids: Vec<_> = ancestors
-            .iter()
-            .try_collect()?;
-        
+
+        let ancestor_ids: Vec<_> = ancestors.iter().try_collect()?;
+
         let pattern = StringPattern::everything();
-        let all_bookmarks: Vec<_> = repo
-            .view()
-            .local_bookmarks_matching(&pattern)
-            .collect();
-        
+        let all_bookmarks: Vec<_> = repo.view().local_bookmarks_matching(&pattern).collect();
+
         let mut bookmark_on_ancestor = None;
         for ancestor_id in &ancestor_ids {
             let mut bookmarks_here: Vec<_> = all_bookmarks
                 .iter()
-                .filter(|(_, target)| {
-                    target
-                        .added_ids()
-                        .any(|id| id == ancestor_id)
-                })
+                .filter(|(_, target)| target.added_ids().any(|id| id == ancestor_id))
                 .collect();
-            
+
             if !bookmarks_here.is_empty() {
                 bookmarks_here.sort_by_key(|(name, _)| *name);
-                
+
                 if bookmarks_here.len() > 1 {
                     writeln!(
                         ui.warning_default(),
@@ -115,14 +105,14 @@ pub fn cmd_bookmark_bump(
                         bookmarks_here[0].0.as_symbol()
                     )?;
                 }
-                
+
                 let (name, _) = bookmarks_here[0];
                 let name_string = name.as_symbol().to_string();
                 bookmark_on_ancestor = Some((name_string, store.get_commit(ancestor_id)?));
                 break;
             }
         }
-        
+
         bookmark_on_ancestor.ok_or_else(|| {
             user_error(format!(
                 "No bookmarks found on {} or its ancestors",
@@ -132,15 +122,15 @@ pub fn cmd_bookmark_bump(
     };
 
     let target_commit = {
-        let revset_expression = workspace_command
-            .parse_revset(ui, &RevisionArg::from(format!("heads({}+ & ~empty())", bookmark_commit.id().hex())))?;
+        let revset_expression = workspace_command.parse_revset(
+            ui,
+            &RevisionArg::from(format!("heads({}+ & ~empty())", bookmark_commit.id().hex())),
+        )?;
         let store = repo.store();
         let descendants = revset_expression.evaluate()?;
-        
-        let commit_ids: Vec<_> = descendants
-            .iter()
-            .try_collect()?;
-        
+
+        let commit_ids: Vec<_> = descendants.iter().try_collect()?;
+
         commit_ids
             .into_iter()
             .map(|id| store.get_commit(&id))
@@ -156,12 +146,11 @@ pub fn cmd_bookmark_bump(
     };
 
     if !args.allow_backwards {
-        let matches = find_local_bookmarks(repo.view(), &[StringPattern::exact(bookmark_name.clone())])?;
+        let matches =
+            find_local_bookmarks(repo.view(), &[StringPattern::exact(bookmark_name.clone())])?;
         if let Some((name, _old_target)) = matches
             .into_iter()
-            .find(|(_, old_target)| {
-                !is_fast_forward(repo.as_ref(), old_target, target_commit.id())
-            })
+            .find(|(_, old_target)| !is_fast_forward(repo.as_ref(), old_target, target_commit.id()))
         {
             return Err(user_error_with_hint(
                 format!(
@@ -173,15 +162,20 @@ pub fn cmd_bookmark_bump(
         }
     }
 
-    let bookmark_ref_name = revset_util::parse_bookmark_name(&bookmark_name)
-        .map_err(|e| user_error(format!("Failed to parse bookmark name '{}': {}", bookmark_name, e)))?;
+    let bookmark_ref_name = revset_util::parse_bookmark_name(&bookmark_name).map_err(|e| {
+        user_error(format!(
+            "Failed to parse bookmark name '{bookmark_name}': {e}"
+        ))
+    })?;
 
     let mut tx = workspace_command.start_transaction();
-    tx.repo_mut()
-        .set_local_bookmark_target(&bookmark_ref_name, RefTarget::normal(target_commit.id().clone()));
+    tx.repo_mut().set_local_bookmark_target(
+        &bookmark_ref_name,
+        RefTarget::normal(target_commit.id().clone()),
+    );
 
     if let Some(mut formatter) = ui.status_formatter() {
-        write!(formatter, "Moved bookmark {} to ", bookmark_name)?;
+        write!(formatter, "Moved bookmark {bookmark_name} to ")?;
         tx.write_commit_summary(formatter.as_mut(), &target_commit)?;
         writeln!(formatter)?;
     }

cli/tests/test_bookmark_command.rs

@@ -2462,7 +2462,12 @@ fn test_bookmark_bump_backwards() {
     [exit status: 1]
     "###);
 
-    let output = work_dir.run_jj(["bookmark", "bump", "--from=description(second)", "--allow-backwards"]);
+    let output = work_dir.run_jj([
+        "bookmark",
+        "bump",
+        "--from=description(second)",
+        "--allow-backwards",
+    ]);
     insta::assert_snapshot!(output, @r###"
     ------- stderr -------
     Error: No non-empty descendants found for revision 63351e1b9362cbf9d47547d2e87a5e3bb8bcab3c