Updating linting and rustfmt configs to latest

Author: MitMaro

.rustfmt.toml

@@ -1,23 +1,24 @@
-#array_width - allow use_small_heuristics
-#attr_fn_like_width - allow use_small_heuristics
+# array_width - allow use_small_heuristics
+# attr_fn_like_width - allow use_small_heuristics
 binop_separator = "Front"
 blank_lines_lower_bound = 0
 blank_lines_upper_bound = 1
 brace_style = "SameLineWhere"
-#chain_width - allow use_small_heuristics
+# chain_width - allow use_small_heuristics
 color = "Auto"
 combine_control_expr = false
 comment_width = 120
 condense_wildcard_suffixes = true
 control_brace_style = "ClosingNextLine"
 disable_all_formatting = false
-# edition - allow default
+# edition - allow default read from Cargo.toml
 empty_item_single_line = true
 enum_discrim_align_threshold = 0
 error_on_line_overflow = true
 error_on_unformatted = true
-fn_args_layout = "Tall"
-#fn_call_width - allow use_small_heuristics
+# fn_args_layout = "Tall" - Deprecated, see fn_params_layout
+# fn_call_width - allow use_small_heuristics
+fn_params_layout = "Tall"
 fn_single_line = false
 force_explicit_abi = true
 force_multiline_blocks = true
@@ -26,6 +27,7 @@ doc_comment_code_block_width = 120
 format_generated_files = false
 format_macro_matchers = true
 format_macro_bodies = true
+skip_macro_invocations = []
 format_strings = true
 hard_tabs = true
 hex_literal_case = "Upper"
@@ -55,6 +57,7 @@ reorder_modules = true
 short_array_element_width_threshold = 8
 skip_children = false
 # single_line_if_else_max_width - allow use_small_heuristics
+# single_line_let_else_max_width - allow use_small_heuristics
 space_after_colon = true
 space_before_colon = false
 spaces_around_ranges = false

Cargo.lock

@@ -0,0 +1,10 @@
+This file contains any lints from rustc that have not been added, and why.
+
+box-pointers - This project uses Box pointers, and it is safe to do so
+unstable-features - This is deprecated, and this project doesn't depend on it
+
+Unstable lints:
+	fuzzy-provenance-casts
+	lossy-provenance-casts
+	multiple-supertrait-upcastable
+	must-not-suspend

scripts/data/ignored-lints.txt

@@ -18,7 +18,9 @@
 	deprecated_in_future,
 	elided_lifetimes_in_paths,
 	explicit_outlives_requirements,
+	ffi_unwind_calls,
 	keyword_idents,
+	let_underscore_drop,
 	macro_use_extern_crate,
 	meta_variable_misuse,
 	missing_abi,
@@ -38,20 +40,21 @@
 	unreachable_pub,
 	unsafe_code,
 	unsafe_op_in_unsafe_fn,
-	unstable_features,
 	unused_crate_dependencies,
 	unused_extern_crates,
 	unused_import_braces,
 	unused_lifetimes,
 	unused_macro_rules,
 	unused_qualifications,
 	unused_results,
+	unused_tuple_struct_fields,
 	variant_size_differences
 )]
 // enable all of Clippy's lints
 #![deny(clippy::all, clippy::cargo, clippy::pedantic, clippy::restriction)]
 #![cfg_attr(include_nightly_lints, deny(clippy::nursery))]
 #![allow(
+	clippy::arithmetic_side_effects,
 	clippy::arithmetic_side_effects,
 	clippy::blanket_clippy_restriction_lints,
 	clippy::bool_to_int_with_if,
@@ -61,7 +64,6 @@
 	clippy::float_arithmetic,
 	clippy::implicit_return,
 	clippy::indexing_slicing,
-	clippy::integer_arithmetic,
 	clippy::map_err_ignore,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
@@ -71,10 +73,13 @@
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
 	clippy::pub_use,
+	clippy::question_mark_used,
 	clippy::redundant_pub_crate,
+	clippy::ref_patterns,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
+	clippy::tests_outside_test_module,
 	clippy::too_many_lines,
 	clippy::unwrap_used
 )]
@@ -91,9 +96,10 @@
 #![cfg_attr(
 	test,
 	allow(
+		let_underscore_drop,
 		clippy::cognitive_complexity,
-		clippy::let_underscore_drop,
 		clippy::let_underscore_must_use,
+		clippy::let_underscore_untyped,
 		clippy::needless_pass_by_value,
 		clippy::panic,
 		clippy::shadow_reuse,
@@ -104,4 +110,14 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(include_nightly_lints, allow(clippy::semicolon_outside_block))]
+#![cfg_attr(
+	include_nightly_lints,
+	allow(
+		clippy::arc_with_non_send_sync,
+		clippy::min_ident_chars,
+		clippy::needless_raw_strings,
+		clippy::pub_with_shorthand,
+		clippy::redundant_closure_call,
+		clippy::single_call_fn
+	)
+)]

scripts/data/lints.rs

@@ -17,6 +17,7 @@ name = "config"
 [dependencies]
 thiserror = "1.0.38"
 girt-git = {version = "2.2.0", path = "../../src/git"}
+proc-macro2 = "1.0.64" # TODO: remove override of indirect dependency
 
 [dev-dependencies]
 claim = { git = "https://github.com/Turbo87/rust-claim.git", rev = "23892a3" }

src/config/Cargo.toml

@@ -152,7 +152,7 @@ mod tests {
 	#[test]
 	fn try_from_git_config_error() {
 		with_git_config(&["[diff]", "renames = invalid"], |git_config| {
-			let _ = GitConfig::try_from(&git_config).unwrap_err();
+			_ = GitConfig::try_from(&git_config).unwrap_err();
 		});
 	}
 

src/config/src/git_config.rs

@@ -245,7 +245,7 @@ mod tests {
 	#[test]
 	fn try_from_git_config_error() {
 		with_git_config(&["[interactive-rebase-tool]", "inputAbort = invalid"], |git_config| {
-			let _ = KeyBindings::try_from(&git_config).unwrap_err();
+			_ = KeyBindings::try_from(&git_config).unwrap_err();
 		});
 	}
 

src/config/src/key_bindings.rs

@@ -19,7 +19,9 @@
 	deprecated_in_future,
 	elided_lifetimes_in_paths,
 	explicit_outlives_requirements,
+	ffi_unwind_calls,
 	keyword_idents,
+	let_underscore_drop,
 	macro_use_extern_crate,
 	meta_variable_misuse,
 	missing_abi,
@@ -39,20 +41,21 @@
 	unreachable_pub,
 	unsafe_code,
 	unsafe_op_in_unsafe_fn,
-	unstable_features,
 	unused_crate_dependencies,
 	unused_extern_crates,
 	unused_import_braces,
 	unused_lifetimes,
 	unused_macro_rules,
 	unused_qualifications,
 	unused_results,
+	unused_tuple_struct_fields,
 	variant_size_differences
 )]
 // enable all of Clippy's lints
 #![deny(clippy::all, clippy::cargo, clippy::pedantic, clippy::restriction)]
 #![cfg_attr(include_nightly_lints, deny(clippy::nursery))]
 #![allow(
+	clippy::arithmetic_side_effects,
 	clippy::arithmetic_side_effects,
 	clippy::blanket_clippy_restriction_lints,
 	clippy::bool_to_int_with_if,
@@ -62,7 +65,6 @@
 	clippy::float_arithmetic,
 	clippy::implicit_return,
 	clippy::indexing_slicing,
-	clippy::integer_arithmetic,
 	clippy::map_err_ignore,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
@@ -72,10 +74,13 @@
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
 	clippy::pub_use,
+	clippy::question_mark_used,
 	clippy::redundant_pub_crate,
+	clippy::ref_patterns,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
+	clippy::tests_outside_test_module,
 	clippy::too_many_lines,
 	clippy::unwrap_used
 )]
@@ -92,9 +97,10 @@
 #![cfg_attr(
 	test,
 	allow(
+		let_underscore_drop,
 		clippy::cognitive_complexity,
-		clippy::let_underscore_drop,
 		clippy::let_underscore_must_use,
+		clippy::let_underscore_untyped,
 		clippy::needless_pass_by_value,
 		clippy::panic,
 		clippy::shadow_reuse,
@@ -105,7 +111,17 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(include_nightly_lints, allow(clippy::semicolon_outside_block))]
+#![cfg_attr(
+	include_nightly_lints,
+	allow(
+		clippy::arc_with_non_send_sync,
+		clippy::min_ident_chars,
+		clippy::needless_raw_strings,
+		clippy::pub_with_shorthand,
+		clippy::redundant_closure_call,
+		clippy::single_call_fn
+	)
+)]
 // LINT-REPLACE-END
 
 //! Git Interactive Rebase Tool - Configuration Module
@@ -136,6 +152,8 @@ mod utils;
 mod testutils;
 
 use git::Repository;
+// TODO: remove override of indirect dependency
+use proc_macro2 as _;
 
 use self::utils::{get_bool, get_diff_ignore_whitespace, get_diff_show_whitespace, get_string, get_unsigned_integer};
 pub use self::{
@@ -274,7 +292,7 @@ mod tests {
 		with_git_config(
 			&["[interactive-rebase-tool]", "autoSelectNext = invalid"],
 			|git_config| {
-				let _ = Config::try_from(&git_config).unwrap_err();
+				_ = Config::try_from(&git_config).unwrap_err();
 			},
 		);
 	}

src/config/src/lib.rs

@@ -3,7 +3,8 @@ use git::{Config, ErrorCode};
 use crate::{ConfigError, ConfigErrorCause};
 
 pub(crate) fn _get_string(config: Option<&Config>, name: &str) -> Result<Option<String>, ConfigError> {
-	let Some(cfg) = config  else {
+	let Some(cfg) = config
+	else {
 		return Ok(None);
 	};
 	match cfg.get_string(name) {

src/config/src/utils/get_string.rs

@@ -99,8 +99,12 @@ where ModuleProvider: module::ModuleProvider + Send + 'static
 	}
 
 	pub(crate) fn run_until_finished(&mut self) -> Result<(), Exit> {
-		let Some(mut threads) = self.threads.take() else {
-			return Err(Exit::new(ExitStatus::StateError, "Attempt made to run application a second time"));
+		let Some(mut threads) = self.threads.take()
+		else {
+			return Err(Exit::new(
+				ExitStatus::StateError,
+				"Attempt made to run application a second time",
+			));
 		};
 
 		let runtime = Runtime::new();
@@ -230,7 +234,7 @@ mod tests {
 	#[test]
 	#[serial_test::serial]
 	fn load_repository_failure() {
-		let _ = set_git_directory("fixtures/not-a-repository");
+		_ = set_git_directory("fixtures/not-a-repository");
 		let event_provider = create_event_reader(|| Ok(None));
 		let application: Result<Application<TestModuleProvider<DefaultTestModule>>, Exit> =
 			Application::new(&args(&["todofile"]), event_provider, create_mocked_crossterm());
@@ -247,7 +251,7 @@ mod tests {
 	#[test]
 	#[serial_test::serial]
 	fn load_config_failure() {
-		let _ = set_git_directory("fixtures/invalid-config");
+		_ = set_git_directory("fixtures/invalid-config");
 		let event_provider = create_event_reader(|| Ok(None));
 		let application: Result<Application<TestModuleProvider<DefaultTestModule>>, Exit> =
 			Application::new(&args(&["rebase-todo"]), event_provider, create_mocked_crossterm());
@@ -258,7 +262,7 @@ mod tests {
 	#[test]
 	#[serial_test::serial]
 	fn load_todo_file_load_error() {
-		let _ = set_git_directory("fixtures/simple");
+		_ = set_git_directory("fixtures/simple");
 		let event_provider = create_event_reader(|| Ok(None));
 		let application: Result<Application<TestModuleProvider<DefaultTestModule>>, Exit> =
 			Application::new(&args(&["does-not-exist"]), event_provider, create_mocked_crossterm());