Remove unneeded type from process module tests

The process TestContext type was not needed on the closures, so this
removes it.

4 files changed, 41 insertions, 52 deletions

diff --git a/src/process/error.rs b/src/process/error.rs
index a711c63..fff953d 100644
--- a/src/process/error.rs
+++ b/src/process/error.rs
@@ -81,12 +81,12 @@ mod tests {
 		assert_process_result,
 		assert_rendered_output,
 		input::{Event, MetaEvent},
-		process::testutil::{process_module_test, TestContext},
+		process::testutil::process_module_test,
 	};
 
 	#[test]
 	fn simple_error() {
-		process_module_test(&[], &[], |test_context: TestContext<'_>| {
+		process_module_test(&[], &[], |test_context| {
 			let mut module = Error::new();
 			module.set_error_message(&anyhow!("Test Error"));
 			let view_data = test_context.build_view_data(&mut module);
@@ -103,7 +103,7 @@ mod tests {
 
 	#[test]
 	fn error_with_contest() {
-		process_module_test(&[], &[], |test_context: TestContext<'_>| {
+		process_module_test(&[], &[], |test_context| {
 			let mut module = Error::new();
 			module.set_error_message(&anyhow!("Test Error").context("Context"));
 			let view_data = test_context.build_view_data(&mut module);
@@ -121,7 +121,7 @@ mod tests {
 
 	#[test]
 	fn error_with_newlines() {
-		process_module_test(&[], &[], |test_context: TestContext<'_>| {
+		process_module_test(&[], &[], |test_context| {
 			let mut module = Error::new();
 			module.set_error_message(&anyhow!("Test\nError").context("With\nContext"));
 			let view_data = test_context.build_view_data(&mut module);
@@ -141,7 +141,7 @@ mod tests {
 
 	#[test]
 	fn return_state() {
-		process_module_test(&[], &[Event::from('a')], |mut test_context: TestContext<'_>| {
+		process_module_test(&[], &[Event::from('a')], |mut test_context| {
 			let mut module = Error::new();
 			test_context.activate(&mut module, State::ConfirmRebase);
 			module.set_error_message(&anyhow!("Test Error"));
@@ -155,7 +155,7 @@ mod tests {
 
 	#[test]
 	fn resize() {
-		process_module_test(&[], &[Event::Resize(100, 100)], |mut test_context: TestContext<'_>| {
+		process_module_test(&[], &[Event::Resize(100, 100)], |mut test_context| {
 			let mut module = Error::new();
 			test_context.activate(&mut module, State::ConfirmRebase);
 			module.set_error_message(&anyhow!("Test Error"));
@@ -175,7 +175,7 @@ mod tests {
 				Event::from(MetaEvent::ScrollJumpDown),
 				Event::from(MetaEvent::ScrollJumpUp),
 			],
-			|mut test_context: TestContext<'_>| {
+			|mut test_context| {
 				let mut module = Error::new();
 				test_context.activate(&mut module, State::ConfirmRebase);
 				module.set_error_message(&anyhow!("Test Error"));
diff --git a/src/process/modules.rs b/src/process/modules.rs
index e0d6085..bef5fac 100644
--- a/src/process/modules.rs
+++ b/src/process/modules.rs
@@ -91,10 +91,7 @@ mod tests {
 	use rstest::rstest;
 
 	use super::*;
-	use crate::{
-		input::Event,
-		process::testutil::{process_module_test, TestContext},
-	};
+	use crate::{input::Event, process::testutil::process_module_test};
 
 	#[rstest(
 		state,
@@ -112,7 +109,7 @@ mod tests {
 		process_module_test(
 			&["pick 18d82dcc4c36cade807d7cf79700b6bbad8080b9 comment"],
 			&[Event::Resize(100, 100)],
-			|mut test_context: TestContext<'_>| {
+			|mut test_context| {
 				test_context.set_git_directory_environment();
 				let config = test_context.config.clone();
 				let mut modules = Modules::new(&config);
@@ -131,7 +128,7 @@ mod tests {
 
 	#[test]
 	fn set_error_message() {
-		process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+		process_module_test(&["pick aaa comment"], &[], |test_context| {
 			let mut modules = Modules::new(test_context.config);
 			modules.set_error_message(&anyhow!("Test Error"));
 		});
diff --git a/src/process/tests.rs b/src/process/tests.rs
index 0a1269f..b8e5653 100644
--- a/src/process/tests.rs
+++ b/src/process/tests.rs
@@ -7,7 +7,7 @@ use crate::{
 	assert_rendered_output,
 	display::{testutil::CrossTerm, Display, Size},
 	input::InputOptions,
-	process::testutil::{process_module_test, TestContext},
+	process::testutil::process_module_test,
 	todo_file::Line,
 };
 
@@ -19,22 +19,18 @@ fn create_crossterm() -> CrossTerm {
 
 #[test]
 fn window_too_small() {
-	process_module_test(
-		&["pick aaa comment"],
-		&[Event::from(MetaEvent::Exit)],
-		|test_context: TestContext<'_>| {
-			let crossterm = create_crossterm();
-			let display = Display::new(crossterm, &test_context.config.theme);
-			let view = View::new(display, "~", "?");
-			let mut process = Process::new(
-				test_context.rebase_todo_file,
-				test_context.event_handler_context.event_handler,
-				view,
-			);
-			let modules = Modules::new(test_context.config);
-			assert_eq!(process.run(modules).unwrap(), ExitStatus::Abort);
-		},
-	);
+	process_module_test(&["pick aaa comment"], &[Event::from(MetaEvent::Exit)], |test_context| {
+		let crossterm = create_crossterm();
+		let display = Display::new(crossterm, &test_context.config.theme);
+		let view = View::new(display, "~", "?");
+		let mut process = Process::new(
+			test_context.rebase_todo_file,
+			test_context.event_handler_context.event_handler,
+			view,
+		);
+		let modules = Modules::new(test_context.config);
+		assert_eq!(process.run(modules).unwrap(), ExitStatus::Abort);
+	});
 }
 
 #[test]
@@ -42,7 +38,7 @@ fn force_abort() {
 	process_module_test(
 		&["pick aaa comment"],
 		&[Event::from(MetaEvent::ForceAbort)],
-		|test_context: TestContext<'_>| {
+		|test_context| {
 			let crossterm = create_crossterm();
 			let display = Display::new(crossterm, &test_context.config.theme);
 			let view = View::new(display, "~", "?");
@@ -65,7 +61,7 @@ fn force_rebase() {
 	process_module_test(
 		&["pick aaa comment"],
 		&[Event::from(MetaEvent::ForceRebase)],
-		|test_context: TestContext<'_>| {
+		|test_context| {
 			let crossterm = create_crossterm();
 			let display = Display::new(crossterm, &test_context.config.theme);
 			let view = View::new(display, "~", "?");
@@ -91,7 +87,7 @@ fn error_write_todo() {
 	process_module_test(
 		&["pick aaa comment"],
 		&[Event::from(MetaEvent::ForceRebase)],
-		|test_context: TestContext<'_>| {
+		|test_context| {
 			let crossterm = create_crossterm();
 			let display = Display::new(crossterm, &test_context.config.theme);
 			let view = View::new(display, "~", "?");
@@ -116,7 +112,7 @@ fn resize_window_size_okay() {
 	process_module_test(
 		&["pick aaa comment"],
 		&[Event::Resize(100, 100), Event::from(MetaEvent::Exit)],
-		|test_context: TestContext<'_>| {
+		|test_context| {
 			let crossterm = create_crossterm();
 			let display = Display::new(crossterm, &test_context.config.theme);
 			let view = View::new(display, "~", "?");
@@ -133,7 +129,7 @@ fn resize_window_size_okay() {
 
 #[test]
 fn resize_window_size_too_small() {
-	process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+	process_module_test(&["pick aaa comment"], &[], |test_context| {
 		let crossterm = create_crossterm();
 		let display = Display::new(crossterm, &test_context.config.theme);
 		let view = View::new(display, "~", "?");
@@ -151,7 +147,7 @@ fn resize_window_size_too_small() {
 
 #[test]
 fn error() {
-	process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+	process_module_test(&["pick aaa comment"], &[], |test_context| {
 		let crossterm = create_crossterm();
 		let display = Display::new(crossterm, &test_context.config.theme);
 		let view = View::new(display, "~", "?");
@@ -168,7 +164,7 @@ fn error() {
 
 #[test]
 fn handle_exit_event() {
-	process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+	process_module_test(&["pick aaa comment"], &[], |test_context| {
 		let crossterm = create_crossterm();
 		let display = Display::new(crossterm, &test_context.config.theme);
 		let view = View::new(display, "~", "?");
@@ -186,7 +182,7 @@ fn handle_exit_event() {
 
 #[test]
 fn handle_kill_event() {
-	process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+	process_module_test(&["pick aaa comment"], &[], |test_context| {
 		let crossterm = create_crossterm();
 		let display = Display::new(crossterm, &test_context.config.theme);
 		let view = View::new(display, "~", "?");
@@ -204,7 +200,7 @@ fn handle_kill_event() {
 
 #[test]
 fn other_event() {
-	process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+	process_module_test(&["pick aaa comment"], &[], |test_context| {
 		let crossterm = create_crossterm();
 		let display = Display::new(crossterm, &test_context.config.theme);
 		let view = View::new(display, "~", "?");
@@ -221,7 +217,7 @@ fn other_event() {
 
 #[test]
 fn handle_external_command_not_executable() {
-	process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+	process_module_test(&["pick aaa comment"], &[], |test_context| {
 		let crossterm = create_crossterm();
 		let display = Display::new(crossterm, &test_context.config.theme);
 		let view = View::new(display, "~", "?");
@@ -261,7 +257,7 @@ fn handle_external_command_not_executable() {
 
 #[test]
 fn handle_external_command_executable_not_found() {
-	process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+	process_module_test(&["pick aaa comment"], &[], |test_context| {
 		let crossterm = create_crossterm();
 		let display = Display::new(crossterm, &test_context.config.theme);
 		let view = View::new(display, "~", "?");
@@ -301,7 +297,7 @@ fn handle_external_command_executable_not_found() {
 
 #[test]
 fn handle_external_command_status_success() {
-	process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+	process_module_test(&["pick aaa comment"], &[], |test_context| {
 		let crossterm = create_crossterm();
 		let display = Display::new(crossterm, &test_context.config.theme);
 		let view = View::new(display, "~", "?");
@@ -323,7 +319,7 @@ fn handle_external_command_status_success() {
 
 #[test]
 fn handle_external_command_status_error() {
-	process_module_test(&["pick aaa comment"], &[], |test_context: TestContext<'_>| {
+	process_module_test(&["pick aaa comment"], &[], |test_context| {
 		let crossterm = create_crossterm();
 		let display = Display::new(crossterm, &test_context.config.theme);
 		let view = View::new(display, "~", "?");
diff --git a/src/process/window_size_error.rs b/src/process/window_size_error.rs
index 8d9db11..adba25d 100644
--- a/src/process/window_size_error.rs
+++ b/src/process/window_size_error.rs
@@ -81,11 +81,7 @@ mod tests {
 	use rstest::rstest;
 
 	use super::*;
-	use crate::{
-		assert_process_result,
-		assert_rendered_output,
-		process::testutil::{process_module_test, TestContext},
-	};
+	use crate::{assert_process_result, assert_rendered_output, process::testutil::process_module_test};
 
 	const MINIMUM_WINDOW_HEIGHT: usize = 5;
 	const MINIMUM_WINDOW_HEIGHT_ERROR_WIDTH: usize = 45;
@@ -103,7 +99,7 @@ mod tests {
 	)]
 	#[allow(clippy::cast_possible_wrap)]
 	fn build_view_data(width: usize, height: usize, expected: &str) {
-		process_module_test(&[], &[], |mut test_context: TestContext<'_>| {
+		process_module_test(&[], &[], |mut test_context| {
 			test_context.render_context.update(width as u16, height as u16);
 			let mut module = WindowSizeError::new();
 			let view_data = test_context.build_view_data(&mut module);
@@ -113,7 +109,7 @@ mod tests {
 
 	#[test]
 	fn event_resize_window_still_small() {
-		process_module_test(&[], &[Event::Resize(1, 1)], |mut test_context: TestContext<'_>| {
+		process_module_test(&[], &[Event::Resize(1, 1)], |mut test_context| {
 			let mut module = WindowSizeError::new();
 			test_context.activate(&mut module, State::ConfirmRebase);
 			assert_process_result!(test_context.handle_event(&mut module), event = Event::Resize(1, 1));
@@ -122,7 +118,7 @@ mod tests {
 
 	#[test]
 	fn event_resize_window_no_longer_too_small() {
-		process_module_test(&[], &[Event::Resize(100, 100)], |mut test_context: TestContext<'_>| {
+		process_module_test(&[], &[Event::Resize(100, 100)], |mut test_context| {
 			let mut module = WindowSizeError::new();
 			test_context.activate(&mut module, State::ConfirmRebase);
 			assert_process_result!(
@@ -135,7 +131,7 @@ mod tests {
 
 	#[test]
 	fn event_other_character() {
-		process_module_test(&[], &[Event::from('a')], |mut test_context: TestContext<'_>| {
+		process_module_test(&[], &[Event::from('a')], |mut test_context| {
 			let mut module = WindowSizeError::new();
 			test_context.activate(&mut module, State::ConfirmRebase);
 			assert_process_result!(test_context.handle_event(&mut module), event = Event::from('a'));