MSRV = 1.77.0

fox0 · fox0 · commit 1faed3d083e2 · 2024-10-13T10:55:36.000+07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,6 +31,7 @@ members = [
 repository = "https://github.com/rustcoreutils/posixutils-rs"
 license = "MIT"
 edition = "2021"
+rust-version = "1.77.0"
 
 [workspace.dependencies]
 clap = { version = "4", default-features = false, features = ["std", "derive", "help", "usage", "error-context", "cargo"] }
diff --git a/awk/Cargo.toml b/awk/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.2.1"
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/calc/Cargo.toml b/calc/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.2.1"
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/datetime/Cargo.toml b/datetime/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/dev/Cargo.toml b/dev/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/display/Cargo.toml b/display/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/file/Cargo.toml b/file/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/fs/Cargo.toml b/fs/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/ftw/Cargo.toml b/ftw/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 libc.workspace = true
diff --git a/gettext-rs/Cargo.toml b/gettext-rs/Cargo.toml
@@ -2,6 +2,7 @@
 name = "gettext-rs"
 version = "0.2.1"
 edition.workspace = true
+rust-version.workspace = true
 
 [lints]
 workspace = true
diff --git a/i18n/Cargo.toml b/i18n/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/m4/Cargo.toml b/m4/Cargo.toml
@@ -6,6 +6,7 @@ authors = ["Luke Frisken"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 clap.workspace = true
diff --git a/m4/test-manager/Cargo.toml b/m4/test-manager/Cargo.toml
@@ -2,6 +2,7 @@
 name = "m4-test-manager"
 version = "0.1.0"
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 clap.workspace = true
diff --git a/misc/Cargo.toml b/misc/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/pathnames/Cargo.toml b/pathnames/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/plib/Cargo.toml b/plib/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 cfg-if = "1.0"
diff --git a/process/Cargo.toml b/process/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/sccs/Cargo.toml b/sccs/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/screen/Cargo.toml b/screen/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/sys/Cargo.toml b/sys/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/text/Cargo.toml b/text/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/text/tr.rs b/text/tr.rs
@@ -663,7 +663,7 @@ fn parse_string1_or_string2(string1_or_string2: &str) -> Result<Vec<Operand>, St
 ///   Returns `false` otherwise.
 ///
 fn contains_single_range(string1_or_string2: &str) -> bool {
-    static REGEX_ONCE_CELL: OnceLock<Regex> = OnceLock::<Regex>::new();
+    static REGEX_ONCE_CELL: OnceLock<Regex> = OnceLock::new();
 
     let regex = REGEX_ONCE_CELL.get_or_init(|| {
         // Regular expression for a range of characters or \octal
diff --git a/tree/Cargo.toml b/tree/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/users/Cargo.toml b/users/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
diff --git a/users/talk.rs b/users/talk.rs
@@ -31,7 +31,7 @@ use std::{
     },
     os::fd::AsRawFd,
     process, ptr,
-    sync::{Arc, LazyLock, Mutex},
+    sync::{Arc, Mutex, OnceLock},
     thread,
     time::{Duration, Instant},
 };
@@ -53,9 +53,12 @@ pub struct State {
     pub talkd_addr: SocketAddr,
 }
 
-/// A static variable to hold the state of delete invitations on SIGINT signal.
-static DELETE_INVITATIONS: LazyLock<Arc<Mutex<Option<State>>>> =
-    LazyLock::new(|| Arc::new(Mutex::new(None)));
+fn get_delete_invitations() -> &'static Arc<Mutex<Option<State>>> {
+    /// A static variable to hold the state of delete invitations on SIGINT signal.
+    static DELETE_INVITATIONS: OnceLock<Arc<Mutex<Option<State>>>> = OnceLock::new();
+
+    DELETE_INVITATIONS.get_or_init(|| Arc::new(Mutex::new(None)))
+}
 
 /// The size of the buffer for control message fields like l_name, r_name, and r_tty in CtlMsg.
 const BUFFER_SIZE: usize = 12;
@@ -959,7 +962,7 @@ fn handle_new_invitation(
 
     let clone_socket = Arc::clone(&socket);
 
-    *DELETE_INVITATIONS.lock().unwrap() = Some(State {
+    *get_delete_invitations().lock().unwrap() = Some(State {
         msg_bytes1,
         msg_bytes2,
         socket: clone_socket,
@@ -1627,7 +1630,7 @@ pub fn handle_signals(signal_code: libc::c_int) {
     eprintln!("Connection closed, exiting...");
 
     // Lock the DELETE_INVITATIONS mutex and check for an existing invitation
-    if let Some(state) = DELETE_INVITATIONS.lock().unwrap().as_ref() {
+    if let Some(state) = get_delete_invitations().lock().unwrap().as_ref() {
         // Handle the deletion of invitations
         handle_delete_invitations(&state.socket, &state.msg_bytes1, &state.talkd_addr);
         handle_delete_invitations(&state.socket, &state.msg_bytes2, &state.talkd_addr);
diff --git a/xform/Cargo.toml b/xform/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Jeff Garzik"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
