fmt: Reflow comments after cargo +nightly fmt -all

Author: genericusername2709

cli/src/cli_util.rs

@@ -503,10 +503,10 @@ impl CommandHelper {
                 }
 
                 // We detected the working copy was stale and the client is
-                // configured to auto-update-stale, so let's do
-                // that now. We need to do it up here, not at a
-                // lower level (e.g. inside snapshot_working_copy()) to avoid
-                // recursive locking of the working copy.
+                // configured to auto-update-stale, so let's do that now. We
+                // need to do it up here, not at a lower level (e.g. inside
+                // snapshot_working_copy()) to avoid recursive locking of the
+                // working copy.
                 let WorkspaceCommandHelper { workspace, env, .. } = workspace_command;
                 self.recover_stale_working_copy_impl(ui, workspace, env, &git_import_export_lock)
                     .await?
@@ -647,10 +647,9 @@ impl CommandHelper {
                 workspace_command.check_working_copy_writable()?;
 
                 // Snapshot the current working copy on top of the last known
-                // working-copy operation, then merge the
-                // divergent operations. The wc_commit_id of the
-                // merged repo wouldn't change because the old one wins, but
-                // it's probably fine if we picked the new
+                // working-copy operation, then merge the divergent operations.
+                // The wc_commit_id of the merged repo wouldn't change because
+                // the old one wins, but it's probably fine if we picked the new
                 // wc_commit_id.
                 let stale_stats = workspace_command
                     .snapshot_working_copy(ui, git_import_export_lock)
@@ -1682,8 +1681,8 @@ to the current parents may contain changes from multiple commits.
                     .ok()
                     .map(jj_lib::file_util::expand_home_path)?;
                 // The configured path is usually absolute, but if it's
-                // relative, the "git" command would read the
-                // file at the work-tree directory.
+                // relative, the "git" command would read the file at the
+                // work-tree directory.
                 Some(self.workspace_root().join(path))
             } else {
                 xdg_config_home().map(|x| x.join("git").join("ignore"))
@@ -2204,8 +2203,7 @@ to the current parents may contain changes from multiple commits.
                     .await
                     .map_err(snapshot_command_error)?;
                     // export_refs() is probably unnecessary because there
-                    // should be no rewritten descendants,
-                    // but it's harmless.
+                    // should be no rewritten descendants, but it's harmless.
                     let stats =
                         jj_lib::git::export_refs(mut_repo).map_err(snapshot_command_error)?;
                     crate::git_util::print_git_export_stats(ui, &stats)
@@ -2578,17 +2576,17 @@ to the current parents may contain changes from multiple commits.
         }
 
         // Hint that the user might want to `jj new` to the first conflict
-        // commit to resolve conflicts. Only show the hints if there
-        // were any new or resolved conflicts, and only if there are
-        // still some conflicts.
+        // commit to resolve conflicts. Only show the hints if there were any
+        // new or resolved conflicts, and only if there are still some
+        // conflicts.
         if !(added_conflict_commits.is_empty()
             || resolved_conflicts_by_change_id.is_empty() && new_conflicts_by_change_id.is_empty())
         {
             // If the user just resolved some conflict and squashed them in,
-            // there won't be any new conflicts. Clarify to them
-            // that there are still some other conflicts to resolve.
-            // (We don't mention conflicts in commits that weren't affected by
-            // the operation, however.)
+            // there won't be any new conflicts. Clarify to them that there are
+            // still some other conflicts to resolve. (We don't mention
+            // conflicts in commits that weren't affected by the operation,
+            // however.)
             if new_conflicts_by_change_id.is_empty() {
                 writeln!(
                     fmt,
@@ -3172,8 +3170,9 @@ pub fn print_conflicted_paths(
             );
         }
         // TODO: We might decide it's OK for `jj resolve` to ignore special
-        // files in the `removes` of a conflict (see e.g. https://github.com/jj-vcs/jj/pull/978). In
-        // that case, `conflict.removes` should be removed below.
+        // files in the `removes` of a conflict (see e.g.
+        // https://github.com/jj-vcs/jj/pull/978). In that case,
+        // `conflict.removes` should be removed below.
         for term in itertools::chain(conflict.removes(), conflict.adds()).flatten() {
             seen_objects.insert(
                 match term {
@@ -3669,8 +3668,7 @@ pub async fn compute_commit_location(
                 )
                 .await?;
                 // Not using `RevsetExpression::parents` here to persist the
-                // order of parents specified in
-                // `before_commits`.
+                // order of parents specified in `before_commits`.
                 let new_parent_ids = before_commits
                     .iter()
                     .flat_map(|commit| commit.parent_ids())

cli/src/merge_tools/builtin.rs

@@ -2342,8 +2342,7 @@ mod tests {
                     }
                     if !did_file_exist && is_anything_selected {
                         // File was created, so if any changes are selected,
-                        // then so must the file
-                        // mode change.
+                        // then so must the file mode change.
                         file.sections[0].set_checked(true);
                     }
                 }

cli/src/merge_tools/external.rs

@@ -370,8 +370,8 @@ pub async fn run_mergetool_external(
             }
             Err(err) => {
                 // Some conflicts were already resolved, so we should return an
-                // error with the partially-resolved tree so
-                // that the caller can save the resolved files.
+                // error with the partially-resolved tree so that the caller can
+                // save the resolved files.
                 partial_resolution_error = Some(MergeToolPartialResolutionError {
                     source: err,
                     resolved_count: i,