diff --git a/src/reader/word_motion.rs b/src/reader/word_motion.rs index 91ab9fd91..e45e45e3e 100644 --- a/src/reader/word_motion.rs +++ b/src/reader/word_motion.rs @@ -38,11 +38,6 @@ pub fn consume_char(&mut self, text: &wstr, idx: usize) -> bool { } } - #[cfg(test)] - fn reset(&mut self) { - self.state = 0; - } - fn consume_char_punctuation(&mut self, c: char) -> bool { const S_ALWAYS_ONE: u8 = 0; const S_REST: u8 = 1; @@ -268,7 +263,8 @@ macro_rules! validate { let direction = $direction; let (command, mut stops, mut idx, end) = setup(direction, $line); assert!(!command.is_empty()); - let mut sm = MoveWordStateMachine::new($style); + let new_sm = || MoveWordStateMachine::new($style); + let mut sm = new_sm(); while idx != end { let word_idx = if direction == MoveWordDir::Left { idx - 1 @@ -293,7 +289,7 @@ macro_rules! validate { "Expected to stop={expected_idx} but stopped at {idx}. String: {command:?}" ); stops.pop_front(); - sm.reset(); + sm = new_sm(); } } assert!(