From 02eacd41447ff9b6630ec82d5f760f648174e892 Mon Sep 17 00:00:00 2001 From: Ferran Basora Date: Mon, 25 Feb 2019 23:49:37 +0000 Subject: [PATCH] Fix bug with short alphabets --- src/main.rs | 2 +- src/state.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 4a55224..f39af0a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -104,7 +104,7 @@ fn main() { let mut typed_hint: String = "".to_owned(); let matches = state.matches(reverse, unique); - let longest_hint = matches.last().unwrap().hint.clone().unwrap().len(); + let longest_hint = matches.iter().filter(|&m| m.hint.clone().is_some()).last().unwrap().hint.clone().expect("Unknown hint").len(); loop { let mut selected = matches.last(); diff --git a/src/state.rs b/src/state.rs index b75ff46..d9c3e86 100644 --- a/src/state.rs +++ b/src/state.rs @@ -57,7 +57,7 @@ impl<'a> State<'a> { hint: None }); - chunk = chunk.get(first_match.end()..).unwrap(); + chunk = chunk.get(first_match.end()..).expect("Unknown chunk"); offset = offset + first_match.end() as i32; } else { break;