Replace lazy_static with LazyLock

MitMaro · MitMaro · commit 651a44e5be74 · 2025-03-11T18:39:24.000-02:30
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,6 @@ crossbeam-channel = "0.5.13"
 crossterm = "0.27.0"
 git2 = { version = "0.18.3", default-features = false, features = [] }
 if_chain = "1.0.2"
-lazy_static = "1.4.0"
 num-format = "0.4.4"
 parking_lot = "0.12.3"
 pico-args = "0.5.0"
diff --git a/src/components/choice.rs b/src/components/choice.rs
@@ -1,9 +1,7 @@
 #[cfg(test)]
 mod tests;
 
-use std::collections::HashMap;
-
-use lazy_static::lazy_static;
+use std::{collections::HashMap, sync::LazyLock};
 
 use crate::{
 	display::DisplayColor,
@@ -12,9 +10,8 @@ use crate::{
 	view::{LineSegment, ViewData, ViewLine},
 };
 
-lazy_static! {
-	pub(crate) static ref INPUT_OPTIONS: InputOptions = InputOptions::RESIZE | InputOptions::MOVEMENT;
-}
+pub(crate) static INPUT_OPTIONS: LazyLock<InputOptions> =
+	LazyLock::new(|| InputOptions::RESIZE | InputOptions::MOVEMENT);
 
 pub(crate) struct Choice<T> {
 	map: HashMap<char, T>,
diff --git a/src/components/confirm.rs b/src/components/confirm.rs
@@ -2,18 +2,18 @@ mod confirmed;
 #[cfg(test)]
 mod tests;
 
+use std::sync::LazyLock;
+
 use captur::capture;
-use lazy_static::lazy_static;
 
 pub(crate) use self::confirmed::Confirmed;
 use crate::{
 	input::{Event, InputOptions, KeyBindings, KeyCode, KeyEvent, StandardEvent},
 	view::{ViewData, ViewLine},
 };
 
-lazy_static! {
-	pub(crate) static ref INPUT_OPTIONS: InputOptions = InputOptions::RESIZE | InputOptions::MOVEMENT;
-}
+pub(crate) static INPUT_OPTIONS: LazyLock<InputOptions> =
+	LazyLock::new(|| InputOptions::RESIZE | InputOptions::MOVEMENT);
 
 pub(crate) struct Confirm {
 	view_data: ViewData,
diff --git a/src/components/edit.rs b/src/components/edit.rs
@@ -1,7 +1,7 @@
 #[cfg(test)]
 mod tests;
 
-use lazy_static::lazy_static;
+use std::sync::LazyLock;
 
 use crate::{
 	components::shared::EditableLine,
@@ -10,9 +10,7 @@ use crate::{
 	view::{LineSegment, LineSegmentOptions, ViewData, ViewDataUpdater, ViewLine},
 };
 
-lazy_static! {
-	pub(crate) static ref INPUT_OPTIONS: InputOptions = InputOptions::RESIZE;
-}
+pub(crate) static INPUT_OPTIONS: LazyLock<InputOptions> = LazyLock::new(|| InputOptions::RESIZE);
 
 const FINISH_EVENT: Event = Event::Key(KeyEvent {
 	code: KeyCode::Enter,
diff --git a/src/git/commit_diff_loader.rs b/src/git/commit_diff_loader.rs
@@ -1,7 +1,9 @@
-use std::{path::PathBuf, sync::Arc};
+use std::{
+	path::PathBuf,
+	sync::{Arc, LazyLock},
+};
 
 use git2::{DiffFindOptions, DiffOptions, Oid, Repository};
-use lazy_static::lazy_static;
 use parking_lot::{Mutex, MutexGuard};
 
 use crate::git::{
@@ -16,9 +18,7 @@ use crate::git::{
 	Status,
 };
 
-lazy_static! {
-	static ref UNKNOWN_PATH: PathBuf = PathBuf::from("unknown");
-}
+static UNKNOWN_PATH: LazyLock<PathBuf> = LazyLock::new(|| PathBuf::from("unknown"));
 
 pub(crate) struct CommitDiffLoader<'options> {
 	config: &'options CommitDiffLoaderOptions,
diff --git a/src/input/event_provider.rs b/src/input/event_provider.rs
@@ -47,17 +47,14 @@ pub(crate) fn read_event() -> Result<Option<Event>> {
 
 #[cfg(test)]
 mod read_event_mocks {
-	use std::{io::Result, mem, time::Duration};
+	use std::{io::Result, mem, sync::LazyLock, time::Duration};
 
 	use crossterm::event::{Event, KeyCode, KeyEvent};
-	use lazy_static::lazy_static;
 	use parking_lot::Mutex;
 
-	lazy_static! {
-		pub(crate) static ref HAS_POLLED_EVENT: Mutex<Result<bool>> = Mutex::new(Ok(true));
-		pub(crate) static ref NEXT_EVENT: Mutex<Result<Event>> =
-			Mutex::new(Ok(Event::Key(KeyEvent::from(KeyCode::Null))));
-	}
+	pub(crate) static HAS_POLLED_EVENT: LazyLock<Mutex<Result<bool>>> = LazyLock::new(|| Mutex::new(Ok(true)));
+	pub(crate) static NEXT_EVENT: LazyLock<Mutex<Result<Event>>> =
+		LazyLock::new(|| Mutex::new(Ok(Event::Key(KeyEvent::from(KeyCode::Null)))));
 
 	pub(crate) fn poll(_: Duration) -> Result<bool> {
 		let mut lock = HAS_POLLED_EVENT.lock();
diff --git a/src/module.rs b/src/module.rs
@@ -6,8 +6,9 @@ mod state;
 #[cfg(test)]
 mod tests;
 
+use std::sync::LazyLock;
+
 use anyhow::Error;
-use lazy_static::lazy_static;
 
 pub(crate) use self::{
 	exit_status::ExitStatus,
@@ -22,10 +23,8 @@ use crate::{
 	view::{RenderContext, ViewData},
 };
 
-lazy_static! {
-	pub(crate) static ref DEFAULT_INPUT_OPTIONS: InputOptions = InputOptions::RESIZE;
-	pub(crate) static ref DEFAULT_VIEW_DATA: ViewData = ViewData::new(|_| {});
-}
+pub(crate) static DEFAULT_INPUT_OPTIONS: LazyLock<InputOptions> = LazyLock::new(|| InputOptions::RESIZE);
+pub(crate) static DEFAULT_VIEW_DATA: LazyLock<ViewData> = LazyLock::new(|| ViewData::new(|_| {}));
 
 pub(crate) trait Module: Send {
 	fn activate(&mut self, _previous_state: State) -> Results {
diff --git a/src/modules/error.rs b/src/modules/error.rs
@@ -1,5 +1,6 @@
+use std::sync::LazyLock;
+
 use captur::capture;
-use lazy_static::lazy_static;
 
 use crate::{
 	display::DisplayColor,
@@ -11,9 +12,8 @@ use crate::{
 	view::{LineSegment, RenderContext, ViewData, ViewLine},
 };
 
-lazy_static! {
-	pub(crate) static ref INPUT_OPTIONS: InputOptions = InputOptions::RESIZE | InputOptions::MOVEMENT;
-}
+pub(crate) static INPUT_OPTIONS: LazyLock<InputOptions> =
+	LazyLock::new(|| InputOptions::RESIZE | InputOptions::MOVEMENT);
 
 pub(crate) struct Error {
 	return_state: State,
diff --git a/src/modules/external_editor.rs b/src/modules/external_editor.rs
@@ -5,10 +5,9 @@ mod external_editor_state;
 #[cfg(all(unix, test))]
 mod tests;
 
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
 
 use anyhow::{anyhow, Result};
-use lazy_static::lazy_static;
 use parking_lot::Mutex;
 
 use self::{action::Action, argument_tokenizer::tokenize, external_editor_state::ExternalEditorState};
@@ -21,9 +20,7 @@ use crate::{
 	view::{RenderContext, ViewData, ViewLine},
 };
 
-lazy_static! {
-	static ref INPUT_OPTIONS: InputOptions = InputOptions::RESIZE;
-}
+static INPUT_OPTIONS: LazyLock<InputOptions> = LazyLock::new(|| InputOptions::RESIZE);
 
 pub(crate) struct ExternalEditor {
 	editor: String,
diff --git a/src/modules/window_size_error.rs b/src/modules/window_size_error.rs
@@ -1,4 +1,4 @@
-use lazy_static::lazy_static;
+use std::sync::LazyLock;
 
 use crate::{
 	input::{Event, InputOptions},
@@ -11,9 +11,7 @@ const HEIGHT_ERROR_MESSAGE: &str = "Window too small, increase height to continu
 const SHORT_ERROR_MESSAGE: &str = "Window too small";
 const SIZE_ERROR_MESSAGE: &str = "Size!";
 
-lazy_static! {
-	static ref INPUT_OPTIONS: InputOptions = InputOptions::MOVEMENT;
-}
+static INPUT_OPTIONS: LazyLock<InputOptions> = LazyLock::new(|| InputOptions::MOVEMENT);
 
 pub(crate) struct WindowSizeError {
 	return_state: State,
diff --git a/src/test_helpers/assertions/assert_rendered_output/patterns.rs b/src/test_helpers/assertions/assert_rendered_output/patterns.rs
@@ -1,7 +1,9 @@
-use std::fmt::{Debug, Formatter};
+use std::{
+	fmt::{Debug, Formatter},
+	sync::LazyLock,
+};
 
 use itertools::Itertools;
-use lazy_static::lazy_static;
 use regex::Regex;
 
 use crate::{
@@ -271,9 +273,7 @@ impl Debug for AnyPattern {
 	}
 }
 
-lazy_static! {
-	pub(crate) static ref FORMAT_REGEX: Regex = Regex::new(r"\{.*?}").unwrap();
-}
+pub(crate) static FORMAT_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\{.*?}").unwrap());
 
 fn parse_rendered_action_line(rendered: &str) -> Result<Line, ParseError> {
 	let cleaned_line = FORMAT_REGEX.replace_all(rendered, "").replace(" > ", "");
diff --git a/src/test_helpers/create_commit.rs b/src/test_helpers/create_commit.rs
@@ -1,10 +1,8 @@
-use lazy_static::lazy_static;
+use std::sync::LazyLock;
 
 use crate::{git::Repository, test_helpers::JAN_2021_EPOCH};
 
-lazy_static! {
-	static ref DEFAULT_COMMIT_OPTIONS: CreateCommitOptions = CreateCommitOptions::new();
-}
+static DEFAULT_COMMIT_OPTIONS: LazyLock<CreateCommitOptions> = LazyLock::new(CreateCommitOptions::new);
 
 /// Options for creating a new commit.
 #[derive(Debug)]
diff --git a/src/test_helpers/create_invalid_utf.rs b/src/test_helpers/create_invalid_utf.rs
@@ -1,8 +1,6 @@
-use lazy_static::lazy_static;
+use std::sync::LazyLock;
 
-lazy_static! {
-	static ref INVALID_UTF_STRING: String = create_invalid_utf();
-}
+static INVALID_UTF_STRING: LazyLock<String> = LazyLock::new(create_invalid_utf);
 
 #[allow(unsafe_code)]
 fn create_invalid_utf() -> String {
diff --git a/src/test_helpers/with_env_var.rs b/src/test_helpers/with_env_var.rs
@@ -1,11 +1,11 @@
-use std::env::{remove_var, set_var, var};
+use std::{
+	env::{remove_var, set_var, var},
+	sync::LazyLock,
+};
 
-use lazy_static::lazy_static;
 use parking_lot::Mutex;
 
-lazy_static! {
-	static ref ENV_CHANGE_LOCK: Mutex<()> = Mutex::new(());
-}
+static ENV_CHANGE_LOCK: LazyLock<Mutex<()>> = LazyLock::new(|| Mutex::new(()));
 
 #[derive(Debug, Clone)]
 pub(crate) enum EnvVarAction<'var> {
