refactor: remove once_cell

Author: magistau

Cargo.lock

@@ -16,6 +16,7 @@ cargo = {level = "warn", priority = -1}
 print_stdout = "warn"
 print_stderr = "allow"
 dbg_macro = "warn"
+non_std_lazy_statics = "warn"
 
 [workspace.dependencies]
 base64 = "0.22.0"
@@ -29,7 +30,6 @@ js-sys = "0.3.69"
 leptos = "0.6.11"
 leptos_router = {version = "0.6.11", features = ["csr"]}
 leptos_meta = {version = "0.6.11", features = ["csr"]}
-once_cell = "1"
 rand = {version = "0.8.5", features = ["small_rng"]}
 serde = {version = "1", features = ["derive"]}
 serde_json = "1.0.115"
@@ -100,7 +100,6 @@ ecow.workspace = true
 enum-iterator.workspace = true
 indexmap = {version = "2", features = ["serde"]}
 num_cpus = "1.16.0"
-once_cell.workspace = true
 open = {version = "5", optional = true}
 parking_lot = "0.12.1"
 paste = "1.0.14"

Cargo.toml

@@ -24,7 +24,6 @@ colored.workspace = true
 dashmap.workspace = true
 ecow.workspace = true
 enum-iterator.workspace = true
-once_cell.workspace = true
 serde = {workspace = true, features = ["rc"]}
 unicode-segmentation.workspace = true
 serde_tuple = "1.0.0"

parser/Cargo.toml

@@ -1,13 +1,12 @@
-use std::{collections::HashMap, fmt};
+use std::{collections::HashMap, fmt, sync::LazyLock};
 
 use enum_iterator::Sequence;
-use once_cell::sync::Lazy;
 
 use crate::{ast::NumWord, Complex, SysOp};
 
 use super::Primitive;
 
-static ALIASES: Lazy<HashMap<Primitive, &[&str]>> = Lazy::new(|| {
+static ALIASES: LazyLock<HashMap<Primitive, &[&str]>> = LazyLock::new(|| {
     [
         (Primitive::Identity, &["id"] as &[_]),
         (Primitive::Gap, &["ga"]),
@@ -148,7 +147,7 @@ impl Primitive {
         if name.len() < 2 {
             return None;
         }
-        static REVERSE_ALIASES: Lazy<HashMap<&'static str, Primitive>> = Lazy::new(|| {
+        static REVERSE_ALIASES: LazyLock<HashMap<&'static str, Primitive>> = LazyLock::new(|| {
             ALIASES
                 .iter()
                 .flat_map(|(prim, aliases)| aliases.iter().map(|&s| (s, *prim)))

parser/src/split.rs

@@ -1,11 +1,10 @@
 use std::{
     f64::consts::TAU,
     path::{Path, PathBuf},
-    sync::OnceLock,
+    sync::{LazyLock, OnceLock},
 };
 
 use ecow::EcoVec;
-use once_cell::sync::Lazy;
 use rand::prelude::*;
 
 use crate::{
@@ -19,9 +18,9 @@ pub struct ConstantDef {
     /// The constant's class
     pub class: ConstClass,
     /// The constant's value
-    pub value: Lazy<ConstantValue>,
+    pub value: LazyLock<ConstantValue>,
     /// The constant's documentation
-    pub doc: Lazy<String>,
+    pub doc: LazyLock<String>,
     /// The suggested replacement because of deprecation
     pub deprecation: Option<&'static str>,
 }
@@ -135,9 +134,9 @@ macro_rules! constant {
                 $(#[$attr])*
                 ConstantDef {
                     name: $name,
-                    value: Lazy::new(|| {$value.into()}),
+                    value: LazyLock::new(|| {$value.into()}),
                     class: ConstClass::$class,
-                    doc: Lazy::new(|| {
+                    doc: LazyLock::new(|| {
                         let mut s = String::new();
                         $(
                             s.push_str($doc.trim());

src/constant.rs

@@ -20,7 +20,6 @@ use std::{
 use clap::{Parser, Subcommand};
 use colored::*;
 use notify::{event::ModifyKind, EventKind, RecursiveMode, Watcher};
-use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 use rustyline::{error::ReadlineError, DefaultEditor};
 use terminal_size::terminal_size;
@@ -34,7 +33,7 @@ use uiua::{
 };
 
 static PRESSED_CTRL_C: AtomicBool = AtomicBool::new(false);
-static WATCH_CHILD: Lazy<Mutex<Option<Child>>> = Lazy::new(Default::default);
+static WATCH_CHILD: Mutex<Option<Child>> = Mutex::new(None);
 
 fn fail<T>(e: UiuaError) -> T {
     eprintln!("{}", e.report());

src/main.rs

@@ -1,6 +1,4 @@
-use std::{env, fs, io, path::Path};
-
-use once_cell::sync::Lazy;
+use std::{env, fs, io, path::Path, sync::LazyLock};
 
 use crate::{Assembly, Compiler, NativeSys, UiuaResult};
 
@@ -43,5 +41,5 @@ fn load_asm() -> io::Result<Option<Assembly>> {
     Ok(Some(asm))
 }
 
-pub static STAND_ASM: Lazy<Option<Assembly>> =
-    Lazy::new(|| load_asm().unwrap_or_else(|e| panic!("{e}")));
+pub static STAND_ASM: LazyLock<Option<Assembly>> =
+    LazyLock::new(|| load_asm().unwrap_or_else(|e| panic!("{e}")));

src/stand.rs

@@ -7,13 +7,12 @@ use std::{
     mem::take,
     net::SocketAddr,
     path::{Path, PathBuf},
-    sync::Arc,
+    sync::{Arc, LazyLock},
     time::Duration,
 };
 
 #[cfg(feature = "image")]
 use image::DynamicImage;
-use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 use time::UtcOffset;
 
@@ -46,13 +45,13 @@ use in example Uiua code ✨";
 
 /// Access the built-in `example.ua` file
 pub fn example_ua<T>(f: impl FnOnce(&mut String) -> T) -> T {
-    static S: Lazy<Mutex<String>> = Lazy::new(|| Mutex::new(EXAMPLE_UA.to_string()));
+    static S: LazyLock<Mutex<String>> = LazyLock::new(|| Mutex::new(EXAMPLE_UA.to_string()));
     f(&mut S.lock())
 }
 
 /// Access the built-in `example.txt` file
 pub fn example_txt<T>(f: impl FnOnce(&mut String) -> T) -> T {
-    static S: Lazy<Mutex<String>> = Lazy::new(|| Mutex::new(EXAMPLE_TXT.to_string()));
+    static S: LazyLock<Mutex<String>> = LazyLock::new(|| Mutex::new(EXAMPLE_TXT.to_string()));
     f(&mut S.lock())
 }
 

src/sys/mod.rs

@@ -9,7 +9,7 @@ use std::{
     slice,
     sync::{
         atomic::{self, AtomicBool, AtomicU64},
-        Arc,
+        Arc, LazyLock,
     },
     thread::sleep,
     time::Duration,
@@ -19,7 +19,6 @@ use colored::Colorize;
 #[cfg(feature = "webcam")]
 use crossbeam_channel as channel;
 use dashmap::DashMap;
-use once_cell::sync::Lazy;
 
 use crate::{
     terminal_size, GitTarget, Handle, MetaPtr, ReadLinesFn, ReadLinesReturnFn, Span, SysBackend,
@@ -298,7 +297,7 @@ impl GlobalNativeSys {
     }
 }
 
-static NATIVE_SYS: Lazy<GlobalNativeSys> = Lazy::new(Default::default);
+static NATIVE_SYS: LazyLock<GlobalNativeSys> = LazyLock::new(Default::default);
 
 #[cfg(all(feature = "audio", feature = "binary"))]
 #[doc(hidden)]