typing_rust

public

A small typing test program in Rust

Star0

Fork 0

Watch0

10 commits 1 branch 0 tags 0 releases329.6 KiB

Commit `d2ab8fb1c40b`

tarball

Jaglekon <58274093+Jaglekon@users.noreply.github.com>2026-09-29 17:06 UTC

3 files changed+11-18

small fixes

Modified file: src/main.rs+1−1

@@ -178,7 +178,7 @@ impl TypingTest {

178178

179179 fn handle_char(&mut self, c: char) {

180180

181- if self.typing.real_pos() >= self.typing.get_len() {

181+ if self.typing.real_pos() >= self.typing.len() {

182182 return;

183183 }

184184

Modified file: src/text_combine.rs+5 additions−9 deletions@@ -11,7 +11,6 @@ pub enum Mode {
 pub struct TextCombine {
     mode: Mode,
     text: String,
-    len: usize,
     pos: usize,
     err_n: usize,
     err_s: String,
@@ -61,12 +60,9 @@ impl TextCombine {
             },
         };
  
-        let len = text.chars().count();
-
         Self {
             mode,
             text,
-            len,
             pos: 0,
             err_n: 0,
             err_s: String::new(),
@@ -83,13 +79,13 @@ impl TextCombine {
     }
 
     pub fn pos_increment(&mut self) {
-        if self.pos < self.len {
+        if self.real_pos() < self.len() - 1 {
             self.pos += 1;
         }
     }
 
     pub fn err_n_increment(&mut self) {
-        if self.real_pos() < self.len {
+        if self.real_pos() < self.len() - 1 {
             self.err_n += 1;
         }
     }
@@ -106,8 +102,8 @@ impl TextCombine {
         self.err_s.push(c);
     }
 
-    pub fn get_len(&self) -> usize {
-        self.len
+    pub fn len(&self) -> usize {
+        self.text.chars().count()
     }
 
     pub fn curr_char(&self) -> Option<char> {
@@ -126,7 +122,7 @@ impl TextCombine {
     }
 
     pub fn back(&mut self) {
-        if self.err_s.len() > 0 {
+        if !self.err_s.is_empty() {
             self.err_s.pop() ;
         } else if self.err_n > 0 {
             self.err_n -= 1;

Modified file: src/timer.rs+5 additions−8 deletions@@ -26,13 +26,10 @@ impl Timer {
     }
 
     pub fn elapsed (&self) -> Duration {
-        match self.start {
-            Some(time) => if time.elapsed() < self.duration {
-                time.elapsed()
-            } else {
-                self.duration
-            },
-            None => Duration::ZERO,
-        }
+        self.start
+            .map(
+                |time| time.elapsed().min(self.duration)
+            )
+            .unwrap_or(Duration::ZERO)
     }
 }

typing_rust

Commit d2ab8fb1c40b

Commit `d2ab8fb1c40b`