From 1050401e42978d0f1c727d1450a4ddfd5009e70f Mon Sep 17 00:00:00 2001 From: cscherrNT Date: Thu, 21 Mar 2024 13:33:14 +0000 Subject: [PATCH] automatic cargo CI changes --- src/game/mod.rs | 16 +++++++++++----- src/wlist/builtin.rs | 6 ++---- src/wlist/mod.rs | 2 +- src/wlist/word.rs | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/game/mod.rs b/src/game/mod.rs index c3090be..b709dbb 100644 --- a/src/game/mod.rs +++ b/src/game/mod.rs @@ -30,14 +30,19 @@ impl Game { /// # Errors /// /// This function will return an error if . - pub(crate) fn build(length: usize, precompute: bool, max_steps: usize, wlist: WL) -> anyhow::Result { + pub(crate) fn build( + length: usize, + precompute: bool, + max_steps: usize, + wlist: WL, + ) -> anyhow::Result { let _game = Game { length, precompute, max_steps, step: 0, solution: String::default(), // we actually set this later - wordlist: wlist + wordlist: wlist, }; todo!(); @@ -81,13 +86,14 @@ pub struct GameBuilder { length: usize, precompute: bool, max_steps: usize, - wordlist: WL + wordlist: WL, } impl GameBuilder { /// build a [`Game`] with the stored configuration pub fn build(self) -> anyhow::Result> { - let game: Game = Game::build(self.length, self.precompute, self.max_steps, WL::default())?; + let game: Game = + Game::build(self.length, self.precompute, self.max_steps, WL::default())?; Ok(game) } @@ -123,7 +129,7 @@ impl Default for GameBuilder { length: super::DEFAULT_WORD_LENGTH, precompute: false, max_steps: super::DEFAULT_MAX_STEPS, - wordlist: WL::default() + wordlist: WL::default(), } } } diff --git a/src/wlist/builtin.rs b/src/wlist/builtin.rs index 56d149d..9f8aef2 100644 --- a/src/wlist/builtin.rs +++ b/src/wlist/builtin.rs @@ -6,7 +6,7 @@ const RAW_WORDLIST_FILE: &str = include_str!("../../data/wordlists/en_US_3b1b_fr #[derive(Clone, Debug)] pub struct BuiltinWList { - words: super::WordMap + words: super::WordMap, } impl super::WordList for BuiltinWList { @@ -23,8 +23,6 @@ impl Default for BuiltinWList { fn default() -> Self { let words: super::WordMap = serde_json::from_str(RAW_WORDLIST_FILE).unwrap(); - Self { - words - } + Self { words } } } diff --git a/src/wlist/mod.rs b/src/wlist/mod.rs index dab7484..c4cf026 100644 --- a/src/wlist/mod.rs +++ b/src/wlist/mod.rs @@ -1,5 +1,5 @@ use rand::{prelude::*, seq::IteratorRandom}; -use std::collections::HashMap; + use std::ops::RangeBounds; #[cfg(feature = "builtin_wlist")] diff --git a/src/wlist/word.rs b/src/wlist/word.rs index f639dfc..8d3508d 100644 --- a/src/wlist/word.rs +++ b/src/wlist/word.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, PartialOrd)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct Frequency { - inner: f64 + inner: f64, } // PERF: Hash for String is probably a bottleneck pub type Word = String; @@ -15,7 +15,7 @@ pub type Word = String; #[derive(Clone, Debug)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct WordMap { - inner: HashMap + inner: HashMap, } impl WordMap {