fix: multiple fixes

poyea · Feb 26, 2022 · 88fe5ed · 88fe5ed
1 parent 8606856
commit 88fe5ed
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "poodle"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 authors = ["John Law <[email protected]>"]
 description = "Not a poodle, but a word-guessing game from your terminal"

diff --git a/src/keyboard.rs b/src/keyboard.rs
@@ -44,7 +44,7 @@ impl Keyboard {
             .collect()
     }
 
-    pub fn set(&mut self, state: &DayState, guess: &String) {
+    pub fn set_key_with_guess(&mut self, state: &DayState, guess: &String) {
         'next: for res in state.stat.attempts.last().unwrap().slots.iter().zip(
             guess
                 .chars()
@@ -59,10 +59,9 @@ impl Keyboard {
                             Result::Wrong => KeyState::Touched(Result::Wrong),
                             Result::Correct => KeyState::Touched(Result::Correct),
                             Result::Partial => match ch.used {
-                                KeyState::Touched(Result::Wrong) | KeyState::Untouched => {
-                                    KeyState::Touched(Result::Partial)
-                                }
-                                KeyState::Touched(Result::Partial) => {
+                                KeyState::Touched(Result::Wrong)
+                                | KeyState::Untouched
+                                | KeyState::Touched(Result::Partial) => {
                                     KeyState::Touched(Result::Partial)
                                 }
                                 KeyState::Touched(Result::Correct) => {

diff --git a/src/lib.rs b/src/lib.rs
@@ -37,7 +37,7 @@ fn start(today: String) {
         if DayState::input_hygiene(&buffer) {
             if DayState::input_allowed(&buffer, &allowed) {
                 let attempt_fmt = today_state.guess(&buffer);
-                keyboard.set(&today_state, &buffer);
+                keyboard.set_key_with_guess(&today_state, &buffer);
                 {
                     print!("\t\t{}", attempt_fmt);
                     io::stdout().flush().unwrap();
@@ -63,7 +63,7 @@ fn print_clear_console() {
 }
 
 pub fn exec(args: Cli) {
-    let today = "Feb 02, 2022".to_string();
+    let today = state::DayState::get_today();
     print_clear_console();
     println!("[{}] Hello poodler!", &today);
     match args.cmd {