cargo fmt

bgilbert · bgilbert · commit 0c1bd8fba087 · 2024-11-17T12:34:13.000-08:00
diff --git a/build.rs b/build.rs
@@ -1,7 +1,7 @@
 use std::{env, process};
 
 use chrono::{TimeZone, Utc};
-use rustc_version::{version_meta, Channel};
+use rustc_version::{Channel, version_meta};
 
 fn main() {
 	println!("cargo::rustc-check-cfg=cfg(allow_unknown_lints)");
diff --git a/src/application.rs b/src/application.rs
@@ -4,6 +4,8 @@ use anyhow::Result;
 use parking_lot::Mutex;
 
 use crate::{
+	Args,
+	Exit,
 	config::Config,
 	display::Display,
 	git::Repository,
@@ -15,8 +17,6 @@ use crate::{
 	search,
 	todo_file::{TodoFile, TodoFileOptions},
 	view::View,
-	Args,
-	Exit,
 };
 
 pub(crate) struct Application<ModuleProvider>
@@ -198,12 +198,12 @@ mod tests {
 		module::Modules,
 		runtime::{Installer, RuntimeError},
 		test_helpers::{
+			DefaultTestModule,
+			TestModuleProvider,
 			create_config,
 			create_event_reader,
 			mocks,
 			with_git_directory,
-			DefaultTestModule,
-			TestModuleProvider,
 		},
 	};
 
diff --git a/src/config/git_config.rs b/src/config/git_config.rs
@@ -2,8 +2,8 @@ use std::env;
 
 use crate::{
 	config::{
-		utils::{get_string, get_unsigned_integer, git_diff_renames},
 		ConfigError,
+		utils::{get_string, get_unsigned_integer, git_diff_renames},
 	},
 	git::Config,
 };
@@ -92,7 +92,7 @@ mod tests {
 	use super::*;
 	use crate::{
 		config::ConfigErrorCause,
-		test_helpers::{invalid_utf, with_env_var, with_git_config, EnvVarAction},
+		test_helpers::{EnvVarAction, invalid_utf, with_env_var, with_git_config},
 	};
 
 	macro_rules! config_test {
diff --git a/src/config/key_bindings.rs b/src/config/key_bindings.rs
@@ -1,5 +1,5 @@
 use crate::{
-	config::{utils::get_input, ConfigError},
+	config::{ConfigError, utils::get_input},
 	git::Config,
 };
 
diff --git a/src/config/theme.rs b/src/config/theme.rs
@@ -1,9 +1,9 @@
 use crate::{
 	config::{
-		utils::{get_optional_string, get_string},
 		Color,
 		ConfigError,
 		ConfigErrorCause,
+		utils::{get_optional_string, get_string},
 	},
 	git::Config,
 };
diff --git a/src/config/utils/get_bool.rs b/src/config/utils/get_bool.rs
@@ -1,5 +1,5 @@
 use crate::{
-	config::{utils::get_optional_string, ConfigError, ConfigErrorCause},
+	config::{ConfigError, ConfigErrorCause, utils::get_optional_string},
 	git::{Config, ErrorCode},
 };
 
diff --git a/src/config/utils/get_diff_ignore_whitespace.rs b/src/config/utils/get_diff_ignore_whitespace.rs
@@ -1,5 +1,5 @@
 use crate::{
-	config::{utils::get_string, ConfigError, ConfigErrorCause, DiffIgnoreWhitespaceSetting},
+	config::{ConfigError, ConfigErrorCause, DiffIgnoreWhitespaceSetting, utils::get_string},
 	git::Config,
 };
 
diff --git a/src/config/utils/get_diff_rename.rs b/src/config/utils/get_diff_rename.rs
@@ -1,5 +1,5 @@
 use crate::{
-	config::{get_string, ConfigError, ConfigErrorCause},
+	config::{ConfigError, ConfigErrorCause, get_string},
 	git::Config,
 };
 
diff --git a/src/config/utils/get_diff_show_whitespace.rs b/src/config/utils/get_diff_show_whitespace.rs
@@ -1,5 +1,5 @@
 use crate::{
-	config::{get_string, ConfigError, ConfigErrorCause, DiffShowWhitespaceSetting},
+	config::{ConfigError, ConfigErrorCause, DiffShowWhitespaceSetting, get_string},
 	git::Config,
 };
 
diff --git a/src/config/utils/get_input.rs b/src/config/utils/get_input.rs
@@ -1,5 +1,5 @@
 use crate::{
-	config::{utils::get_string, ConfigError, ConfigErrorCause},
+	config::{ConfigError, ConfigErrorCause, utils::get_string},
 	git::Config,
 };
 
diff --git a/src/config/utils/get_unsigned_integer.rs b/src/config/utils/get_unsigned_integer.rs
@@ -1,5 +1,5 @@
 use crate::{
-	config::{utils::get_optional_string, ConfigError, ConfigErrorCause},
+	config::{ConfigError, ConfigErrorCause, utils::get_optional_string},
 	git::{Config, ErrorCode},
 };
 
diff --git a/src/display/crossterm.rs b/src/display/crossterm.rs
@@ -1,7 +1,9 @@
 #![cfg(not(tarpaulin_include))]
-use std::io::{stdout, BufWriter, Stdout, Write};
+use std::io::{BufWriter, Stdout, Write, stdout};
 
 use crossterm::{
+	Command,
+	QueueableCommand,
 	cursor::{Hide, MoveTo, MoveToColumn, MoveToNextLine, Show},
 	event::{
 		DisableMouseCapture,
@@ -10,23 +12,21 @@ use crossterm::{
 		PopKeyboardEnhancementFlags,
 		PushKeyboardEnhancementFlags,
 	},
-	style::{available_color_count, Attribute, Colors, Print, ResetColor, SetAttribute, SetColors},
+	style::{Attribute, Colors, Print, ResetColor, SetAttribute, SetColors, available_color_count},
 	terminal::{
-		disable_raw_mode,
-		enable_raw_mode,
-		size,
 		Clear,
 		ClearType,
 		DisableLineWrap,
 		EnableLineWrap,
 		EnterAlternateScreen,
 		LeaveAlternateScreen,
+		disable_raw_mode,
+		enable_raw_mode,
+		size,
 	},
-	Command,
-	QueueableCommand,
 };
 
-use crate::display::{utils::detect_color_mode, ColorMode, DisplayError, Size, Tui};
+use crate::display::{ColorMode, DisplayError, Size, Tui, utils::detect_color_mode};
 
 /// A thin wrapper over the [Crossterm library](https://github.com/crossterm-rs/crossterm).
 #[derive(Debug)]
diff --git a/src/display/utils.rs b/src/display/utils.rs
@@ -201,7 +201,7 @@ mod tests {
 	use rstest::rstest;
 
 	use super::*;
-	use crate::test_helpers::{with_env_var, EnvVarAction};
+	use crate::test_helpers::{EnvVarAction, with_env_var};
 
 	#[test]
 	fn detect_color_mode_no_env_2_colors() {
diff --git a/src/git/commit.rs b/src/git/commit.rs
@@ -121,11 +121,11 @@ mod tests {
 
 	use super::*;
 	use crate::test_helpers::{
+		CreateCommitOptions,
+		JAN_2021_EPOCH,
 		builders::{CommitBuilder, ReferenceBuilder},
 		create_commit,
 		with_temp_repository,
-		CreateCommitOptions,
-		JAN_2021_EPOCH,
 	};
 
 	#[test]
diff --git a/src/git/commit_diff_loader.rs b/src/git/commit_diff_loader.rs
@@ -159,7 +159,7 @@ impl<'options> CommitDiffLoader<'options> {
 #[cfg(all(unix, test))]
 mod tests {
 	use std::{
-		fs::{remove_file, File},
+		fs::{File, remove_file},
 		io::Write,
 		os::unix::fs::symlink,
 	};
diff --git a/src/git/reference_kind.rs b/src/git/reference_kind.rs
@@ -37,7 +37,7 @@ impl ReferenceKind {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::test_helpers::{with_temp_repository, JAN_2021_EPOCH};
+	use crate::test_helpers::{JAN_2021_EPOCH, with_temp_repository};
 
 	#[test]
 	fn from_git2_reference_branch() {
diff --git a/src/input.rs b/src/input.rs
@@ -23,11 +23,11 @@ pub(crate) use crossterm::event::{KeyCode, KeyEventKind, KeyModifiers, MouseEven
 pub(crate) use self::{
 	event::Event,
 	event_handler::EventHandler,
-	event_provider::{read_event, EventReaderFn},
+	event_provider::{EventReaderFn, read_event},
 	input_options::InputOptions,
 	key_bindings::KeyBindings,
 	key_event::KeyEvent,
 	map_keybindings::map_keybindings,
 	standard_event::StandardEvent,
-	thread::{State, Thread, THREAD_NAME},
+	thread::{State, THREAD_NAME, Thread},
 };
diff --git a/src/input/event_provider.rs b/src/input/event_provider.rs
@@ -1,9 +1,9 @@
 use std::time::Duration;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
+use crossterm::event::{Event, KeyEvent};
 #[cfg(not(test))]
 use crossterm::event::{poll, read};
-use crossterm::event::{Event, KeyEvent};
 #[cfg(test)]
 use read_event_mocks::{poll, read};
 
diff --git a/src/input/key_bindings.rs b/src/input/key_bindings.rs
@@ -1,4 +1,4 @@
-use crate::input::{map_keybindings, Event};
+use crate::input::{Event, map_keybindings};
 
 /// Represents a mapping between an input event and an action.
 #[derive(Debug)]
diff --git a/src/input/thread/state.rs b/src/input/thread/state.rs
@@ -2,8 +2,8 @@ use std::{
 	collections::VecDeque,
 	mem,
 	sync::{
-		atomic::{AtomicBool, Ordering},
 		Arc,
+		atomic::{AtomicBool, Ordering},
 	},
 	time::Duration,
 };
diff --git a/src/module/module_handler.rs b/src/module/module_handler.rs
@@ -66,14 +66,14 @@ impl<ModuleProvider: crate::module::ModuleProvider> ModuleHandler<ModuleProvider
 mod tests {
 	use std::sync::Arc;
 
-	use anyhow::{anyhow, Error};
+	use anyhow::{Error, anyhow};
 	use parking_lot::Mutex;
 
 	use super::*;
 	use crate::{
 		input::StandardEvent,
 		module::Module,
-		test_helpers::{testers, TestModuleProvider},
+		test_helpers::{TestModuleProvider, testers},
 	};
 
 	#[derive(Clone)]
diff --git a/src/modules/external_editor.rs b/src/modules/external_editor.rs
@@ -7,7 +7,7 @@ mod tests;
 
 use std::sync::Arc;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
 
diff --git a/src/modules/list.rs b/src/modules/list.rs
@@ -11,10 +11,10 @@ use parking_lot::Mutex;
 use self::{
 	search::Search,
 	utils::{
+		TodoLineSegmentsOptions,
 		get_list_normal_mode_help_lines,
 		get_list_visual_mode_help_lines,
 		get_todo_line_segments,
-		TodoLineSegmentsOptions,
 	},
 };
 use crate::{
diff --git a/src/modules/list/search.rs b/src/modules/list/search.rs
@@ -3,8 +3,8 @@ mod state;
 
 use std::{
 	sync::{
-		atomic::{AtomicUsize, Ordering},
 		Arc,
+		atomic::{AtomicUsize, Ordering},
 	},
 	time::Duration,
 };
diff --git a/src/modules/show_commit.rs b/src/modules/show_commit.rs
@@ -7,7 +7,7 @@ mod tests;
 
 use std::sync::Arc;
 
-use anyhow::{anyhow, Error};
+use anyhow::{Error, anyhow};
 use captur::capture;
 use parking_lot::Mutex;
 
diff --git a/src/process.rs b/src/process.rs
@@ -8,12 +8,12 @@ use std::{
 	io::ErrorKind,
 	process::Command,
 	sync::{
-		atomic::{AtomicBool, Ordering},
 		Arc,
+		atomic::{AtomicBool, Ordering},
 	},
 };
 
-use anyhow::{anyhow, Error, Result};
+use anyhow::{Error, Result, anyhow};
 use parking_lot::Mutex;
 
 pub(crate) use self::{artifact::Artifact, results::Results, thread::Thread};
diff --git a/src/process/tests.rs b/src/process/tests.rs
@@ -6,11 +6,11 @@ use super::*;
 use crate::{
 	assert_results,
 	input::{InputOptions, KeyBindings},
-	module::{Module, DEFAULT_INPUT_OPTIONS, DEFAULT_VIEW_DATA},
+	module::{DEFAULT_INPUT_OPTIONS, DEFAULT_VIEW_DATA, Module},
 	runtime::Status,
 	test_helpers::{create_default_test_module_handler, create_test_module_handler, mocks, testers},
 	todo_file::Line,
-	view::{ViewData, REFRESH_THREAD_NAME},
+	view::{REFRESH_THREAD_NAME, ViewData},
 };
 
 #[derive(Clone)]
diff --git a/src/runtime/installer.rs b/src/runtime/installer.rs
@@ -57,8 +57,8 @@ impl Debug for Installer {
 #[cfg(test)]
 mod tests {
 	use std::sync::{
-		atomic::{AtomicBool, Ordering},
 		Arc,
+		atomic::{AtomicBool, Ordering},
 	};
 
 	use crossbeam_channel::unbounded;
diff --git a/src/runtime/runtime.rs b/src/runtime/runtime.rs
@@ -1,6 +1,6 @@
 use std::{sync::Arc, thread};
 
-use crossbeam_channel::{unbounded, Receiver, Sender};
+use crossbeam_channel::{Receiver, Sender, unbounded};
 use parking_lot::Mutex;
 
 use crate::runtime::{Installer, RuntimeError, Status, ThreadStatuses, Threadable};
diff --git a/src/search/state.rs b/src/search/state.rs
@@ -1,7 +1,7 @@
 use std::{
 	sync::{
-		atomic::{AtomicBool, Ordering},
 		Arc,
+		atomic::{AtomicBool, Ordering},
 	},
 	time::Duration,
 };
diff --git a/src/test_helpers.rs b/src/test_helpers.rs
@@ -24,21 +24,21 @@ mod with_view_state;
 pub(crate) static JAN_2021_EPOCH: i64 = 1_609_459_200;
 
 pub(crate) use self::{
-	create_commit::{create_commit, CreateCommitOptions},
+	create_commit::{CreateCommitOptions, create_commit},
 	create_config::create_config,
-	create_default_test_module_handler::{create_default_test_module_handler, DefaultTestModule},
+	create_default_test_module_handler::{DefaultTestModule, create_default_test_module_handler},
 	create_event_reader::create_event_reader,
 	create_invalid_utf::invalid_utf,
 	create_test_keybindings::create_test_keybindings,
 	create_test_module_handler::create_test_module_handler,
 	shared::TestModuleProvider,
-	with_env_var::{with_env_var, EnvVarAction},
-	with_event_handler::{with_event_handler, EventHandlerTestContext},
+	with_env_var::{EnvVarAction, with_env_var},
+	with_event_handler::{EventHandlerTestContext, with_event_handler},
 	with_git_config::with_git_config,
 	with_git_directory::with_git_directory,
-	with_search::{with_search, SearchTestContext},
+	with_search::{SearchTestContext, with_search},
 	with_temp_bare_repository::with_temp_bare_repository,
 	with_temp_repository::with_temp_repository,
 	with_todo_file::with_todo_file,
-	with_view_state::{with_view_state, ViewStateTestContext},
+	with_view_state::{ViewStateTestContext, with_view_state},
 };
diff --git a/src/test_helpers/assertions.rs b/src/test_helpers/assertions.rs
@@ -3,4 +3,4 @@ mod assert_not_empty;
 pub(crate) mod assert_rendered_output;
 mod assert_results;
 
-pub(crate) use assert_results::{AnyArtifact, ArtifactCompareWrapper, _assert_results};
+pub(crate) use assert_results::{_assert_results, AnyArtifact, ArtifactCompareWrapper};
diff --git a/src/test_helpers/assertions/assert_rendered_output/render_view_data.rs b/src/test_helpers/assertions/assert_rendered_output/render_view_data.rs
@@ -1,5 +1,5 @@
 use crate::{
-	test_helpers::assertions::assert_rendered_output::{render_view_line, AssertRenderOptions},
+	test_helpers::assertions::assert_rendered_output::{AssertRenderOptions, render_view_line},
 	view::ViewData,
 };
 
diff --git a/src/test_helpers/assertions/assert_rendered_output/render_view_line.rs b/src/test_helpers/assertions/assert_rendered_output/render_view_line.rs
diff --git a/src/test_helpers/create_default_test_module_handler.rs b/src/test_helpers/create_default_test_module_handler.rs
diff --git a/src/test_helpers/create_test_keybindings.rs b/src/test_helpers/create_test_keybindings.rs
diff --git a/src/test_helpers/testers.rs b/src/test_helpers/testers.rs
diff --git a/src/test_helpers/testers/module.rs b/src/test_helpers/testers/module.rs
diff --git a/src/test_helpers/testers/process.rs b/src/test_helpers/testers/process.rs
diff --git a/src/test_helpers/testers/threadable.rs b/src/test_helpers/testers/threadable.rs
diff --git a/src/test_helpers/with_git_directory.rs b/src/test_helpers/with_git_directory.rs
diff --git a/src/todo_file.rs b/src/todo_file.rs
diff --git a/src/view.rs b/src/view.rs
diff --git a/src/view/render_slice/tests.rs b/src/view/render_slice/tests.rs
diff --git a/src/view/thread/state.rs b/src/view/thread/state.rs
