Fix usage warnings.

cubing · Oct 18, 2024 · 671d382 · 671d382
1 parent a226607
commit 671d382
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/rs-wasm/wasm_api.rs b/src/rs-wasm/wasm_api.rs
@@ -8,7 +8,7 @@ use wasm_bindgen::prelude::*;
 
 use twsearch::scramble::{random_scramble_for_event, Event};
 
-use twsearch::_internal::{AlwaysValid, IDFSearch, IndividualSearchOptions, SearchLogger};
+use twsearch::_internal::{IDFSearch, IndividualSearchOptions, SearchLogger};
 
 pub fn internal_init() {
     console_error_panic_hook::set_once();
@@ -66,7 +66,7 @@ pub fn wasmTwsearch(
         None => Generators::Default,
     };
 
-    let idfs = IDFSearch::<AlwaysValid>::try_new(
+    let idfs = <IDFSearch>::try_new(
         kpuzzle,
         target_pattern,
         generators,

diff --git a/src/rs/_cli/main.rs b/src/rs/_cli/main.rs
@@ -16,7 +16,7 @@ use serve::serve;
 use twsearch::_internal::{
     cli::options::{get_options, CliCommand, GodsAlgorithmArgs, SearchCommandArgs},
     options::VerbosityLevel,
-    read_to_json, AlwaysValid, ArgumentError, CommandError, GodsAlgorithmSearch, IDFSearch,
+    read_to_json, ArgumentError, CommandError, GodsAlgorithmSearch, IDFSearch,
     IndividualSearchOptions, SearchLogger,
 };
 
@@ -146,7 +146,7 @@ fn search(search_command_args: SearchCommandArgs) -> Result<(), CommandError> {
         }
     };
 
-    let mut idf_search = IDFSearch::<AlwaysValid>::try_new(
+    let mut idf_search = <IDFSearch>::try_new(
         kpuzzle,
         target_pattern,
         search_command_args.generator_args.parse(),

diff --git a/src/rs/_cli/serve/serve.rs b/src/rs/_cli/serve/serve.rs
@@ -9,7 +9,6 @@ use rouille::Request;
 use rouille::Response;
 use serde::Deserialize;
 use serde::Serialize;
-use twsearch::_internal::AlwaysValid;
 use twsearch::_internal::SearchLogger;
 
 use std::sync::Arc;
@@ -88,7 +87,7 @@ fn solve_pattern(
         Ok(search_pattern) => search_pattern,
         Err(e) => return Response::text(e.to_string()).with_status_code(400),
     };
-    let mut search = match IDFSearch::<AlwaysValid>::try_new(
+    let mut search = match <IDFSearch>::try_new(
         kpuzzle,
         target_pattern,
         Generators::Custom(CustomGenerators {

diff --git a/src/rs/scramble/puzzles/square1.rs b/src/rs/scramble/puzzles/square1.rs
@@ -14,6 +14,7 @@ use rand::thread_rng;
 use crate::{
     _internal::{FlatMoveIndex, PatternValidityChecker},
     scramble::{
+        puzzles::square1_phase_lookup_table::LookupPattern,
         randomize::{basic_parity, BasicParity, PieceZeroConstraint},
         scramble_search::FilteredSearch,
     },
@@ -183,6 +184,13 @@ pub fn scramble_square1() -> Alg {
     );
 
     dbg!(&search_generators.flat[10]);
+    dbg!(phase_lookup_table.lookup_pattern_to_index.get(
+        &LookupPattern::try_new::<Phase1Checker>(
+            &kpuzzle.default_pattern(),
+            square1_square_square_shape_kpattern(),
+        )
+        .unwrap(),
+    ));
 
     //     dbg!(wedge_parity(
     //         &kpuzzle

diff --git a/src/rs/scramble/puzzles/square1_phase_lookup_table.rs b/src/rs/scramble/puzzles/square1_phase_lookup_table.rs
@@ -36,7 +36,7 @@ impl Debug for LookupPattern {
 }
 
 impl LookupPattern {
-    fn try_new<C: PatternValidityChecker>(
+    pub fn try_new<C: PatternValidityChecker>(
         full_pattern: &KPattern,
         phase_mask: &KPattern,
     ) -> Option<Self> {