Fix latest linting issues

This mostly addresses single letter lifetimes, but also a few panics
that were not properly detected previously.

4 files changed, 17 insertions, 16 deletions

diff --git a/src/core/src/module/modules.rs b/src/core/src/module/modules.rs
index fecff27..1dfe795 100644
--- a/src/core/src/module/modules.rs
+++ b/src/core/src/module/modules.rs
@@ -6,12 +6,12 @@ use view::{RenderContext, ViewData, ViewSender};
 
 use super::{Module, ProcessResult, State};
 
-pub(crate) struct Modules<'m> {
+pub(crate) struct Modules<'modules> {
 	event_handler: EventHandler,
-	modules: HashMap<State, Box<dyn Module + 'm>>,
+	modules: HashMap<State, Box<dyn Module + 'modules>>,
 }
 
-impl<'m> Modules<'m> {
+impl<'modules> Modules<'modules> {
 	pub(crate) fn new(event_handler: EventHandler) -> Self {
 		Self {
 			event_handler,
@@ -19,19 +19,19 @@ impl<'m> Modules<'m> {
 		}
 	}
 
-	pub(crate) fn register_module<T: Module + 'm>(&mut self, state: State, module: T) {
+	pub(crate) fn register_module<T: Module + 'modules>(&mut self, state: State, module: T) {
 		let _previous = self.modules.insert(state, Box::new(module));
 	}
 
 	#[allow(clippy::panic)]
-	fn get_mut_module(&mut self, state: State) -> &mut Box<dyn Module + 'm> {
+	fn get_mut_module(&mut self, state: State) -> &mut Box<dyn Module + 'modules> {
 		self.modules
 			.get_mut(&state)
 			.unwrap_or_else(|| panic!("Invalid module for provided state: {:?}. Please report.", state))
 	}
 
 	#[allow(clippy::borrowed_box, clippy::panic)]
-	fn get_module(&self, state: State) -> &Box<dyn Module + 'm> {
+	fn get_module(&self, state: State) -> &Box<dyn Module + 'modules> {
 		self.modules
 			.get(&state)
 			.unwrap_or_else(|| panic!("Invalid module for provided state: {:?}", state))
diff --git a/src/git/src/commit_diff_loader.rs b/src/git/src/commit_diff_loader.rs
index d664fc5..135151e 100644
--- a/src/git/src/commit_diff_loader.rs
+++ b/src/git/src/commit_diff_loader.rs
@@ -21,13 +21,13 @@ lazy_static! {
 	static ref UNKNOWN_PATH: PathBuf = PathBuf::from("unknown");
 }
 
-pub(crate) struct CommitDiffLoader<'d> {
-	config: &'d CommitDiffLoaderOptions,
+pub(crate) struct CommitDiffLoader<'options> {
+	config: &'options CommitDiffLoaderOptions,
 	repo: Arc<Mutex<Repository>>,
 }
 
-impl<'d> CommitDiffLoader<'d> {
-	pub(crate) const fn new(repo: Arc<Mutex<Repository>>, config: &'d CommitDiffLoaderOptions) -> Self {
+impl<'options> CommitDiffLoader<'options> {
+	pub(crate) const fn new(repo: Arc<Mutex<Repository>>, config: &'options CommitDiffLoaderOptions) -> Self {
 		Self { config, repo }
 	}
 
diff --git a/src/view/src/testutil.rs b/src/view/src/testutil.rs
index 4c50878..06158f6 100644
--- a/src/view/src/testutil.rs
+++ b/src/view/src/testutil.rs
@@ -185,7 +185,7 @@ fn expand_expected(expected: &[String]) -> Vec<String> {
 		.collect::<Vec<String>>()
 }
 
-#[allow(clippy::indexing_slicing, clippy::string_slice)]
+#[allow(clippy::indexing_slicing, clippy::string_slice, clippy::panic)]
 pub(crate) fn _assert_rendered_output(options: AssertRenderOptions, actual: &[String], expected: &[String]) {
 	let mut mismatch = false;
 	let mut error_output = vec![
@@ -298,6 +298,7 @@ macro_rules! assert_rendered_output {
 	};
 }
 
+#[allow(clippy::panic)]
 fn assert_view_sender_actions(view_sender: &ViewSender, expected_actions: &[String]) {
 	let actions = view_sender
 		.clone_render_slice()
@@ -401,7 +402,7 @@ impl TestContext {
 
 	/// Assert that certain messages were sent by the `ViewSender`.
 	#[inline]
-	#[allow(clippy::missing_panics_doc)]
+	#[allow(clippy::missing_panics_doc, clippy::panic)]
 	pub fn assert_sent_messages(&self, messages: Vec<&str>) {
 		let mut mismatch = false;
 		let mut error_output = vec![
diff --git a/src/view/src/view_data_updater.rs b/src/view/src/view_data_updater.rs
index 9d1c516..f7f6f1f 100644
--- a/src/view/src/view_data_updater.rs
+++ b/src/view/src/view_data_updater.rs
@@ -2,13 +2,13 @@ use super::{ViewData, ViewLine};
 
 /// An updater utility for a `ViewData`.
 #[derive(Debug)]
-pub struct ViewDataUpdater<'v> {
+pub struct ViewDataUpdater<'view_data> {
 	modified: bool,
-	view_data: &'v mut ViewData,
+	view_data: &'view_data mut ViewData,
 }
 
-impl<'v> ViewDataUpdater<'v> {
-	pub(crate) fn new(view_data: &'v mut ViewData) -> Self {
+impl<'view_data> ViewDataUpdater<'view_data> {
+	pub(crate) fn new(view_data: &'view_data mut ViewData) -> Self {
 		Self {
 			view_data,
 			modified: false,