Remove lazy_static from the codebase.

This means we're using `LazyLock` for all relevant deferred initialization.

Closes #109

Author: lgarron

Cargo.lock

@@ -19,7 +19,6 @@ erased_set = "0.8.0"
 hex = "0.4.3"
 indicatif = "0.18.2"
 instant = { version = "0.1.13", features = ["wasm-bindgen"] }
-lazy_static = "1.5.0"
 multiset = "0.0.5"
 num-integer = "0.1.46"
 rand = "0.9.2"

src/lib/Cargo.toml

@@ -34,8 +34,6 @@ use super::{
     square1_shape_traversal_filter::shape_traversal_filter_pattern,
 };
 
-use lazy_static::lazy_static;
-
 // Note that this entire struct consists of single coordinate.
 // The fields themselves are more like "subcoordinates" rather than coordinates in themselves.
 // TODO: Implement automatic coordinate composition?
@@ -75,16 +73,14 @@ pub(crate) type Square1Phase1Puzzle =
 // TODO: allow flipping this depending on whether this is for a scramble (backwards) or a solution (forwards)?
 const D_SQ_MOVE_RESTRICTED_RANGE: Range<i32> = -3..3;
 
+const D_MOVE_CLASS_INDEX: MoveClassIndex = MoveClassIndex(1);
+
 // This is exported so it can be reused by phase 2.
 #[allow(non_snake_case)]
 pub fn restrict_D_move(
     move_transformation_info: &MoveTransformationInfo<Square1Phase1Puzzle>,
 ) -> bool {
-    lazy_static! {
-        // TODO: perform a one-time check that this matches the search generator indexing.
-        static ref D_MOVE_CLASS_INDEX: MoveClassIndex = MoveClassIndex(1);
-    }
-    if move_transformation_info.move_class_index != *D_MOVE_CLASS_INDEX {
+    if move_transformation_info.move_class_index != D_MOVE_CLASS_INDEX {
         return true;
     }
     let Move { amount, .. } = move_transformation_info.r#move;

src/lib/scramble/puzzles/square1/phase1.rs

@@ -2,8 +2,7 @@ use cubing::{
     alg::{parse_alg, parse_move, Alg, Move},
     kpuzzle::{InvalidAlgError, KPattern, KPuzzle, KPuzzleOrbitInfo},
 };
-use lazy_static::lazy_static;
-use std::cmp::max;
+use std::{cmp::max, sync::LazyLock};
 
 use crate::{
     _internal::{
@@ -107,22 +106,23 @@ pub(crate) struct Square0EquatorlessPattern {
     pub(crate) pattern: KPattern,
 }
 
+static WEDGES_ORBIT_INFO: LazyLock<&'static KPuzzleOrbitInfo> = LazyLock::new(|| {
+    let orbit_info: &'static KPuzzleOrbitInfo =
+        &square1_unbandaged_kpuzzle().data.ordered_orbit_info[0];
+    assert_eq!(orbit_info.name.0, "WEDGES");
+    orbit_info
+});
+
 const NUM_SQUARE0_EQUATORLESS_WEDGES: u8 = 8;
 impl Square0EquatorlessPattern {
     // TODO: define this as a static method instead and just output a `KPattern` instead of a `Square0EquatorlessCoordinate`? Or ideally add a type-safe way for coordinates to us different masks/conversions into the same coordinates (and tables).
     fn from_edges_pattern(square1_edges_pattern: &KPattern) -> Self {
-        lazy_static! {
-            static ref orbit_info: &'static KPuzzleOrbitInfo =
-                &square1_unbandaged_kpuzzle().data.ordered_orbit_info[0];
-        };
-        assert_eq!(orbit_info.name.0, "WEDGES"); // TODO: only do this at orbit info time, using the former pattern for retrieving an `OrbitInfo` from a definition.
-
         let mut square0_equatorless_pattern =
             square0_equatorless_kpuzzle().default_pattern().clone();
 
         let mut square0_equatorless_i = 0;
-        for square1_i in 0..orbit_info.num_pieces {
-            let piece = square1_edges_pattern.get_piece(&orbit_info, square1_i);
+        for square1_i in 0..WEDGES_ORBIT_INFO.num_pieces {
+            let piece = square1_edges_pattern.get_piece(*WEDGES_ORBIT_INFO, square1_i);
             let square0_piece = match piece {
                 // TODO: unify this with `WEDGE_TYPE_LOOKUP`?
                 0 => None,
@@ -153,7 +153,7 @@ impl Square0EquatorlessPattern {
             };
             if let Some(square0_piece) = square0_piece {
                 square0_equatorless_pattern.set_piece(
-                    &orbit_info,
+                    *WEDGES_ORBIT_INFO,
                     square0_equatorless_i,
                     square0_piece,
                 );
@@ -168,18 +168,12 @@ impl Square0EquatorlessPattern {
 
     // TODO: define this as a static method instead and just output a `KPattern` instead of a `Square0EquatorlessCoordinate`? Or ideally add a type-safe way for coordinates to us different masks/conversions into the same coordinates (and tables).
     fn from_corners_pattern(square1_corners_pattern: &KPattern) -> Self {
-        lazy_static! {
-            static ref orbit_info: &'static KPuzzleOrbitInfo =
-                &square1_unbandaged_kpuzzle().data.ordered_orbit_info[0];
-        };
-        assert_eq!(orbit_info.name.0, "WEDGES"); // TODO: only do this at orbit info time, using the former pattern for retrieving an `OrbitInfo` from a definition.
-
         let mut square0_equatorless_pattern =
             square0_equatorless_kpuzzle().default_pattern().clone();
 
         let mut square0_equatorless_i = 0;
-        for square1_i in 0..orbit_info.num_pieces {
-            let piece = square1_corners_pattern.get_piece(&orbit_info, square1_i);
+        for square1_i in 0..WEDGES_ORBIT_INFO.num_pieces {
+            let piece = square1_corners_pattern.get_piece(&WEDGES_ORBIT_INFO, square1_i);
             let square0_piece = match piece {
                 // TODO: unify this with `WEDGE_TYPE_LOOKUP`?
                 0 => Some(0),
@@ -210,7 +204,7 @@ impl Square0EquatorlessPattern {
             };
             if let Some(square0_piece) = square0_piece {
                 square0_equatorless_pattern.set_piece(
-                    &orbit_info,
+                    *WEDGES_ORBIT_INFO,
                     square0_equatorless_i,
                     square0_piece,
                 );