cli, lib: move to Rust 2024 language edition

This applies a `cargo fmt` and fixes clippy lints to keep the build
properly working.

Signed-off-by: Austin Seipp <aseipp@pobox.com>

Cargo.toml

@@ -8,7 +8,7 @@ members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
 version = "0.31.0"
 license = "Apache-2.0"
 rust-version = "1.85" # NOTE: remember to update CI, contributing.md, changelog.md, and install-and-setup.md
-edition = "2021"
+edition = "2024"
 readme = "README.md"
 homepage = "https://github.com/jj-vcs/jj"
 repository = "https://github.com/jj-vcs/jj"

cli/src/cleanup_guard.rs

@@ -55,9 +55,9 @@ mod platform {
     use std::sync::atomic::Ordering;
     use std::thread;
 
-    use libc::c_int;
     use libc::SIGINT;
     use libc::SIGTERM;
+    use libc::c_int;
 
     use super::*;
 

cli/src/cli_util.rs

@@ -35,16 +35,16 @@ use std::time::SystemTime;
 
 use bstr::ByteVec as _;
 use chrono::TimeZone as _;
+use clap::ArgAction;
+use clap::ArgMatches;
+use clap::Command;
+use clap::FromArgMatches as _;
 use clap::builder::MapValueParser;
 use clap::builder::NonEmptyStringValueParser;
 use clap::builder::TypedValueParser as _;
 use clap::builder::ValueParserFactory;
 use clap::error::ContextKind;
 use clap::error::ContextValue;
-use clap::ArgAction;
-use clap::ArgMatches;
-use clap::Command;
-use clap::FromArgMatches as _;
 use clap_complete::ArgValueCandidates;
 use clap_complete::ArgValueCompleter;
 use indexmap::IndexMap;
@@ -87,7 +87,6 @@ use jj_lib::ref_name::RefName;
 use jj_lib::ref_name::RefNameBuf;
 use jj_lib::ref_name::WorkspaceName;
 use jj_lib::ref_name::WorkspaceNameBuf;
-use jj_lib::repo::merge_factories_map;
 use jj_lib::repo::CheckOutCommitError;
 use jj_lib::repo::EditCommitError;
 use jj_lib::repo::MutableRepo;
@@ -96,6 +95,7 @@ use jj_lib::repo::Repo;
 use jj_lib::repo::RepoLoader;
 use jj_lib::repo::StoreFactories;
 use jj_lib::repo::StoreLoadError;
+use jj_lib::repo::merge_factories_map;
 use jj_lib::repo_path::RepoPath;
 use jj_lib::repo_path::RepoPathBuf;
 use jj_lib::repo_path::RepoPathUiConverter;
@@ -129,8 +129,6 @@ use jj_lib::working_copy::UntrackedReason;
 use jj_lib::working_copy::WorkingCopy;
 use jj_lib::working_copy::WorkingCopyFactory;
 use jj_lib::working_copy::WorkingCopyFreshness;
-use jj_lib::workspace::default_working_copy_factories;
-use jj_lib::workspace::get_working_copy_factory;
 use jj_lib::workspace::DefaultWorkspaceLoaderFactory;
 use jj_lib::workspace::LockedWorkspace;
 use jj_lib::workspace::WorkingCopyFactories;
@@ -138,11 +136,14 @@ use jj_lib::workspace::Workspace;
 use jj_lib::workspace::WorkspaceLoadError;
 use jj_lib::workspace::WorkspaceLoader;
 use jj_lib::workspace::WorkspaceLoaderFactory;
+use jj_lib::workspace::default_working_copy_factories;
+use jj_lib::workspace::get_working_copy_factory;
 use pollster::FutureExt as _;
 use tracing::instrument;
 use tracing_chrome::ChromeLayerBuilder;
 use tracing_subscriber::prelude::*;
 
+use crate::command_error::CommandError;
 use crate::command_error::cli_error;
 use crate::command_error::config_error_with_message;
 use crate::command_error::handle_command_result;
@@ -151,15 +152,14 @@ use crate::command_error::internal_error_with_message;
 use crate::command_error::print_parse_diagnostics;
 use crate::command_error::user_error;
 use crate::command_error::user_error_with_hint;
-use crate::command_error::CommandError;
 use crate::commit_templater::CommitTemplateLanguage;
 use crate::commit_templater::CommitTemplateLanguageExtension;
 use crate::complete;
-use crate::config::config_from_environment;
-use crate::config::parse_config_args;
 use crate::config::ConfigArgKind;
 use crate::config::ConfigEnv;
 use crate::config::RawConfig;
+use crate::config::config_from_environment;
+use crate::config::parse_config_args;
 use crate::description_util::TextEditor;
 use crate::diff_util;
 use crate::diff_util::DiffFormat;

cli/src/commands/abandon.rs

@@ -24,11 +24,11 @@ use jj_lib::revset::RevsetExpression;
 use jj_lib::rewrite::RewriteRefsOptions;
 use tracing::instrument;
 
+use crate::cli_util::CommandHelper;
+use crate::cli_util::RevisionArg;
 #[cfg(feature = "git")]
 use crate::cli_util::has_tracked_remote_bookmarks;
 use crate::cli_util::print_updated_commits;
-use crate::cli_util::CommandHelper;
-use crate::cli_util::RevisionArg;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::ui::Ui;

cli/src/commands/absorb.rs

@@ -13,16 +13,16 @@
 // limitations under the License.
 
 use clap_complete::ArgValueCompleter;
+use jj_lib::absorb::AbsorbSource;
 use jj_lib::absorb::absorb_hunks;
 use jj_lib::absorb::split_hunks_to_trees;
-use jj_lib::absorb::AbsorbSource;
 use jj_lib::matchers::EverythingMatcher;
 use pollster::FutureExt as _;
 use tracing::instrument;
 
-use crate::cli_util::print_updated_commits;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
+use crate::cli_util::print_updated_commits;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::diff_util::DiffFormat;

cli/src/commands/bench/common_ancestors.rs

@@ -16,8 +16,8 @@ use std::slice;
 
 use jj_lib::repo::Repo as _;
 
-use super::run_bench;
 use super::CriterionArgs;
+use super::run_bench;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
 use crate::command_error::CommandError;

cli/src/commands/bench/is_ancestor.rs

@@ -14,8 +14,8 @@
 
 use jj_lib::repo::Repo as _;
 
-use super::run_bench;
 use super::CriterionArgs;
+use super::run_bench;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
 use crate::command_error::CommandError;

cli/src/commands/bench/mod.rs

@@ -24,14 +24,14 @@ use std::time::Instant;
 use clap::Subcommand;
 use criterion::Criterion;
 
-use self::common_ancestors::cmd_bench_common_ancestors;
 use self::common_ancestors::BenchCommonAncestorsArgs;
-use self::is_ancestor::cmd_bench_is_ancestor;
+use self::common_ancestors::cmd_bench_common_ancestors;
 use self::is_ancestor::BenchIsAncestorArgs;
-use self::resolve_prefix::cmd_bench_resolve_prefix;
+use self::is_ancestor::cmd_bench_is_ancestor;
 use self::resolve_prefix::BenchResolvePrefixArgs;
-use self::revset::cmd_bench_revset;
+use self::resolve_prefix::cmd_bench_resolve_prefix;
 use self::revset::BenchRevsetArgs;
+use self::revset::cmd_bench_revset;
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
 use crate::ui::Ui;

cli/src/commands/bench/resolve_prefix.rs

@@ -15,8 +15,8 @@
 use jj_lib::object_id::HexPrefix;
 use jj_lib::repo::Repo as _;
 
-use super::run_bench;
 use super::CriterionArgs;
+use super::run_bench;
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
 use crate::ui::Ui;

cli/src/commands/bench/revset.rs

@@ -15,16 +15,16 @@
 use std::rc::Rc;
 use std::time::Instant;
 
-use criterion::measurement::Measurement;
 use criterion::BatchSize;
 use criterion::BenchmarkGroup;
 use criterion::BenchmarkId;
+use criterion::measurement::Measurement;
 use jj_lib::revset::SymbolResolver;
 use jj_lib::revset::SymbolResolverExtension;
 use jj_lib::revset::UserRevsetExpression;
 
-use super::new_criterion;
 use super::CriterionArgs;
+use super::new_criterion;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
 use crate::cli_util::WorkspaceCommandHelper;

cli/src/commands/bookmark/create.rs

@@ -18,11 +18,11 @@ use jj_lib::object_id::ObjectId as _;
 use jj_lib::op_store::RefTarget;
 use jj_lib::ref_name::RefNameBuf;
 
-use crate::cli_util::has_tracked_remote_bookmarks;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error_with_hint;
+use crate::cli_util::has_tracked_remote_bookmarks;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_hint;
 use crate::complete;
 use crate::revset_util;
 use crate::ui::Ui;

cli/src/commands/bookmark/mod.rs

@@ -32,28 +32,28 @@ use jj_lib::repo::Repo;
 use jj_lib::str_util::StringPattern;
 use jj_lib::view::View;
 
-use self::create::cmd_bookmark_create;
 use self::create::BookmarkCreateArgs;
-use self::delete::cmd_bookmark_delete;
+use self::create::cmd_bookmark_create;
 use self::delete::BookmarkDeleteArgs;
-use self::forget::cmd_bookmark_forget;
+use self::delete::cmd_bookmark_delete;
 use self::forget::BookmarkForgetArgs;
-use self::list::cmd_bookmark_list;
+use self::forget::cmd_bookmark_forget;
 use self::list::BookmarkListArgs;
-use self::r#move::cmd_bookmark_move;
+use self::list::cmd_bookmark_list;
 use self::r#move::BookmarkMoveArgs;
-use self::rename::cmd_bookmark_rename;
+use self::r#move::cmd_bookmark_move;
 use self::rename::BookmarkRenameArgs;
-use self::set::cmd_bookmark_set;
+use self::rename::cmd_bookmark_rename;
 use self::set::BookmarkSetArgs;
-use self::track::cmd_bookmark_track;
+use self::set::cmd_bookmark_set;
 use self::track::BookmarkTrackArgs;
-use self::untrack::cmd_bookmark_untrack;
+use self::track::cmd_bookmark_track;
 use self::untrack::BookmarkUntrackArgs;
+use self::untrack::cmd_bookmark_untrack;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RemoteBookmarkNamePattern;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 // Unlike most other aliases, `b` is defined in the config and can be overridden

cli/src/commands/bookmark/move.rs

@@ -23,8 +23,8 @@ use super::find_bookmarks_with;
 use super::is_fast_forward;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error_with_hint;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_hint;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/bookmark/rename.rs

@@ -16,10 +16,10 @@ use clap_complete::ArgValueCandidates;
 use jj_lib::op_store::RefTarget;
 use jj_lib::ref_name::RefNameBuf;
 
-use crate::cli_util::has_tracked_remote_bookmarks;
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
+use crate::cli_util::has_tracked_remote_bookmarks;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
 use crate::revset_util;
 use crate::ui::Ui;

cli/src/commands/bookmark/set.rs

@@ -20,11 +20,11 @@ use jj_lib::op_store::RefTarget;
 use jj_lib::ref_name::RefNameBuf;
 
 use super::is_fast_forward;
-use crate::cli_util::has_tracked_remote_bookmarks;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error_with_hint;
+use crate::cli_util::has_tracked_remote_bookmarks;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_hint;
 use crate::complete;
 use crate::revset_util;
 use crate::ui::Ui;

cli/src/commands/commit.rs

@@ -21,8 +21,8 @@ use jj_lib::repo::Repo as _;
 use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
 use crate::description_util::add_trailers;
 use crate::description_util::description_template;

cli/src/commands/config/edit.rs

@@ -17,8 +17,8 @@ use tracing::instrument;
 
 use super::ConfigLevelArgs;
 use crate::cli_util::CommandHelper;
-use crate::command_error::print_error_sources;
 use crate::command_error::CommandError;
+use crate::command_error::print_error_sources;
 use crate::ui::Ui;
 
 /// Start an editor on a jj config file.

cli/src/commands/config/list.rs

@@ -22,8 +22,8 @@ use super::ConfigLevelArgs;
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
 use crate::complete;
-use crate::config::resolved_config_values;
 use crate::config::AnnotatedValue;
+use crate::config::resolved_config_values;
 use crate::generic_templater;
 use crate::generic_templater::GenericTemplateLanguage;
 use crate::templater::TemplatePropertyExt as _;

cli/src/commands/config/mod.rs

@@ -26,21 +26,21 @@ use jj_lib::config::ConfigFile;
 use jj_lib::config::ConfigSource;
 use tracing::instrument;
 
-use self::edit::cmd_config_edit;
 use self::edit::ConfigEditArgs;
-use self::get::cmd_config_get;
+use self::edit::cmd_config_edit;
 use self::get::ConfigGetArgs;
-use self::list::cmd_config_list;
+use self::get::cmd_config_get;
 use self::list::ConfigListArgs;
-use self::path::cmd_config_path;
+use self::list::cmd_config_list;
 use self::path::ConfigPathArgs;
-use self::set::cmd_config_set;
+use self::path::cmd_config_path;
 use self::set::ConfigSetArgs;
-use self::unset::cmd_config_unset;
+use self::set::cmd_config_set;
 use self::unset::ConfigUnsetArgs;
+use self::unset::cmd_config_unset;
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::config::ConfigEnv;
 use crate::ui::Ui;
 

cli/src/commands/config/path.rs

@@ -19,8 +19,8 @@ use tracing::instrument;
 
 use super::ConfigLevelArgs;
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 /// Print the paths to the config files

cli/src/commands/config/set.rs

@@ -24,8 +24,8 @@ use tracing::instrument;
 use super::ConfigLevelArgs;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::WorkspaceCommandHelper;
-use crate::command_error::user_error_with_message;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_message;
 use crate::complete;
 use crate::config::parse_value_or_bare_string;
 use crate::ui::Ui;

cli/src/commands/config/unset.rs

@@ -18,9 +18,9 @@ use tracing::instrument;
 
 use super::ConfigLevelArgs;
 use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
 use crate::command_error::user_error;
 use crate::command_error::user_error_with_message;
-use crate::command_error::CommandError;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/debug/fileset.rs

@@ -19,8 +19,8 @@ use jj_lib::fileset;
 use jj_lib::fileset::FilesetDiagnostics;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::print_parse_diagnostics;
 use crate::command_error::CommandError;
+use crate::command_error::print_parse_diagnostics;
 use crate::ui::Ui;
 
 /// Parse fileset expression

cli/src/commands/debug/index.rs

@@ -18,9 +18,9 @@ use std::io::Write as _;
 use jj_lib::default_index::DefaultReadonlyIndex;
 
 use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
 use crate::command_error::internal_error;
 use crate::command_error::user_error;
-use crate::command_error::CommandError;
 use crate::ui::Ui;
 
 /// Show commit index stats

cli/src/commands/debug/init_simple.rs

@@ -19,9 +19,9 @@ use jj_lib::workspace::Workspace;
 use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
 use crate::command_error::cli_error;
 use crate::command_error::user_error_with_message;
-use crate::command_error::CommandError;
 use crate::ui::Ui;
 
 /// Create a new repo in the given directory using the proof-of-concept simple

cli/src/commands/debug/mod.rs

@@ -32,35 +32,35 @@ use std::fmt::Debug;
 use clap::Subcommand;
 use jj_lib::local_working_copy::LocalWorkingCopy;
 
-use self::copy_detection::cmd_debug_copy_detection;
 use self::copy_detection::CopyDetectionArgs;
-use self::fileset::cmd_debug_fileset;
+use self::copy_detection::cmd_debug_copy_detection;
 use self::fileset::DebugFilesetArgs;
-use self::index::cmd_debug_index;
+use self::fileset::cmd_debug_fileset;
 use self::index::DebugIndexArgs;
-use self::init_simple::cmd_debug_init_simple;
+use self::index::cmd_debug_index;
 use self::init_simple::DebugInitSimpleArgs;
-use self::local_working_copy::cmd_debug_local_working_copy;
+use self::init_simple::cmd_debug_init_simple;
 use self::local_working_copy::DebugLocalWorkingCopyArgs;
-use self::operation::cmd_debug_operation;
+use self::local_working_copy::cmd_debug_local_working_copy;
 use self::operation::DebugOperationArgs;
-use self::reindex::cmd_debug_reindex;
+use self::operation::cmd_debug_operation;
 use self::reindex::DebugReindexArgs;
-use self::revset::cmd_debug_revset;
+use self::reindex::cmd_debug_reindex;
 use self::revset::DebugRevsetArgs;
-use self::snapshot::cmd_debug_snapshot;
+use self::revset::cmd_debug_revset;
 use self::snapshot::DebugSnapshotArgs;
-use self::template::cmd_debug_template;
+use self::snapshot::cmd_debug_snapshot;
 use self::template::DebugTemplateArgs;
-use self::tree::cmd_debug_tree;
+use self::template::cmd_debug_template;
 use self::tree::DebugTreeArgs;
-use self::watchman::cmd_debug_watchman;
+use self::tree::cmd_debug_tree;
 use self::watchman::DebugWatchmanCommand;
-use self::working_copy::cmd_debug_working_copy;
+use self::watchman::cmd_debug_watchman;
 use self::working_copy::DebugWorkingCopyArgs;
+use self::working_copy::cmd_debug_working_copy;
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 /// Low-level commands not intended for users

cli/src/commands/debug/reindex.rs

@@ -18,9 +18,9 @@ use std::io::Write as _;
 use jj_lib::default_index::DefaultIndexStore;
 
 use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
 use crate::command_error::internal_error;
 use crate::command_error::user_error;
-use crate::command_error::CommandError;
 use crate::ui::Ui;
 
 /// Rebuild commit index

cli/src/commands/debug/revset.rs

@@ -20,8 +20,8 @@ use jj_lib::revset;
 use jj_lib::revset::RevsetDiagnostics;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::print_parse_diagnostics;
 use crate::command_error::CommandError;
+use crate::command_error::print_parse_diagnostics;
 use crate::revset_util;
 use crate::ui::Ui;
 

cli/src/commands/debug/tree.rs

@@ -22,8 +22,8 @@ use jj_lib::repo_path::RepoPathBuf;
 
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 /// List the recursive entries of a tree.

cli/src/commands/debug/watchman.rs

@@ -27,8 +27,8 @@ use jj_lib::fsmonitor::WatchmanConfig;
 use jj_lib::local_working_copy::LocalWorkingCopy;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 #[derive(Subcommand, Clone, Debug)]
@@ -86,7 +86,7 @@ pub fn cmd_debug_watchman(
                 other_fsmonitor => {
                     return Err(user_error(format!(
                         r"This command does not support the currently enabled filesystem monitor: {other_fsmonitor:?}."
-                    )))
+                    )));
                 }
             };
             let wc = check_local_disk_wc(workspace_command.working_copy().as_any())?;

cli/src/commands/describe.rs

@@ -26,16 +26,16 @@ use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
+use crate::description_util::ParsedBulkEditMessage;
 use crate::description_util::add_trailers_with_template;
 use crate::description_util::description_template;
 use crate::description_util::edit_description;
 use crate::description_util::edit_multiple_descriptions;
 use crate::description_util::join_message_paragraphs;
 use crate::description_util::parse_trailers_template;
-use crate::description_util::ParsedBulkEditMessage;
 use crate::text_util::parse_author;
 use crate::ui::Ui;
 

cli/src/commands/diff.rs

@@ -21,16 +21,16 @@ use jj_lib::rewrite::merge_commit_trees;
 use pollster::FutureExt as _;
 use tracing::instrument;
 
-use crate::cli_util::print_unmatched_explicit_paths;
-use crate::cli_util::short_commit_hash;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error_with_hint;
+use crate::cli_util::print_unmatched_explicit_paths;
+use crate::cli_util::short_commit_hash;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_hint;
 use crate::complete;
+use crate::diff_util::DiffFormatArgs;
 use crate::diff_util::get_copy_records;
 use crate::diff_util::show_templated;
-use crate::diff_util::DiffFormatArgs;
 use crate::ui::Ui;
 
 /// Compare file contents between two revisions

cli/src/commands/diffedit.rs

@@ -22,9 +22,9 @@ use jj_lib::rewrite::merge_commit_trees;
 use pollster::FutureExt as _;
 use tracing::instrument;
 
-use crate::cli_util::print_unmatched_explicit_paths;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
+use crate::cli_util::print_unmatched_explicit_paths;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::ui::Ui;
@@ -116,8 +116,10 @@ pub(crate) fn cmd_diffedit(
     if args.from.is_some() || args.to.is_some() {
         target_commit = workspace_command
             .resolve_single_rev(ui, args.to.as_ref().unwrap_or(&RevisionArg::AT))?;
-        base_commits = vec![workspace_command
-            .resolve_single_rev(ui, args.from.as_ref().unwrap_or(&RevisionArg::AT))?];
+        base_commits = vec![
+            workspace_command
+                .resolve_single_rev(ui, args.from.as_ref().unwrap_or(&RevisionArg::AT))?,
+        ];
         diff_description = format!(
             "The diff initially shows the commit's changes relative to:\n{}",
             workspace_command.format_commit_summary(&base_commits[0])

cli/src/commands/duplicate.rs

@@ -20,17 +20,17 @@ use itertools::Itertools as _;
 use jj_lib::backend::BackendResult;
 use jj_lib::backend::CommitId;
 use jj_lib::repo::Repo as _;
+use jj_lib::rewrite::DuplicateCommitsStats;
 use jj_lib::rewrite::duplicate_commits;
 use jj_lib::rewrite::duplicate_commits_onto_parents;
-use jj_lib::rewrite::DuplicateCommitsStats;
 use tracing::instrument;
 
-use crate::cli_util::compute_commit_location;
-use crate::cli_util::short_commit_hash;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error;
+use crate::cli_util::compute_commit_location;
+use crate::cli_util::short_commit_hash;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/evolog.rs

@@ -19,21 +19,21 @@ use clap_complete::ArgValueCompleter;
 use itertools::Itertools as _;
 use jj_lib::commit::Commit;
 use jj_lib::evolution::walk_predecessors;
-use jj_lib::graph::reverse_graph;
 use jj_lib::graph::GraphEdge;
 use jj_lib::graph::TopoGroupedGraphIterator;
+use jj_lib::graph::reverse_graph;
 use jj_lib::matchers::EverythingMatcher;
 use tracing::instrument;
 
-use crate::cli_util::format_template;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::LogContentFormat;
 use crate::cli_util::RevisionArg;
+use crate::cli_util::format_template;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::diff_util::DiffFormatArgs;
-use crate::graphlog::get_graphlog;
 use crate::graphlog::GraphStyle;
+use crate::graphlog::get_graphlog;
 use crate::templater::TemplateRenderer;
 use crate::ui::Ui;
 

cli/src/commands/file/annotate.rs

@@ -23,8 +23,8 @@ use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::commit_templater::AnnotationLine;
 use crate::complete;
 use crate::templater::TemplateRenderer;

cli/src/commands/file/chmod.rs

@@ -18,11 +18,11 @@ use jj_lib::merged_tree::MergedTreeBuilder;
 use jj_lib::object_id::ObjectId as _;
 use tracing::instrument;
 
-use crate::cli_util::print_unmatched_explicit_paths;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error;
+use crate::cli_util::print_unmatched_explicit_paths;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/file/show.rs

@@ -16,9 +16,9 @@ use std::io::Write as _;
 
 use clap_complete::ArgValueCompleter;
 use jj_lib::backend::BackendResult;
+use jj_lib::conflicts::MaterializedTreeValue;
 use jj_lib::conflicts::materialize_merge_result;
 use jj_lib::conflicts::materialize_tree_value;
-use jj_lib::conflicts::MaterializedTreeValue;
 use jj_lib::file_util::copy_async_to_sync;
 use jj_lib::fileset::FilePattern;
 use jj_lib::fileset::FilesetExpression;
@@ -28,12 +28,12 @@ use jj_lib::repo_path::RepoPath;
 use pollster::FutureExt as _;
 use tracing::instrument;
 
-use crate::cli_util::print_unmatched_explicit_paths;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
 use crate::cli_util::WorkspaceCommandHelper;
-use crate::command_error::user_error;
+use crate::cli_util::print_unmatched_explicit_paths;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/file/track.rs

@@ -22,8 +22,8 @@ use jj_lib::working_copy::SnapshotStats;
 use jj_lib::working_copy::UntrackedReason;
 use tracing::instrument;
 
-use crate::cli_util::print_untracked_files;
 use crate::cli_util::CommandHelper;
+use crate::cli_util::print_untracked_files;
 use crate::command_error::CommandError;
 use crate::ui::Ui;
 

cli/src/commands/file/untrack.rs

@@ -21,10 +21,10 @@ use jj_lib::merged_tree::MergedTreeBuilder;
 use jj_lib::repo::Repo as _;
 use tracing::instrument;
 
-use crate::cli_util::print_snapshot_stats;
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error_with_hint;
+use crate::cli_util::print_snapshot_stats;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_hint;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/fix.rs

@@ -24,10 +24,10 @@ use jj_lib::backend::FileId;
 use jj_lib::fileset;
 use jj_lib::fileset::FilesetDiagnostics;
 use jj_lib::fileset::FilesetExpression;
-use jj_lib::fix::fix_files;
 use jj_lib::fix::FileToFix;
 use jj_lib::fix::FixError;
 use jj_lib::fix::ParallelFileFixer;
+use jj_lib::fix::fix_files;
 use jj_lib::matchers::Matcher;
 use jj_lib::repo_path::RepoPathUiConverter;
 use jj_lib::settings::UserSettings;
@@ -38,9 +38,9 @@ use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
+use crate::command_error::CommandError;
 use crate::command_error::config_error;
 use crate::command_error::print_parse_diagnostics;
-use crate::command_error::CommandError;
 use crate::complete;
 use crate::config::CommandNameAndArgs;
 use crate::ui::Ui;

cli/src/commands/git/clone.rs

@@ -30,10 +30,10 @@ use jj_lib::workspace::Workspace;
 use super::write_repository_level_trunk_alias;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::WorkspaceCommandHelper;
+use crate::command_error::CommandError;
 use crate::command_error::cli_error;
 use crate::command_error::user_error;
 use crate::command_error::user_error_with_message;
-use crate::command_error::CommandError;
 use crate::commands::git::maybe_add_gitignore;
 use crate::git_util::absolute_git_url;
 use crate::git_util::print_git_import_stats;

cli/src/commands/git/fetch.rs

@@ -26,9 +26,9 @@ use jj_lib::str_util::StringPattern;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::WorkspaceCommandHelper;
 use crate::cli_util::WorkspaceCommandTransaction;
+use crate::command_error::CommandError;
 use crate::command_error::config_error;
 use crate::command_error::user_error;
-use crate::command_error::CommandError;
 use crate::commands::git::get_single_remote;
 use crate::complete;
 use crate::git_util::print_git_import_stats;

cli/src/commands/git/init.rs

@@ -23,22 +23,22 @@ use indoc::writedoc;
 use itertools::Itertools as _;
 use jj_lib::file_util;
 use jj_lib::git;
-use jj_lib::git::parse_git_ref;
 use jj_lib::git::GitRefKind;
+use jj_lib::git::parse_git_ref;
 use jj_lib::repo::ReadonlyRepo;
 use jj_lib::repo::Repo as _;
 use jj_lib::view::View;
 use jj_lib::workspace::Workspace;
 
 use super::write_repository_level_trunk_alias;
-use crate::cli_util::start_repo_transaction;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::WorkspaceCommandHelper;
+use crate::cli_util::start_repo_transaction;
+use crate::command_error::CommandError;
 use crate::command_error::cli_error;
 use crate::command_error::internal_error;
 use crate::command_error::user_error_with_hint;
 use crate::command_error::user_error_with_message;
-use crate::command_error::CommandError;
 use crate::commands::git::maybe_add_gitignore;
 use crate::git_util::is_colocated_git_workspace;
 use crate::git_util::print_git_export_stats;

cli/src/commands/git/mod.rs

@@ -32,26 +32,26 @@ use jj_lib::ref_name::RemoteNameBuf;
 use jj_lib::ref_name::RemoteRefSymbol;
 use jj_lib::store::Store;
 
-use self::clone::cmd_git_clone;
 use self::clone::GitCloneArgs;
-use self::export::cmd_git_export;
+use self::clone::cmd_git_clone;
 use self::export::GitExportArgs;
-use self::fetch::cmd_git_fetch;
+use self::export::cmd_git_export;
 use self::fetch::GitFetchArgs;
-use self::import::cmd_git_import;
+use self::fetch::cmd_git_fetch;
 use self::import::GitImportArgs;
-use self::init::cmd_git_init;
+use self::import::cmd_git_import;
 use self::init::GitInitArgs;
-use self::push::cmd_git_push;
+use self::init::cmd_git_init;
 use self::push::GitPushArgs;
-use self::remote::cmd_git_remote;
+use self::push::cmd_git_push;
 use self::remote::RemoteCommand;
-use self::root::cmd_git_root;
+use self::remote::cmd_git_remote;
 use self::root::GitRootArgs;
+use self::root::cmd_git_root;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::WorkspaceCommandHelper;
-use crate::command_error::user_error_with_message;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_message;
 use crate::ui::Ui;
 
 /// Commands for working with Git remotes and the underlying Git repo

cli/src/commands/git/push.rs

@@ -37,10 +37,10 @@ use jj_lib::ref_name::RefNameBuf;
 use jj_lib::ref_name::RemoteName;
 use jj_lib::ref_name::RemoteNameBuf;
 use jj_lib::ref_name::RemoteRefSymbol;
-use jj_lib::refs::classify_bookmark_push_action;
 use jj_lib::refs::BookmarkPushAction;
 use jj_lib::refs::BookmarkPushUpdate;
 use jj_lib::refs::LocalAndRemoteRef;
+use jj_lib::refs::classify_bookmark_push_action;
 use jj_lib::repo::Repo;
 use jj_lib::revset::RevsetExpression;
 use jj_lib::settings::UserSettings;
@@ -48,18 +48,18 @@ use jj_lib::signing::SignBehavior;
 use jj_lib::str_util::StringPattern;
 use jj_lib::view::View;
 
-use crate::cli_util::has_tracked_remote_bookmarks;
-use crate::cli_util::short_commit_hash;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
 use crate::cli_util::WorkspaceCommandHelper;
 use crate::cli_util::WorkspaceCommandTransaction;
+use crate::cli_util::has_tracked_remote_bookmarks;
+use crate::cli_util::short_commit_hash;
+use crate::command_error::CommandError;
 use crate::command_error::cli_error;
 use crate::command_error::cli_error_with_message;
 use crate::command_error::user_error;
 use crate::command_error::user_error_with_hint;
 use crate::command_error::user_error_with_message;
-use crate::command_error::CommandError;
 use crate::commands::git::get_single_remote;
 use crate::complete;
 use crate::formatter::Formatter;

cli/src/commands/git/remote/list.rs

@@ -18,8 +18,8 @@ use jj_lib::git;
 use jj_lib::repo::Repo as _;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error_with_message;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_message;
 use crate::ui::Ui;
 
 /// List Git remotes
@@ -40,7 +40,7 @@ pub fn cmd_git_remote_list(
                 return Err(user_error_with_message(
                     format!("Failed to load configured remote {remote_name}"),
                     err,
-                ))
+                ));
             }
             None => continue, // ignore empty [remote "<name>"] section
         };

cli/src/commands/git/remote/mod.rs

@@ -20,16 +20,16 @@ mod set_url;
 
 use clap::Subcommand;
 
-use self::add::cmd_git_remote_add;
 use self::add::GitRemoteAddArgs;
-use self::list::cmd_git_remote_list;
+use self::add::cmd_git_remote_add;
 use self::list::GitRemoteListArgs;
-use self::remove::cmd_git_remote_remove;
+use self::list::cmd_git_remote_list;
 use self::remove::GitRemoteRemoveArgs;
-use self::rename::cmd_git_remote_rename;
+use self::remove::cmd_git_remote_remove;
 use self::rename::GitRemoteRenameArgs;
-use self::set_url::cmd_git_remote_set_url;
+use self::rename::cmd_git_remote_rename;
 use self::set_url::GitRemoteSetUrlArgs;
+use self::set_url::cmd_git_remote_set_url;
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
 use crate::ui::Ui;

cli/src/commands/git/root.rs

@@ -19,8 +19,8 @@ use jj_lib::repo::Repo as _;
 use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 /// Show the underlying Git directory of a repository using the Git backend

cli/src/commands/log.rs

@@ -17,10 +17,10 @@ use clap_complete::ArgValueCompleter;
 use itertools::Itertools as _;
 use jj_lib::backend::CommitId;
 use jj_lib::commit::Commit;
-use jj_lib::graph::reverse_graph;
 use jj_lib::graph::GraphEdge;
 use jj_lib::graph::GraphEdgeType;
 use jj_lib::graph::TopoGroupedGraphIterator;
+use jj_lib::graph::reverse_graph;
 use jj_lib::repo::Repo as _;
 use jj_lib::revset::RevsetEvaluationError;
 use jj_lib::revset::RevsetExpression;
@@ -28,15 +28,15 @@ use jj_lib::revset::RevsetFilterPredicate;
 use jj_lib::revset::RevsetIteratorExt as _;
 use tracing::instrument;
 
-use crate::cli_util::format_template;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::LogContentFormat;
 use crate::cli_util::RevisionArg;
+use crate::cli_util::format_template;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::diff_util::DiffFormatArgs;
-use crate::graphlog::get_graphlog;
 use crate::graphlog::GraphStyle;
+use crate::graphlog::get_graphlog;
 use crate::templater::TemplateRenderer;
 use crate::ui::Ui;
 

cli/src/commands/mod.rs

@@ -60,11 +60,11 @@ mod workspace;
 
 use std::fmt::Debug;
 
-use clap::builder::styling::AnsiColor;
-use clap::builder::Styles;
 use clap::CommandFactory as _;
 use clap::FromArgMatches as _;
 use clap::Subcommand as _;
+use clap::builder::Styles;
+use clap::builder::styling::AnsiColor;
 use clap_complete::engine::SubcommandCandidates;
 use tracing::instrument;
 

cli/src/commands/new.rs

@@ -24,9 +24,9 @@ use jj_lib::rewrite::rebase_commit;
 use pollster::FutureExt as _;
 use tracing::instrument;
 
-use crate::cli_util::compute_commit_location;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
+use crate::cli_util::compute_commit_location;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::description_util::add_trailers;

cli/src/commands/next.rs

@@ -14,9 +14,9 @@
 
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
-use crate::movement_util::move_to_commit;
 use crate::movement_util::Direction;
 use crate::movement_util::MovementArgs;
+use crate::movement_util::move_to_commit;
 use crate::ui::Ui;
 
 /// Move the working-copy commit to the child revision

cli/src/commands/operation/abandon.rs

@@ -20,11 +20,11 @@ use clap_complete::ArgValueCandidates;
 use itertools::Itertools as _;
 use jj_lib::op_walk;
 
-use crate::cli_util::short_operation_hash;
 use crate::cli_util::CommandHelper;
+use crate::cli_util::short_operation_hash;
+use crate::command_error::CommandError;
 use crate::command_error::cli_error;
 use crate::command_error::user_error;
-use crate::command_error::CommandError;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/operation/diff.rs

@@ -40,12 +40,12 @@ use crate::cli_util::CommandHelper;
 use crate::cli_util::LogContentFormat;
 use crate::command_error::CommandError;
 use crate::complete;
-use crate::diff_util::diff_formats_for_log;
 use crate::diff_util::DiffFormatArgs;
 use crate::diff_util::DiffRenderer;
+use crate::diff_util::diff_formats_for_log;
 use crate::formatter::Formatter;
-use crate::graphlog::get_graphlog;
 use crate::graphlog::GraphStyle;
+use crate::graphlog::get_graphlog;
 use crate::templater::TemplateRenderer;
 use crate::ui::Ui;
 

cli/src/commands/operation/log.rs

@@ -16,26 +16,26 @@ use std::slice;
 
 use clap_complete::ArgValueCandidates;
 use itertools::Itertools as _;
-use jj_lib::graph::reverse_graph;
 use jj_lib::graph::GraphEdge;
+use jj_lib::graph::reverse_graph;
 use jj_lib::op_store::OpStoreError;
 use jj_lib::op_walk;
 use jj_lib::operation::Operation;
 use jj_lib::repo::RepoLoader;
 
 use super::diff::show_op_diff;
-use crate::cli_util::format_template;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::LogContentFormat;
 use crate::cli_util::WorkspaceCommandEnvironment;
+use crate::cli_util::format_template;
 use crate::command_error::CommandError;
 use crate::complete;
-use crate::diff_util::diff_formats_for_log;
 use crate::diff_util::DiffFormatArgs;
 use crate::diff_util::DiffRenderer;
+use crate::diff_util::diff_formats_for_log;
 use crate::formatter::Formatter;
-use crate::graphlog::get_graphlog;
 use crate::graphlog::GraphStyle;
+use crate::graphlog::get_graphlog;
 use crate::operation_templater::OperationTemplateLanguage;
 use crate::templater::TemplateRenderer;
 use crate::ui::Ui;

cli/src/commands/operation/mod.rs

@@ -19,19 +19,19 @@ mod restore;
 mod show;
 pub mod undo;
 
-use abandon::cmd_op_abandon;
 use abandon::OperationAbandonArgs;
+use abandon::cmd_op_abandon;
 use clap::Subcommand;
-use diff::cmd_op_diff;
 use diff::OperationDiffArgs;
-use log::cmd_op_log;
+use diff::cmd_op_diff;
 use log::OperationLogArgs;
-use restore::cmd_op_restore;
+use log::cmd_op_log;
 use restore::OperationRestoreArgs;
-use show::cmd_op_show;
+use restore::cmd_op_restore;
 use show::OperationShowArgs;
-use undo::cmd_op_undo;
+use show::cmd_op_show;
 use undo::OperationUndoArgs;
+use undo::cmd_op_undo;
 
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;

cli/src/commands/operation/restore.rs

@@ -15,9 +15,9 @@
 use clap_complete::ArgValueCandidates;
 use jj_lib::object_id::ObjectId as _;
 
-use super::view_with_desired_portions_restored;
-use super::UndoWhatToRestore;
 use super::DEFAULT_UNDO_WHAT;
+use super::UndoWhatToRestore;
+use super::view_with_desired_portions_restored;
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
 use crate::complete;

cli/src/commands/operation/show.rs

@@ -21,9 +21,9 @@ use crate::cli_util::CommandHelper;
 use crate::cli_util::LogContentFormat;
 use crate::command_error::CommandError;
 use crate::complete;
-use crate::diff_util::diff_formats_for_log;
 use crate::diff_util::DiffFormatArgs;
 use crate::diff_util::DiffRenderer;
+use crate::diff_util::diff_formats_for_log;
 use crate::graphlog::GraphStyle;
 use crate::templater::TemplateRenderer;
 use crate::ui::Ui;

cli/src/commands/operation/undo.rs

@@ -19,12 +19,12 @@ use jj_lib::op_store::OpStoreError;
 use jj_lib::operation::Operation;
 use jj_lib::repo::Repo as _;
 
-use super::view_with_desired_portions_restored;
-use super::UndoWhatToRestore;
 use super::DEFAULT_UNDO_WHAT;
+use super::UndoWhatToRestore;
+use super::view_with_desired_portions_restored;
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/prev.rs

@@ -14,9 +14,9 @@
 
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
-use crate::movement_util::move_to_commit;
 use crate::movement_util::Direction;
 use crate::movement_util::MovementArgs;
+use crate::movement_util::move_to_commit;
 use crate::ui::Ui;
 /// Change the working copy revision relative to the parent revision
 ///

cli/src/commands/rebase.rs

@@ -24,24 +24,24 @@ use jj_lib::object_id::ObjectId as _;
 use jj_lib::repo::ReadonlyRepo;
 use jj_lib::repo::Repo as _;
 use jj_lib::revset::RevsetExpression;
-use jj_lib::rewrite::compute_move_commits;
-use jj_lib::rewrite::find_duplicate_divergent_commits;
 use jj_lib::rewrite::EmptyBehavior;
 use jj_lib::rewrite::MoveCommitsLocation;
 use jj_lib::rewrite::MoveCommitsStats;
 use jj_lib::rewrite::MoveCommitsTarget;
 use jj_lib::rewrite::RebaseOptions;
 use jj_lib::rewrite::RewriteRefsOptions;
+use jj_lib::rewrite::compute_move_commits;
+use jj_lib::rewrite::find_duplicate_divergent_commits;
 use tracing::instrument;
 
-use crate::cli_util::compute_commit_location;
-use crate::cli_util::print_updated_commits;
-use crate::cli_util::short_commit_hash;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
 use crate::cli_util::WorkspaceCommandHelper;
-use crate::command_error::user_error;
+use crate::cli_util::compute_commit_location;
+use crate::cli_util::print_updated_commits;
+use crate::cli_util::short_commit_hash;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
 use crate::ui::Ui;
 
@@ -495,10 +495,12 @@ fn plan_rebase_branch(
     rebase_destination: &RebaseDestinationArgs,
 ) -> Result<MoveCommitsLocation, CommandError> {
     let branch_commit_ids: Vec<_> = if branch.is_empty() {
-        vec![workspace_command
-            .resolve_single_rev(ui, &RevisionArg::AT)?
-            .id()
-            .clone()]
+        vec![
+            workspace_command
+                .resolve_single_rev(ui, &RevisionArg::AT)?
+                .id()
+                .clone(),
+        ]
     } else {
         workspace_command
             .resolve_some_revsets_default_single(ui, branch)?

cli/src/commands/resolve.rs

@@ -18,11 +18,11 @@ use itertools::Itertools as _;
 use jj_lib::object_id::ObjectId as _;
 use tracing::instrument;
 
-use crate::cli_util::print_conflicted_paths;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::cli_error;
+use crate::cli_util::print_conflicted_paths;
 use crate::command_error::CommandError;
+use crate::command_error::cli_error;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/restore.rs

@@ -23,8 +23,8 @@ use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/revert.rs

@@ -26,10 +26,10 @@ use jj_lib::rewrite::merge_commit_trees;
 use pollster::FutureExt as _;
 use tracing::instrument;
 
-use crate::cli_util::compute_commit_location;
-use crate::cli_util::print_updated_commits;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
+use crate::cli_util::compute_commit_location;
+use crate::cli_util::print_updated_commits;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::ui::Ui;

cli/src/commands/root.rs

@@ -18,8 +18,8 @@ use jj_lib::file_util;
 use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 /// Show the current workspace root directory (shortcut for `jj workspace root`)

cli/src/commands/run.rs

@@ -18,8 +18,8 @@ use itertools::Itertools as _;
 
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 /// (**Stub**, does not work yet) Run a command across a set of revisions.

cli/src/commands/sign.rs

@@ -20,11 +20,11 @@ use jj_lib::commit::CommitIteratorExt as _;
 use jj_lib::repo::Repo as _;
 use jj_lib::signing::SignBehavior;
 
-use crate::cli_util::print_updated_commits;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
-use crate::command_error::user_error_with_hint;
+use crate::cli_util::print_updated_commits;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_hint;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/sparse/edit.rs

@@ -21,9 +21,9 @@ use tracing::instrument;
 
 use super::update_sparse_patterns_with;
 use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
 use crate::command_error::internal_error;
 use crate::command_error::user_error_with_message;
-use crate::command_error::CommandError;
 use crate::description_util::TextEditor;
 use crate::ui::Ui;
 

cli/src/commands/sparse/mod.rs

@@ -21,19 +21,19 @@ use clap::Subcommand;
 use jj_lib::repo_path::RepoPathBuf;
 use tracing::instrument;
 
-use self::edit::cmd_sparse_edit;
 use self::edit::SparseEditArgs;
-use self::list::cmd_sparse_list;
+use self::edit::cmd_sparse_edit;
 use self::list::SparseListArgs;
-use self::reset::cmd_sparse_reset;
+use self::list::cmd_sparse_list;
 use self::reset::SparseResetArgs;
-use self::set::cmd_sparse_set;
+use self::reset::cmd_sparse_reset;
 use self::set::SparseSetArgs;
-use crate::cli_util::print_checkout_stats;
+use self::set::cmd_sparse_set;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::WorkspaceCommandHelper;
-use crate::command_error::internal_error_with_message;
+use crate::cli_util::print_checkout_stats;
 use crate::command_error::CommandError;
+use crate::command_error::internal_error_with_message;
 use crate::ui::Ui;
 
 /// Manage which paths from the working-copy commit are present in the working

cli/src/commands/split.rs

@@ -21,7 +21,6 @@ use jj_lib::commit::Commit;
 use jj_lib::matchers::Matcher;
 use jj_lib::object_id::ObjectId as _;
 use jj_lib::repo::Repo as _;
-use jj_lib::rewrite::move_commits;
 use jj_lib::rewrite::CommitWithSelection;
 use jj_lib::rewrite::EmptyBehavior;
 use jj_lib::rewrite::MoveCommitsLocation;
@@ -29,17 +28,18 @@ use jj_lib::rewrite::MoveCommitsTarget;
 use jj_lib::rewrite::RebaseOptions;
 use jj_lib::rewrite::RebasedCommit;
 use jj_lib::rewrite::RewriteRefsOptions;
+use jj_lib::rewrite::move_commits;
 use pollster::FutureExt as _;
 use tracing::instrument;
 
-use crate::cli_util::compute_commit_location;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::DiffSelector;
 use crate::cli_util::RevisionArg;
 use crate::cli_util::WorkspaceCommandHelper;
 use crate::cli_util::WorkspaceCommandTransaction;
-use crate::command_error::user_error_with_hint;
+use crate::cli_util::compute_commit_location;
 use crate::command_error::CommandError;
+use crate::command_error::user_error_with_hint;
 use crate::complete;
 use crate::description_util::add_trailers;
 use crate::description_util::description_template;

cli/src/commands/squash.rs

@@ -29,9 +29,9 @@ use crate::cli_util::CommandHelper;
 use crate::cli_util::DiffSelector;
 use crate::cli_util::RevisionArg;
 use crate::cli_util::WorkspaceCommandTransaction;
+use crate::command_error::CommandError;
 use crate::command_error::user_error;
 use crate::command_error::user_error_with_hint;
-use crate::command_error::CommandError;
 use crate::complete;
 use crate::description_util::add_trailers;
 use crate::description_util::combine_messages_for_editing;

cli/src/commands/status.rs

@@ -23,12 +23,12 @@ use jj_lib::revset::RevsetFilterPredicate;
 use pollster::FutureExt as _;
 use tracing::instrument;
 
+use crate::cli_util::CommandHelper;
 use crate::cli_util::print_conflicted_paths;
 use crate::cli_util::print_snapshot_stats;
-use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
-use crate::diff_util::get_copy_records;
 use crate::diff_util::DiffFormat;
+use crate::diff_util::get_copy_records;
 use crate::ui::Ui;
 
 /// Show high-level repo status [default alias: st]
@@ -288,9 +288,9 @@ async fn visit_collapsed_untracked_files(
 
 #[cfg(test)]
 mod test {
-    use testutils::repo_path;
     use testutils::TestRepo;
     use testutils::TestTreeBuilder;
+    use testutils::repo_path;
 
     use super::*;
 

cli/src/commands/unsign.rs

@@ -19,9 +19,9 @@ use jj_lib::commit::Commit;
 use jj_lib::commit::CommitIteratorExt as _;
 use jj_lib::signing::SignBehavior;
 
-use crate::cli_util::print_updated_commits;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
+use crate::cli_util::print_updated_commits;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::ui::Ui;

cli/src/commands/util/completion.rs

@@ -75,8 +75,8 @@ enum ShellCompletion {
 
 impl ShellCompletion {
     fn generate(&self, cmd: &mut Command) -> Vec<u8> {
-        use clap_complete::generate;
         use clap_complete::Shell;
+        use clap_complete::generate;
         use clap_complete_nushell::Nushell;
 
         let mut buf = Vec::new();

cli/src/commands/util/exec.rs

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 use crate::cli_util::CommandHelper;
+use crate::command_error::CommandError;
 use crate::command_error::user_error;
 use crate::command_error::user_error_with_message;
-use crate::command_error::CommandError;
 use crate::ui::Ui;
 
 /// Execute an external command via jj

cli/src/commands/util/gc.rs

@@ -19,8 +19,8 @@ use std::time::SystemTime;
 use jj_lib::repo::Repo as _;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 /// Run backend-dependent garbage collection.

cli/src/commands/util/mod.rs

@@ -22,18 +22,18 @@ mod markdown_help;
 use clap::Subcommand;
 use tracing::instrument;
 
-use self::completion::cmd_util_completion;
 use self::completion::UtilCompletionArgs;
-use self::config_schema::cmd_util_config_schema;
+use self::completion::cmd_util_completion;
 use self::config_schema::UtilConfigSchemaArgs;
-use self::exec::cmd_util_exec;
+use self::config_schema::cmd_util_config_schema;
 use self::exec::UtilExecArgs;
-use self::gc::cmd_util_gc;
+use self::exec::cmd_util_exec;
 use self::gc::UtilGcArgs;
-use self::install_man_pages::cmd_util_install_man_pages;
+use self::gc::cmd_util_gc;
 use self::install_man_pages::UtilInstallManPagesArgs;
-use self::markdown_help::cmd_util_markdown_help;
+use self::install_man_pages::cmd_util_install_man_pages;
 use self::markdown_help::UtilMarkdownHelp;
+use self::markdown_help::cmd_util_markdown_help;
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
 use crate::ui::Ui;

cli/src/commands/workspace/add.rs

@@ -27,9 +27,9 @@ use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
+use crate::command_error::CommandError;
 use crate::command_error::internal_error_with_message;
 use crate::command_error::user_error;
-use crate::command_error::CommandError;
 use crate::ui::Ui;
 
 /// How to handle sparse patterns when creating a new workspace.

cli/src/commands/workspace/forget.rs

@@ -18,8 +18,8 @@ use jj_lib::ref_name::WorkspaceNameBuf;
 use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::complete;
 use crate::ui::Ui;
 

cli/src/commands/workspace/mod.rs

@@ -22,18 +22,18 @@ mod update_stale;
 use clap::Subcommand;
 use tracing::instrument;
 
-use self::add::cmd_workspace_add;
 use self::add::WorkspaceAddArgs;
-use self::forget::cmd_workspace_forget;
+use self::add::cmd_workspace_add;
 use self::forget::WorkspaceForgetArgs;
-use self::list::cmd_workspace_list;
+use self::forget::cmd_workspace_forget;
 use self::list::WorkspaceListArgs;
-use self::rename::cmd_workspace_rename;
+use self::list::cmd_workspace_list;
 use self::rename::WorkspaceRenameArgs;
-use self::root::cmd_workspace_root;
+use self::rename::cmd_workspace_rename;
 use self::root::WorkspaceRootArgs;
-use self::update_stale::cmd_workspace_update_stale;
+use self::root::cmd_workspace_root;
 use self::update_stale::WorkspaceUpdateStaleArgs;
+use self::update_stale::cmd_workspace_update_stale;
 use crate::cli_util::CommandHelper;
 use crate::command_error::CommandError;
 use crate::ui::Ui;

cli/src/commands/workspace/rename.rs

@@ -16,8 +16,8 @@ use jj_lib::ref_name::WorkspaceNameBuf;
 use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 /// Renames the current workspace

cli/src/commands/workspace/root.rs

@@ -18,8 +18,8 @@ use jj_lib::file_util;
 use tracing::instrument;
 
 use crate::cli_util::CommandHelper;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 /// Show the current workspace root directory

cli/src/commands/workspace/update_stale.rs

@@ -14,8 +14,8 @@
 
 use tracing::instrument;
 
-use crate::cli_util::print_snapshot_stats;
 use crate::cli_util::CommandHelper;
+use crate::cli_util::print_snapshot_stats;
 use crate::command_error::CommandError;
 use crate::ui::Ui;
 

cli/src/commit_templater.rs

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 use std::any::Any;
-use std::cmp::max;
 use std::cmp::Ordering;
+use std::cmp::max;
 use std::collections::HashMap;
 use std::fmt;
 use std::fmt::Display;
@@ -22,9 +22,9 @@ use std::io;
 use std::rc::Rc;
 
 use bstr::BString;
-use futures::stream::BoxStream;
 use futures::StreamExt as _;
 use futures::TryStreamExt as _;
+use futures::stream::BoxStream;
 use itertools::Itertools as _;
 use jj_lib::backend::BackendResult;
 use jj_lib::backend::ChangeId;
@@ -77,14 +77,14 @@ use crate::diff_util::DiffStats;
 use crate::formatter::Formatter;
 use crate::revset_util;
 use crate::template_builder;
-use crate::template_builder::expect_stringify_expression;
-use crate::template_builder::merge_fn_map;
 use crate::template_builder::BuildContext;
 use crate::template_builder::CoreTemplateBuildFnTable;
 use crate::template_builder::CoreTemplatePropertyKind;
 use crate::template_builder::CoreTemplatePropertyVar;
 use crate::template_builder::TemplateBuildMethodFnMap;
 use crate::template_builder::TemplateLanguage;
+use crate::template_builder::expect_stringify_expression;
+use crate::template_builder::merge_fn_map;
 use crate::template_parser;
 use crate::template_parser::ExpressionNode;
 use crate::template_parser::FunctionCallNode;
@@ -1883,8 +1883,8 @@ impl ShortestIdPrefix {
     }
 }
 
-fn builtin_shortest_id_prefix_methods<'repo>(
-) -> CommitTemplateBuildMethodFnMap<'repo, ShortestIdPrefix> {
+fn builtin_shortest_id_prefix_methods<'repo>()
+-> CommitTemplateBuildMethodFnMap<'repo, ShortestIdPrefix> {
     // Not using maplit::hashmap!{} or custom declarative macro here because
     // code completion inside macro is quite restricted.
     let mut map = CommitTemplateBuildMethodFnMap::<ShortestIdPrefix>::new();
@@ -2371,8 +2371,8 @@ impl CryptographicSignature {
     }
 }
 
-fn builtin_cryptographic_signature_methods<'repo>(
-) -> CommitTemplateBuildMethodFnMap<'repo, CryptographicSignature> {
+fn builtin_cryptographic_signature_methods<'repo>()
+-> CommitTemplateBuildMethodFnMap<'repo, CryptographicSignature> {
     // Not using maplit::hashmap!{} or custom declarative macro here because
     // code completion inside macro is quite restricted.
     let mut map = CommitTemplateBuildMethodFnMap::<CryptographicSignature>::new();
@@ -2526,9 +2526,9 @@ mod tests {
     use jj_lib::revset::RevsetExpression;
     use jj_lib::revset::RevsetExtensions;
     use jj_lib::revset::RevsetWorkspaceContext;
-    use testutils::repo_path_buf;
     use testutils::TestRepoBackend;
     use testutils::TestWorkspace;
+    use testutils::repo_path_buf;
 
     use super::*;
     use crate::template_parser::TemplateAliasesMap;

cli/src/complete.rs

@@ -15,8 +15,8 @@
 use std::io::BufRead as _;
 use std::path::Path;
 
-use clap::builder::StyledStr;
 use clap::FromArgMatches as _;
+use clap::builder::StyledStr;
 use clap_complete::CompletionCandidate;
 use indoc::indoc;
 use itertools::Itertools as _;
@@ -25,20 +25,20 @@ use jj_lib::settings::UserSettings;
 use jj_lib::workspace::DefaultWorkspaceLoaderFactory;
 use jj_lib::workspace::WorkspaceLoaderFactory as _;
 
+use crate::cli_util::GlobalArgs;
 use crate::cli_util::expand_args;
 use crate::cli_util::find_workspace_dir;
 use crate::cli_util::load_template_aliases;
-use crate::cli_util::GlobalArgs;
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
-use crate::config::config_from_environment;
-use crate::config::default_config_layers;
+use crate::command_error::user_error;
+use crate::config::CONFIG_SCHEMA;
 use crate::config::ConfigArgKind;
 use crate::config::ConfigEnv;
-use crate::config::CONFIG_SCHEMA;
+use crate::config::config_from_environment;
+use crate::config::default_config_layers;
+use crate::merge_tools::ExternalMergeTool;
 use crate::merge_tools::configured_merge_tools;
 use crate::merge_tools::get_external_tool_config;
-use crate::merge_tools::ExternalMergeTool;
 use crate::revset_util::load_revset_aliases;
 use crate::ui::Ui;
 

cli/src/config.rs

@@ -40,9 +40,9 @@ use regex::Captures;
 use regex::Regex;
 use tracing::instrument;
 
+use crate::command_error::CommandError;
 use crate::command_error::config_error;
 use crate::command_error::config_error_with_message;
-use crate::command_error::CommandError;
 use crate::text_util;
 use crate::ui::Ui;
 

cli/src/description_util.rs

@@ -22,10 +22,10 @@ use jj_lib::trailer::parse_description_trailers;
 use jj_lib::trailer::parse_trailers;
 use thiserror::Error;
 
-use crate::cli_util::short_commit_hash;
 use crate::cli_util::WorkspaceCommandTransaction;
-use crate::command_error::user_error;
+use crate::cli_util::short_commit_hash;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::config::CommandNameAndArgs;
 use crate::formatter::PlainTextFormatter;
 use crate::templater::TemplateRenderer;

cli/src/diff_util.rs

@@ -24,10 +24,10 @@ use std::path::PathBuf;
 use bstr::BStr;
 use bstr::BString;
 use clap_complete::ArgValueCandidates;
-use futures::executor::block_on_stream;
-use futures::stream::BoxStream;
 use futures::StreamExt as _;
 use futures::TryStreamExt as _;
+use futures::executor::block_on_stream;
+use futures::stream::BoxStream;
 use itertools::Itertools as _;
 use jj_lib::backend::BackendError;
 use jj_lib::backend::BackendResult;
@@ -36,23 +36,23 @@ use jj_lib::backend::CopyRecord;
 use jj_lib::backend::TreeValue;
 use jj_lib::commit::Commit;
 use jj_lib::config::ConfigGetError;
-use jj_lib::conflicts::materialize_merge_result_to_bytes;
-use jj_lib::conflicts::materialized_diff_stream;
 use jj_lib::conflicts::ConflictMarkerStyle;
 use jj_lib::conflicts::MaterializedFileValue;
 use jj_lib::conflicts::MaterializedTreeDiffEntry;
 use jj_lib::conflicts::MaterializedTreeValue;
+use jj_lib::conflicts::materialize_merge_result_to_bytes;
+use jj_lib::conflicts::materialized_diff_stream;
 use jj_lib::copies::CopiesTreeDiffEntry;
 use jj_lib::copies::CopiesTreeDiffEntryPath;
 use jj_lib::copies::CopyOperation;
 use jj_lib::copies::CopyRecords;
-use jj_lib::diff::find_line_ranges;
 use jj_lib::diff::CompareBytesExactly;
 use jj_lib::diff::CompareBytesIgnoreAllWhitespace;
 use jj_lib::diff::CompareBytesIgnoreWhitespaceAmount;
 use jj_lib::diff::Diff;
 use jj_lib::diff::DiffHunk;
 use jj_lib::diff::DiffHunkKind;
+use jj_lib::diff::find_line_ranges;
 use jj_lib::files;
 use jj_lib::files::ConflictDiffHunk;
 use jj_lib::files::DiffLineHunkSide;
@@ -75,18 +75,18 @@ use thiserror::Error;
 use tracing::instrument;
 use unicode_width::UnicodeWidthStr as _;
 
-use crate::command_error::cli_error;
 use crate::command_error::CommandError;
+use crate::command_error::cli_error;
 use crate::commit_templater;
 use crate::config::CommandNameAndArgs;
 use crate::formatter::Formatter;
 use crate::merge_tools;
-use crate::merge_tools::generate_diff;
-use crate::merge_tools::invoke_external_diff;
-use crate::merge_tools::new_utf8_temp_dir;
 use crate::merge_tools::DiffGenerateError;
 use crate::merge_tools::DiffToolMode;
 use crate::merge_tools::ExternalMergeTool;
+use crate::merge_tools::generate_diff;
+use crate::merge_tools::invoke_external_diff;
+use crate::merge_tools::new_utf8_temp_dir;
 use crate::templater::TemplateRenderer;
 use crate::text_util;
 use crate::ui::Ui;

cli/src/git_util.rs

@@ -45,9 +45,9 @@ use jj_lib::workspace::Workspace;
 use unicode_width::UnicodeWidthStr as _;
 
 use crate::cleanup_guard::CleanupGuard;
+use crate::command_error::CommandError;
 use crate::command_error::cli_error;
 use crate::command_error::user_error;
-use crate::command_error::CommandError;
 use crate::formatter::Formatter;
 use crate::ui::ProgressOutput;
 use crate::ui::Ui;

cli/src/merge_tools/builtin.rs

@@ -2,19 +2,19 @@ use std::borrow::Cow;
 use std::path::Path;
 use std::sync::Arc;
 
-use futures::stream::BoxStream;
 use futures::StreamExt as _;
+use futures::stream::BoxStream;
 use itertools::Itertools as _;
 use jj_lib::backend::BackendResult;
 use jj_lib::backend::CopyId;
 use jj_lib::backend::MergedTreeId;
 use jj_lib::backend::TreeValue;
 use jj_lib::conflicts;
+use jj_lib::conflicts::ConflictMarkerStyle;
+use jj_lib::conflicts::MIN_CONFLICT_MARKER_LEN;
+use jj_lib::conflicts::MaterializedTreeValue;
 use jj_lib::conflicts::materialize_merge_result_to_bytes;
 use jj_lib::conflicts::materialized_diff_stream;
-use jj_lib::conflicts::ConflictMarkerStyle;
-use jj_lib::conflicts::MaterializedTreeValue;
-use jj_lib::conflicts::MIN_CONFLICT_MARKER_LEN;
 use jj_lib::copies::CopiesTreeDiffEntry;
 use jj_lib::copies::CopyRecords;
 use jj_lib::diff::Diff;
@@ -726,16 +726,16 @@ mod tests {
     use jj_lib::matchers::FilesMatcher;
     use jj_lib::repo::Repo as _;
     use proptest::prelude::*;
-    use proptest_state_machine::prop_state_machine;
     use proptest_state_machine::ReferenceStateMachine;
     use proptest_state_machine::StateMachineTest;
+    use proptest_state_machine::prop_state_machine;
+    use testutils::TestRepo;
     use testutils::assert_tree_eq;
     use testutils::dump_tree;
     use testutils::proptest::Transition;
     use testutils::proptest::WorkingCopyReferenceStateMachine;
     use testutils::repo_path;
     use testutils::repo_path_component;
-    use testutils::TestRepo;
 
     use super::*;
 

cli/src/merge_tools/diff_working_copies.rs

@@ -27,8 +27,8 @@ use pollster::FutureExt as _;
 use tempfile::TempDir;
 use thiserror::Error;
 
-use super::external::ExternalToolError;
 use super::DiffEditError;
+use super::external::ExternalToolError;
 
 #[derive(Debug, Error)]
 pub enum DiffCheckoutError {

cli/src/merge_tools/external.rs

@@ -13,10 +13,10 @@ use jj_lib::backend::CopyId;
 use jj_lib::backend::MergedTreeId;
 use jj_lib::backend::TreeValue;
 use jj_lib::conflicts;
-use jj_lib::conflicts::choose_materialized_conflict_marker_len;
-use jj_lib::conflicts::materialize_merge_result_to_bytes_with_marker_len;
 use jj_lib::conflicts::ConflictMarkerStyle;
 use jj_lib::conflicts::MIN_CONFLICT_MARKER_LEN;
+use jj_lib::conflicts::choose_materialized_conflict_marker_len;
+use jj_lib::conflicts::materialize_merge_result_to_bytes_with_marker_len;
 use jj_lib::gitignore::GitIgnoreFile;
 use jj_lib::matchers::Matcher;
 use jj_lib::merge::Merge;
@@ -28,19 +28,19 @@ use jj_lib::working_copy::CheckoutOptions;
 use pollster::FutureExt as _;
 use thiserror::Error;
 
-use super::diff_working_copies::check_out_trees;
-use super::diff_working_copies::new_utf8_temp_dir;
-use super::diff_working_copies::set_readonly_recursively;
-use super::diff_working_copies::DiffEditWorkingCopies;
-use super::diff_working_copies::DiffSide;
 use super::ConflictResolveError;
 use super::DiffEditError;
 use super::DiffGenerateError;
 use super::MergeToolFile;
 use super::MergeToolPartialResolutionError;
+use super::diff_working_copies::DiffEditWorkingCopies;
+use super::diff_working_copies::DiffSide;
+use super::diff_working_copies::check_out_trees;
+use super::diff_working_copies::new_utf8_temp_dir;
+use super::diff_working_copies::set_readonly_recursively;
+use crate::config::CommandNameAndArgs;
 use crate::config::find_all_variables;
 use crate::config::interpolate_variables;
-use crate::config::CommandNameAndArgs;
 use crate::ui::Ui;
 
 /// Merge/diff tool loaded from the settings.

cli/src/merge_tools/mod.rs

@@ -26,9 +26,9 @@ use jj_lib::backend::TreeValue;
 use jj_lib::config::ConfigGetError;
 use jj_lib::config::ConfigGetResultExt as _;
 use jj_lib::config::ConfigNamePathBuf;
-use jj_lib::conflicts::try_materialize_file_conflict_value;
 use jj_lib::conflicts::ConflictMarkerStyle;
 use jj_lib::conflicts::MaterializedFileConflictValue;
+use jj_lib::conflicts::try_materialize_file_conflict_value;
 use jj_lib::gitignore::GitIgnoreFile;
 use jj_lib::matchers::Matcher;
 use jj_lib::merge::Merge;
@@ -44,17 +44,17 @@ use jj_lib::working_copy::SnapshotError;
 use pollster::FutureExt as _;
 use thiserror::Error;
 
+use self::builtin::BuiltinToolError;
 use self::builtin::edit_diff_builtin;
 use self::builtin::edit_merge_builtin;
-use self::builtin::BuiltinToolError;
-pub(crate) use self::diff_working_copies::new_utf8_temp_dir;
 use self::diff_working_copies::DiffCheckoutError;
-use self::external::edit_diff_external;
-pub use self::external::generate_diff;
-pub use self::external::invoke_external_diff;
+pub(crate) use self::diff_working_copies::new_utf8_temp_dir;
 pub use self::external::DiffToolMode;
 pub use self::external::ExternalMergeTool;
 use self::external::ExternalToolError;
+use self::external::edit_diff_external;
+pub use self::external::generate_diff;
+pub use self::external::invoke_external_diff;
 use crate::config::CommandNameAndArgs;
 use crate::ui::Ui;
 

cli/src/movement_util.rs

@@ -24,11 +24,11 @@ use jj_lib::revset::RevsetExpression;
 use jj_lib::revset::RevsetFilterPredicate;
 use jj_lib::revset::RevsetIteratorExt as _;
 
-use crate::cli_util::short_commit_hash;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::WorkspaceCommandHelper;
-use crate::command_error::user_error;
+use crate::cli_util::short_commit_hash;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::ui::Ui;
 
 #[derive(Clone, Debug, Eq, PartialEq)]

cli/src/operation_templater.rs

@@ -26,13 +26,13 @@ use jj_lib::repo::RepoLoader;
 use jj_lib::settings::UserSettings;
 
 use crate::template_builder;
-use crate::template_builder::merge_fn_map;
 use crate::template_builder::BuildContext;
 use crate::template_builder::CoreTemplateBuildFnTable;
 use crate::template_builder::CoreTemplatePropertyKind;
 use crate::template_builder::CoreTemplatePropertyVar;
 use crate::template_builder::TemplateBuildMethodFnMap;
 use crate::template_builder::TemplateLanguage;
+use crate::template_builder::merge_fn_map;
 use crate::template_parser;
 use crate::template_parser::FunctionCallNode;
 use crate::template_parser::TemplateDiagnostics;

cli/src/revset_util.rs

@@ -45,8 +45,8 @@ use jj_lib::revset::SymbolResolverExtension;
 use jj_lib::revset::UserRevsetExpression;
 use thiserror::Error;
 
-use crate::command_error::user_error;
 use crate::command_error::CommandError;
+use crate::command_error::user_error;
 use crate::formatter::Formatter;
 use crate::templater::TemplateRenderer;
 use crate::ui::Ui;

cli/src/template_builder.rs

@@ -25,8 +25,8 @@ use jj_lib::config::ConfigValue;
 use jj_lib::op_store::TimestampRange;
 use jj_lib::settings::UserSettings;
 use jj_lib::time_util::DatePattern;
-use serde::de::IntoDeserializer as _;
 use serde::Deserialize;
+use serde::de::IntoDeserializer as _;
 
 use crate::formatter::FormatRecorder;
 use crate::formatter::Formatter;
@@ -870,8 +870,8 @@ fn build_binary_operation<'a, L: TemplateLanguage<'a> + ?Sized>(
     }
 }
 
-fn builtin_string_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
-) -> TemplateBuildMethodFnMap<'a, L, String> {
+fn builtin_string_methods<'a, L: TemplateLanguage<'a> + ?Sized>()
+-> TemplateBuildMethodFnMap<'a, L, String> {
     // Not using maplit::hashmap!{} or custom declarative macro here because
     // code completion inside macro is quite restricted.
     let mut map = TemplateBuildMethodFnMap::<L, String>::new();
@@ -1049,8 +1049,8 @@ fn string_index_to_char_boundary(s: &str, i: isize) -> usize {
     }
 }
 
-fn builtin_config_value_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
-) -> TemplateBuildMethodFnMap<'a, L, ConfigValue> {
+fn builtin_config_value_methods<'a, L: TemplateLanguage<'a> + ?Sized>()
+-> TemplateBuildMethodFnMap<'a, L, ConfigValue> {
     fn extract<'de, T: Deserialize<'de>>(value: ConfigValue) -> Result<T, TemplatePropertyError> {
         T::deserialize(value.into_deserializer())
             // map to err.message() because TomlError appends newline to it
@@ -1101,8 +1101,8 @@ fn builtin_config_value_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
     map
 }
 
-fn builtin_signature_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
-) -> TemplateBuildMethodFnMap<'a, L, Signature> {
+fn builtin_signature_methods<'a, L: TemplateLanguage<'a> + ?Sized>()
+-> TemplateBuildMethodFnMap<'a, L, Signature> {
     // Not using maplit::hashmap!{} or custom declarative macro here because
     // code completion inside macro is quite restricted.
     let mut map = TemplateBuildMethodFnMap::<L, Signature>::new();
@@ -1149,8 +1149,8 @@ fn builtin_signature_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
     map
 }
 
-fn builtin_email_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
-) -> TemplateBuildMethodFnMap<'a, L, Email> {
+fn builtin_email_methods<'a, L: TemplateLanguage<'a> + ?Sized>()
+-> TemplateBuildMethodFnMap<'a, L, Email> {
     // Not using maplit::hashmap!{} or custom declarative macro here because
     // code completion inside macro is quite restricted.
     let mut map = TemplateBuildMethodFnMap::<L, Email>::new();
@@ -1179,8 +1179,8 @@ fn builtin_email_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
     map
 }
 
-fn builtin_size_hint_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
-) -> TemplateBuildMethodFnMap<'a, L, SizeHint> {
+fn builtin_size_hint_methods<'a, L: TemplateLanguage<'a> + ?Sized>()
+-> TemplateBuildMethodFnMap<'a, L, SizeHint> {
     // Not using maplit::hashmap!{} or custom declarative macro here because
     // code completion inside macro is quite restricted.
     let mut map = TemplateBuildMethodFnMap::<L, SizeHint>::new();
@@ -1223,8 +1223,8 @@ fn builtin_size_hint_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
     map
 }
 
-fn builtin_timestamp_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
-) -> TemplateBuildMethodFnMap<'a, L, Timestamp> {
+fn builtin_timestamp_methods<'a, L: TemplateLanguage<'a> + ?Sized>()
+-> TemplateBuildMethodFnMap<'a, L, Timestamp> {
     // Not using maplit::hashmap!{} or custom declarative macro here because
     // code completion inside macro is quite restricted.
     let mut map = TemplateBuildMethodFnMap::<L, Timestamp>::new();
@@ -1311,8 +1311,8 @@ fn builtin_timestamp_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
     map
 }
 
-fn builtin_timestamp_range_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
-) -> TemplateBuildMethodFnMap<'a, L, TimestampRange> {
+fn builtin_timestamp_range_methods<'a, L: TemplateLanguage<'a> + ?Sized>()
+-> TemplateBuildMethodFnMap<'a, L, TimestampRange> {
     // Not using maplit::hashmap!{} or custom declarative macro here because
     // code completion inside macro is quite restricted.
     let mut map = TemplateBuildMethodFnMap::<L, TimestampRange>::new();
@@ -1353,8 +1353,8 @@ fn builtin_timestamp_range_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
     map
 }
 
-fn builtin_list_template_methods<'a, L: TemplateLanguage<'a> + ?Sized>(
-) -> BuildListTemplateMethodFnMap<'a, L> {
+fn builtin_list_template_methods<'a, L: TemplateLanguage<'a> + ?Sized>()
+-> BuildListTemplateMethodFnMap<'a, L> {
     // Not using maplit::hashmap!{} or custom declarative macro here because
     // code completion inside macro is quite restricted.
     let mut map = BuildListTemplateMethodFnMap::<L>::new();

cli/src/template_parser.rs

@@ -19,7 +19,6 @@ use std::sync::LazyLock;
 
 use itertools::Itertools as _;
 use jj_lib::dsl_util;
-use jj_lib::dsl_util::collect_similar;
 use jj_lib::dsl_util::AliasDeclaration;
 use jj_lib::dsl_util::AliasDeclarationParser;
 use jj_lib::dsl_util::AliasDefinitionParser;
@@ -33,12 +32,13 @@ use jj_lib::dsl_util::FoldableExpression;
 use jj_lib::dsl_util::FunctionCallParser;
 use jj_lib::dsl_util::InvalidArguments;
 use jj_lib::dsl_util::StringLiteralParser;
+use jj_lib::dsl_util::collect_similar;
+use pest::Parser as _;
 use pest::iterators::Pair;
 use pest::iterators::Pairs;
 use pest::pratt_parser::Assoc;
 use pest::pratt_parser::Op;
 use pest::pratt_parser::PrattParser;
-use pest::Parser as _;
 use pest_derive::Parser;
 use thiserror::Error;
 

cli/src/ui.rs

@@ -305,8 +305,8 @@ struct StreampagerConfig {
 
 impl StreampagerConfig {
     fn streampager_interface_mode(&self) -> streampager::config::InterfaceMode {
-        use streampager::config::InterfaceMode;
         use StreampagerAlternateScreenMode::*;
+        use streampager::config::InterfaceMode;
         match self.interface {
             // InterfaceMode::Direct not implemented
             FullScreenClearOutput => InterfaceMode::FullScreen,