Fix latest linting errors

MitMaro · MitMaro · commit d7655157ff5d · 2023-09-06T22:45:22.000-02:30
diff --git a/scripts/data/lints.rs b/scripts/data/lints.rs
@@ -64,17 +64,23 @@
 	clippy::implicit_return,
 	clippy::indexing_slicing,
 	clippy::map_err_ignore,
+	clippy::min_ident_chars,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
 	clippy::mod_module_files,
 	clippy::module_name_repetitions,
+	clippy::needless_raw_strings,
 	clippy::new_without_default,
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
+	clippy::pattern_type_mismatch,
 	clippy::pub_use,
+	clippy::pub_with_shorthand,
 	clippy::question_mark_used,
+	clippy::redundant_closure_call,
 	clippy::redundant_pub_crate,
 	clippy::ref_patterns,
+	clippy::single_call_fn,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
@@ -109,15 +115,4 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(
-	include_nightly_lints,
-	allow(
-		clippy::absolute_paths,
-		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
-	)
-)]
+#![cfg_attr(include_nightly_lints, allow(clippy::absolute_paths, clippy::arc_with_non_send_sync))]
diff --git a/src/config/src/lib.rs b/src/config/src/lib.rs
@@ -65,17 +65,23 @@
 	clippy::implicit_return,
 	clippy::indexing_slicing,
 	clippy::map_err_ignore,
+	clippy::min_ident_chars,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
 	clippy::mod_module_files,
 	clippy::module_name_repetitions,
+	clippy::needless_raw_strings,
 	clippy::new_without_default,
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
+	clippy::pattern_type_mismatch,
 	clippy::pub_use,
+	clippy::pub_with_shorthand,
 	clippy::question_mark_used,
+	clippy::redundant_closure_call,
 	clippy::redundant_pub_crate,
 	clippy::ref_patterns,
+	clippy::single_call_fn,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
@@ -110,18 +116,7 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(
-	include_nightly_lints,
-	allow(
-		clippy::absolute_paths,
-		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
-	)
-)]
+#![cfg_attr(include_nightly_lints, allow(clippy::absolute_paths, clippy::arc_with_non_send_sync))]
 // LINT-REPLACE-END
 
 //! Git Interactive Rebase Tool - Configuration Module
diff --git a/src/core/src/lib.rs b/src/core/src/lib.rs
@@ -65,17 +65,23 @@
 	clippy::implicit_return,
 	clippy::indexing_slicing,
 	clippy::map_err_ignore,
+	clippy::min_ident_chars,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
 	clippy::mod_module_files,
 	clippy::module_name_repetitions,
+	clippy::needless_raw_strings,
 	clippy::new_without_default,
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
+	clippy::pattern_type_mismatch,
 	clippy::pub_use,
+	clippy::pub_with_shorthand,
 	clippy::question_mark_used,
+	clippy::redundant_closure_call,
 	clippy::redundant_pub_crate,
 	clippy::ref_patterns,
+	clippy::single_call_fn,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
@@ -110,18 +116,7 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(
-	include_nightly_lints,
-	allow(
-		clippy::absolute_paths,
-		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
-	)
-)]
+#![cfg_attr(include_nightly_lints, allow(clippy::absolute_paths, clippy::arc_with_non_send_sync))]
 // LINT-REPLACE-END
 // TODO deny clippy::same_name_method again once bitflags/bitflags#374 is merged
 #![allow(
diff --git a/src/core/src/modules/external_editor/mod.rs b/src/core/src/modules/external_editor/mod.rs
@@ -102,7 +102,7 @@ impl Module for ExternalEditor {
 						let mut todo_file = self.todo_file.lock();
 						let result = todo_file.load_file();
 						let state = match result {
-							Ok(_) => {
+							Ok(()) => {
 								if todo_file.is_empty() || todo_file.is_noop() {
 									Some(ExternalEditorState::Empty)
 								}
diff --git a/src/display/src/lib.rs b/src/display/src/lib.rs
@@ -65,17 +65,23 @@
 	clippy::implicit_return,
 	clippy::indexing_slicing,
 	clippy::map_err_ignore,
+	clippy::min_ident_chars,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
 	clippy::mod_module_files,
 	clippy::module_name_repetitions,
+	clippy::needless_raw_strings,
 	clippy::new_without_default,
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
+	clippy::pattern_type_mismatch,
 	clippy::pub_use,
+	clippy::pub_with_shorthand,
 	clippy::question_mark_used,
+	clippy::redundant_closure_call,
 	clippy::redundant_pub_crate,
 	clippy::ref_patterns,
+	clippy::single_call_fn,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
@@ -110,18 +116,7 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(
-	include_nightly_lints,
-	allow(
-		clippy::absolute_paths,
-		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
-	)
-)]
+#![cfg_attr(include_nightly_lints, allow(clippy::absolute_paths, clippy::arc_with_non_send_sync))]
 // LINT-REPLACE-END
 
 //! Git Interactive Rebase Tool - Display Module
diff --git a/src/git/src/file_status_builder.rs b/src/git/src/file_status_builder.rs
@@ -242,15 +242,15 @@ mod tests {
 	}
 
 	#[test]
-	#[should_panic]
+	#[should_panic(expected = "add_file_stat must be called once before adding a delta")]
 	fn add_delta_without_file_stat() {
 		let mut file_stats_builder = FileStatusBuilder::new();
 		file_stats_builder.add_delta(Delta::new("@ path/to/file.rs:56 @ impl Delta {", 10, 12, 3, 4));
 		_ = file_stats_builder.build();
 	}
 
 	#[test]
-	#[should_panic]
+	#[should_panic(expected = "add_delta must be called once before adding a diff line")]
 	fn add_diff_line_before_delta() {
 		let mut file_stats_builder = FileStatusBuilder::new();
 		file_stats_builder.add_file_stat(FileStatus::new(
diff --git a/src/git/src/lib.rs b/src/git/src/lib.rs
@@ -65,17 +65,23 @@
 	clippy::implicit_return,
 	clippy::indexing_slicing,
 	clippy::map_err_ignore,
+	clippy::min_ident_chars,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
 	clippy::mod_module_files,
 	clippy::module_name_repetitions,
+	clippy::needless_raw_strings,
 	clippy::new_without_default,
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
+	clippy::pattern_type_mismatch,
 	clippy::pub_use,
+	clippy::pub_with_shorthand,
 	clippy::question_mark_used,
+	clippy::redundant_closure_call,
 	clippy::redundant_pub_crate,
 	clippy::ref_patterns,
+	clippy::single_call_fn,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
@@ -110,18 +116,7 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(
-	include_nightly_lints,
-	allow(
-		clippy::absolute_paths,
-		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
-	)
-)]
+#![cfg_attr(include_nightly_lints, allow(clippy::absolute_paths, clippy::arc_with_non_send_sync))]
 // LINT-REPLACE-END
 
 //! Git Interactive Rebase Tool - Git Module
diff --git a/src/input/src/lib.rs b/src/input/src/lib.rs
@@ -65,17 +65,23 @@
 	clippy::implicit_return,
 	clippy::indexing_slicing,
 	clippy::map_err_ignore,
+	clippy::min_ident_chars,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
 	clippy::mod_module_files,
 	clippy::module_name_repetitions,
+	clippy::needless_raw_strings,
 	clippy::new_without_default,
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
+	clippy::pattern_type_mismatch,
 	clippy::pub_use,
+	clippy::pub_with_shorthand,
 	clippy::question_mark_used,
+	clippy::redundant_closure_call,
 	clippy::redundant_pub_crate,
 	clippy::ref_patterns,
+	clippy::single_call_fn,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
@@ -110,18 +116,7 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(
-	include_nightly_lints,
-	allow(
-		clippy::absolute_paths,
-		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
-	)
-)]
+#![cfg_attr(include_nightly_lints, allow(clippy::absolute_paths, clippy::arc_with_non_send_sync))]
 // LINT-REPLACE-END
 // TODO deny clippy::same_name_method again once bitflags/bitflags#374 is merged
 #![allow(clippy::same_name_method)]
diff --git a/src/main.rs b/src/main.rs
@@ -65,17 +65,23 @@
 	clippy::implicit_return,
 	clippy::indexing_slicing,
 	clippy::map_err_ignore,
+	clippy::min_ident_chars,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
 	clippy::mod_module_files,
 	clippy::module_name_repetitions,
+	clippy::needless_raw_strings,
 	clippy::new_without_default,
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
+	clippy::pattern_type_mismatch,
 	clippy::pub_use,
+	clippy::pub_with_shorthand,
 	clippy::question_mark_used,
+	clippy::redundant_closure_call,
 	clippy::redundant_pub_crate,
 	clippy::ref_patterns,
+	clippy::single_call_fn,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
@@ -110,30 +116,19 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(
-	include_nightly_lints,
-	allow(
-		clippy::absolute_paths,
-		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
-	)
-)]
+#![cfg_attr(include_nightly_lints, allow(clippy::absolute_paths, clippy::arc_with_non_send_sync))]
 // LINT-REPLACE-END
 #![allow(missing_docs, rustdoc::missing_crate_level_docs)]
 
-use std::env::args_os;
+use std::{env, process};
 
 // TODO use the termination trait once rust-lang/rust#43301 is stable
 #[allow(clippy::exit, clippy::print_stderr)]
 #[cfg(not(tarpaulin_include))]
 fn main() {
-	let exit = core::run(args_os().skip(1).collect());
+	let exit = core::run(env::args_os().skip(1).collect());
 	if let Some(message) = exit.get_message().as_ref() {
 		eprintln!("{message}");
 	}
-	std::process::exit(exit.get_status().to_code());
+	process::exit(exit.get_status().to_code());
 }
diff --git a/src/runtime/src/lib.rs b/src/runtime/src/lib.rs
@@ -65,17 +65,23 @@
 	clippy::implicit_return,
 	clippy::indexing_slicing,
 	clippy::map_err_ignore,
+	clippy::min_ident_chars,
 	clippy::missing_docs_in_private_items,
 	clippy::missing_trait_methods,
 	clippy::mod_module_files,
 	clippy::module_name_repetitions,
+	clippy::needless_raw_strings,
 	clippy::new_without_default,
 	clippy::non_ascii_literal,
 	clippy::option_if_let_else,
+	clippy::pattern_type_mismatch,
 	clippy::pub_use,
+	clippy::pub_with_shorthand,
 	clippy::question_mark_used,
+	clippy::redundant_closure_call,
 	clippy::redundant_pub_crate,
 	clippy::ref_patterns,
+	clippy::single_call_fn,
 	clippy::std_instead_of_alloc,
 	clippy::std_instead_of_core,
 	clippy::tabs_in_doc_comments,
@@ -110,18 +116,7 @@
 	)
 )]
 // allowable upcoming nightly lints
-#![cfg_attr(
-	include_nightly_lints,
-	allow(
-		clippy::absolute_paths,
-		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
-	)
-)]
+#![cfg_attr(include_nightly_lints, allow(clippy::absolute_paths, clippy::arc_with_non_send_sync))]
 // LINT-REPLACE-END
 #![allow(clippy::as_conversions, clippy::cast_possible_truncation)]
 
diff --git a/src/runtime/src/thread_statuses.rs b/src/runtime/src/thread_statuses.rs
@@ -131,7 +131,7 @@ mod tests {
 	}
 
 	#[test]
-	#[should_panic]
+	#[should_panic(expected = "Attempt to register more than one threads with name: name")]
 	fn register_thread_same_name() {
 		let statuses = ThreadStatuses::new();
 		statuses.register_thread("name", Status::New);
diff --git a/src/testutils/src/lib.rs b/src/testutils/src/lib.rs
diff --git a/src/todo_file/src/lib.rs b/src/todo_file/src/lib.rs
diff --git a/src/view/src/lib.rs b/src/view/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ impl Module for ExternalEditor {`
`102`	`102`	`let mut todo_file = self.todo_file.lock();`
`103`	`103`	`let result = todo_file.load_file();`
`104`	`104`	`let state = match result {`
`105`		`- Ok(_) => {`
	`105`	`+ Ok(()) => {`
`106`	`106`	`if todo_file.is_empty() \|\| todo_file.is_noop() {`
`107`	`107`	`Some(ExternalEditorState::Empty)`
`108`	`108`	`}`