Fix ref_option lint issues

MitMaro · MitMaro · commit fe8ae823c635 · 2025-03-11T18:39:24.000-02:30
diff --git a/src/application.rs b/src/application.rs
@@ -128,7 +128,7 @@ where ModuleProvider: module::ModuleProvider + Send + 'static
 	}
 
 	fn filepath_from_args(args: &Args) -> Result<String, Exit> {
-		args.todo_file_path().as_ref().map(String::from).ok_or_else(|| {
+		args.todo_file_path().map(String::from).ok_or_else(|| {
 			Exit::new(
 				ExitStatus::StateError,
 				build_help(Some(String::from("A todo file path must be provided."))).as_str(),
@@ -238,7 +238,6 @@ mod tests {
 		assert_eq!(exit.get_status(), &ExitStatus::StateError);
 		assert!(
 			exit.get_message()
-				.as_ref()
 				.unwrap()
 				.contains("A todo file path must be provided")
 		);
@@ -252,12 +251,7 @@ mod tests {
 				Application::new(&args(&["todofile"]), event_provider, create_mocked_crossterm());
 			let exit = application_error!(application);
 			assert_eq!(exit.get_status(), &ExitStatus::StateError);
-			assert!(
-				exit.get_message()
-					.as_ref()
-					.unwrap()
-					.contains("Unable to load Git repository: ")
-			);
+			assert!(exit.get_message().unwrap().contains("Unable to load Git repository: "));
 		});
 	}
 
@@ -342,7 +336,6 @@ mod tests {
 			assert_eq!(exit.get_status(), &ExitStatus::Good);
 			assert!(
 				exit.get_message()
-					.as_ref()
 					.unwrap()
 					.contains("An empty rebase was provided, nothing to edit")
 			);
@@ -404,12 +397,7 @@ mod tests {
 
 			let exit = application.run_until_finished().unwrap_err();
 			assert_eq!(exit.get_status(), &ExitStatus::StateError);
-			assert!(
-				exit.get_message()
-					.as_ref()
-					.unwrap()
-					.starts_with("Failed to join runtime:")
-			);
+			assert!(exit.get_message().unwrap().starts_with("Failed to join runtime:"));
 		});
 	}
 
@@ -449,7 +437,7 @@ mod tests {
 			let exit = application.run_until_finished().unwrap_err();
 			assert_eq!(exit.get_status(), &ExitStatus::StateError);
 			assert_eq!(
-				exit.get_message().as_ref().unwrap(),
+				exit.get_message().unwrap(),
 				"Attempt made to run application a second time"
 			);
 		});
diff --git a/src/arguments.rs b/src/arguments.rs
@@ -23,8 +23,8 @@ impl Args {
 		&self.mode
 	}
 
-	pub(crate) const fn todo_file_path(&self) -> &Option<String> {
-		&self.todo_file_path
+	pub(crate) fn todo_file_path(&self) -> Option<&str> {
+		self.todo_file_path.as_deref()
 	}
 }
 
@@ -90,7 +90,7 @@ mod tests {
 	fn todo_file_ok() {
 		let args = Args::try_from(create_args(&["todofile"])).unwrap();
 		assert_eq!(args.mode(), &Mode::Editor);
-		assert_eq!(args.todo_file_path(), &Some(String::from("todofile")));
+		assert_eq!(args.todo_file_path(), Some("todofile"));
 	}
 
 	#[test]
diff --git a/src/exit.rs b/src/exit.rs
@@ -14,8 +14,8 @@ impl Exit {
 		}
 	}
 
-	pub(crate) const fn get_message(&self) -> &Option<String> {
-		&self.message
+	pub(crate) fn get_message(&self) -> Option<&str> {
+		self.message.as_deref()
 	}
 
 	pub(crate) const fn get_status(&self) -> &ExitStatus {
@@ -51,14 +51,14 @@ mod tests {
 	#[test]
 	fn exit_new() {
 		let exit = Exit::new(ExitStatus::StateError, "This is an error");
-		assert_eq!(exit.get_message(), &Some(String::from("This is an error")));
+		assert_eq!(exit.get_message(), Some("This is an error"));
 		assert_eq!(exit.get_status(), &ExitStatus::StateError);
 	}
 
 	#[test]
 	fn exit_from_exit_status() {
 		let exit = Exit::from(ExitStatus::Kill);
-		assert_eq!(exit.get_message(), &None);
+		assert_eq!(exit.get_message(), None);
 		assert_eq!(exit.get_status(), &ExitStatus::Kill);
 	}
 }
diff --git a/src/git/commit.rs b/src/git/commit.rs
@@ -25,8 +25,8 @@ impl Commit {
 	/// Get the reference to the commit
 	#[must_use]
 	#[allow(dead_code)]
-	pub(crate) const fn reference(&self) -> &Option<Reference> {
-		&self.reference
+	pub(crate) const fn reference(&self) -> Option<&Reference> {
+		self.reference.as_ref()
 	}
 
 	/// Get the author of the commit.
@@ -38,14 +38,14 @@ impl Commit {
 	/// Get the author of the commit.
 	#[must_use]
 	#[allow(dead_code)]
-	pub(crate) const fn authored_date(&self) -> &Option<DateTime<Local>> {
-		&self.authored_date
+	pub(crate) const fn authored_date(&self) -> Option<&DateTime<Local>> {
+		self.authored_date.as_ref()
 	}
 
 	/// Get the committer of the commit.
 	#[must_use]
-	pub(crate) const fn committer(&self) -> &Option<User> {
-		&self.committer
+	pub(crate) const fn committer(&self) -> Option<&User> {
+		self.committer.as_ref()
 	}
 
 	/// Get the committed date of the commit.
diff --git a/src/git/commit_diff.rs b/src/git/commit_diff.rs
@@ -39,8 +39,8 @@ impl CommitDiff {
 	/// The parent commit for the diff
 	#[must_use]
 	#[allow(dead_code)]
-	pub(crate) const fn parent(&self) -> &Option<Commit> {
-		&self.parent
+	pub(crate) const fn parent(&self) -> Option<&Commit> {
+		self.parent.as_ref()
 	}
 
 	/// The file statuses
diff --git a/src/help.rs b/src/help.rs
@@ -39,7 +39,6 @@ mod tests {
 		assert!(
 			run()
 				.get_message()
-				.as_ref()
 				.unwrap()
 				.contains("Full feature terminal based sequence editor for git interactive rebase.")
 		);
diff --git a/src/license.rs b/src/license.rs
@@ -35,7 +35,6 @@ mod tests {
 		assert!(
 			run()
 				.get_message()
-				.as_ref()
 				.unwrap()
 				.contains("Sequence Editor for Git Interactive Rebase")
 		);
diff --git a/src/main.rs b/src/main.rs
@@ -79,7 +79,7 @@ fn run(os_args: Vec<OsString>) -> Exit {
 #[cfg(not(tarpaulin_include))]
 fn main() {
 	let exit = run(env::args_os().skip(1).collect());
-	if let Some(message) = exit.get_message().as_ref() {
+	if let Some(message) = exit.get_message() {
 		eprintln!("{message}");
 	}
 	std::process::exit(exit.get_status().to_code());
diff --git a/src/modules/show_commit/view_builder.rs b/src/modules/show_commit/view_builder.rs
@@ -117,7 +117,7 @@ impl ViewBuilder {
 			]));
 		}
 
-		if let Some(committer) = commit.committer().as_ref() {
+		if let Some(committer) = commit.committer() {
 			updater.push_line(ViewLine::from(vec![
 				LineSegment::new_with_color(
 					if is_full_width { "Committer: " } else { "C: " },
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
@@ -32,7 +32,7 @@ pub(crate) fn render_view_line(view_line: &ViewLine, options: Option<AssertRende
 		}
 		line.push_str(segment.get_content());
 	}
-	if let Some(padding) = view_line.get_padding().as_ref() {
+	if let Some(padding) = view_line.get_padding() {
 		if opts.contains(AssertRenderOptions::INCLUDE_STYLE) {
 			let style = render_style(padding);
 			if style != last_style {
diff --git a/src/tests.rs b/src/tests.rs
@@ -11,20 +11,15 @@ fn args(args: &[&str]) -> Vec<OsString> {
 #[serial_test::serial]
 fn successful_run_help() {
 	let exit = run(args(&["--help"]));
-	assert!(exit.get_message().as_ref().unwrap().contains("USAGE:"));
+	assert!(exit.get_message().unwrap().contains("USAGE:"));
 	assert_eq!(exit.get_status(), &ExitStatus::Good);
 }
 
 #[test]
 #[serial_test::serial]
 fn successful_run_version() {
 	let exit = run(args(&["--version"]));
-	assert!(
-		exit.get_message()
-			.as_ref()
-			.unwrap()
-			.starts_with("interactive-rebase-tool")
-	);
+	assert!(exit.get_message().unwrap().starts_with("interactive-rebase-tool"));
 	assert_eq!(exit.get_status(), &ExitStatus::Good);
 }
 
@@ -34,7 +29,6 @@ fn successful_run_license() {
 	let exit = run(args(&["--license"]));
 	assert!(
 		exit.get_message()
-			.as_ref()
 			.unwrap()
 			.contains("Sequence Editor for Git Interactive Rebase")
 	);
diff --git a/src/version.rs b/src/version.rs
@@ -28,13 +28,7 @@ mod tests {
 	#[test]
 	#[serial_test::serial]
 	fn test_run() {
-		assert!(
-			run()
-				.get_message()
-				.as_ref()
-				.unwrap()
-				.starts_with("interactive-rebase-tool")
-		);
+		assert!(run().get_message().unwrap().starts_with("interactive-rebase-tool"));
 	}
 
 	#[test]
diff --git a/src/view/render_slice.rs b/src/view/render_slice.rs
@@ -367,8 +367,8 @@ impl RenderSlice {
 				.max(max_leading_line_length)
 				.max(max_trailing_line_length),
 		);
-		if let Some(column) = view_data.get_visible_column().as_ref() {
-			self.scroll_position.ensure_column_visible(*column);
+		if let Some(column) = view_data.get_visible_column() {
+			self.scroll_position.ensure_column_visible(column);
 		}
 
 		self.lines.clear();
@@ -437,7 +437,7 @@ impl RenderSlice {
 				}
 
 				if cursor < window_width {
-					if let Some(padding) = line.get_padding().as_ref() {
+					if let Some(padding) = line.get_padding() {
 						segments.push(LineSegment::new_copy_style(
 							padding.get_content().repeat(window_width - cursor).as_str(),
 							padding,
diff --git a/src/view/view_data.rs b/src/view/view_data.rs
@@ -129,8 +129,8 @@ impl ViewData {
 		&self.lines_trailing
 	}
 
-	pub(crate) const fn get_visible_column(&self) -> &Option<usize> {
-		&self.visible_column
+	pub(crate) const fn get_visible_column(&self) -> Option<usize> {
+		self.visible_column
 	}
 
 	pub(crate) const fn visible_rows(&self) -> &Vec<usize> {
diff --git a/src/view/view_line.rs b/src/view/view_line.rs
@@ -85,8 +85,8 @@ impl ViewLine {
 		self.selected
 	}
 
-	pub(crate) const fn get_padding(&self) -> &Option<LineSegment> {
-		&self.padding
+	pub(crate) const fn get_padding(&self) -> Option<&LineSegment> {
+		self.padding.as_ref()
 	}
 }
 
@@ -207,7 +207,7 @@ mod tests {
 			LineSegmentOptions::all(),
 		);
 
-		let padding = view_line.get_padding().as_ref().unwrap();
+		let padding = view_line.get_padding().unwrap();
 		assert_eq!(padding.get_content(), " ");
 		assert_eq!(padding.get_color(), DisplayColor::IndicatorColor);
 		assert!(padding.is_dimmed());
@@ -219,6 +219,6 @@ mod tests {
 	fn set_padding() {
 		let view_line = ViewLine::from("foo").set_padding('@');
 
-		assert_eq!(view_line.get_padding().as_ref().unwrap().get_content(), "@");
+		assert_eq!(view_line.get_padding().unwrap().get_content(), "@");
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ impl Args {`
`23`	`23`	`&self.mode`
`24`	`24`	`}`
`25`	`25`
`26`		`- pub(crate) const fn todo_file_path(&self) -> &Option<String> {`
`27`		`- &self.todo_file_path`
	`26`	`+ pub(crate) fn todo_file_path(&self) -> Option<&str> {`
	`27`	`+ self.todo_file_path.as_deref()`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`@@ -90,7 +90,7 @@ mod tests {`
`90`	`90`	`fn todo_file_ok() {`
`91`	`91`	`let args = Args::try_from(create_args(&["todofile"])).unwrap();`
`92`	`92`	`assert_eq!(args.mode(), &Mode::Editor);`
`93`		`- assert_eq!(args.todo_file_path(), &Some(String::from("todofile")));`
	`93`	`+ assert_eq!(args.todo_file_path(), Some("todofile"));`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`#[test]`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ impl Exit {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`- pub(crate) const fn get_message(&self) -> &Option<String> {`
`18`		`- &self.message`
	`17`	`+ pub(crate) fn get_message(&self) -> Option<&str> {`
	`18`	`+ self.message.as_deref()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`pub(crate) const fn get_status(&self) -> &ExitStatus {`
`@@ -51,14 +51,14 @@ mod tests {`
`51`	`51`	`#[test]`
`52`	`52`	`fn exit_new() {`
`53`	`53`	`let exit = Exit::new(ExitStatus::StateError, "This is an error");`
`54`		`- assert_eq!(exit.get_message(), &Some(String::from("This is an error")));`
	`54`	`+ assert_eq!(exit.get_message(), Some("This is an error"));`
`55`	`55`	`assert_eq!(exit.get_status(), &ExitStatus::StateError);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`#[test]`
`59`	`59`	`fn exit_from_exit_status() {`
`60`	`60`	`let exit = Exit::from(ExitStatus::Kill);`
`61`		`- assert_eq!(exit.get_message(), &None);`
	`61`	`+ assert_eq!(exit.get_message(), None);`
`62`	`62`	`assert_eq!(exit.get_status(), &ExitStatus::Kill);`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ fn run(os_args: Vec<OsString>) -> Exit {`
`79`	`79`	`#[cfg(not(tarpaulin_include))]`
`80`	`80`	`fn main() {`
`81`	`81`	`let exit = run(env::args_os().skip(1).collect());`
`82`		`- if let Some(message) = exit.get_message().as_ref() {`
	`82`	`+ if let Some(message) = exit.get_message() {`
`83`	`83`	`eprintln!("{message}");`
`84`	`84`	`}`
`85`	`85`	`std::process::exit(exit.get_status().to_code());`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ impl ViewBuilder {`
`117`	`117`	`]));`
`118`	`118`	`}`
`119`	`119`
`120`		`- if let Some(committer) = commit.committer().as_ref() {`
	`120`	`+ if let Some(committer) = commit.committer() {`
`121`	`121`	`updater.push_line(ViewLine::from(vec![`
`122`	`122`	`LineSegment::new_with_color(`
`123`	`123`	`if is_full_width { "Committer: " } else { "C: " },`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ pub(crate) fn render_view_line(view_line: &ViewLine, options: Option<AssertRende`
`32`	`32`	`}`
`33`	`33`	`line.push_str(segment.get_content());`
`34`	`34`	`}`
`35`		`- if let Some(padding) = view_line.get_padding().as_ref() {`
	`35`	`+ if let Some(padding) = view_line.get_padding() {`
`36`	`36`	`if opts.contains(AssertRenderOptions::INCLUDE_STYLE) {`
`37`	`37`	`let style = render_style(padding);`
`38`	`38`	`if style != last_style {`