typing_rust

public

A small typing test program in Rust

Star0

Fork 0

Watch0

8 commits 1 branch 0 tags 0 releases329.6 KiB

Commit `d29b02a0114e`

tarball

Jaglekon <58274093+Jaglekon@users.noreply.github.com>2026-09-26 20:34 UTC

3 files changed+10-12

bugfix: rpm decreasing in menu

Modified file: src/main.rs+2 additions−7 deletions@@ -53,7 +53,6 @@ pub struct TypingTest {
     status: Status,
     errors: usize,
     typing: TextCombine,
-    words: usize,
     timer: Timer,
 }
 
@@ -64,7 +63,6 @@ impl Default for TypingTest {
         Self {
             status: Running,
             errors: 0,
-            words: 0,
             typing: TextCombine::new(),
             timer: Timer::new(Duration::from_secs(30))
         }
@@ -193,9 +191,6 @@ impl TypingTest {
                 && self.typing.get_err_s().len() == 0 
             {
                 self.typing.pos_increment();
-                if c == ' ' {
-                    self.words += 1;
-                }
             } else if c != ' ' {
                 if curr != ' ' {
                     self.typing.err_n_increment();
@@ -289,7 +284,7 @@ impl TypingTest {
             },
             " // Mistakes ".into(),
             self.errors.to_string().into(),
-            (" ").into()
+            " ".into(),
         ]);
         let bottom = Line::from(vec![
             " Exit ".into(),
@@ -335,7 +330,7 @@ impl TypingTest {
 
 
     fn get_wpm(&self) -> f64 {
-        (((self.typing.get_pos() + 1) as f64 / 5.0) 
+        (((self.typing.get_pos()) as f64 / 5.0) 
             / self.timer.elapsed().as_secs_f64())
             * 60.0
     }

Modified file: src/text_combine.rs+3 additions−4 deletions@@ -11,9 +11,8 @@ pub struct TextCombine {
 
 impl TextCombine {
     pub fn new() -> Self {
-        let words: Vec<String> = include_str!("../assets/wordlist.txt")
+        let words: Vec<&str> = include_str!("../assets/wordlist.txt")
             .lines()
-            .map(str::to_owned)
             .collect();
 
 
@@ -26,8 +25,8 @@ impl TextCombine {
 
         let text = (0..60)
             .filter_map(|_| words.choose(&mut rng))
-            .cloned()
-            .collect::<Vec<_>>()
+            .copied()
+            .collect::<Vec<&str>>()
             .join(" ");
 
         let len = text.chars().count();

Modified file: src/timer.rs+5 additions−1 deletions@@ -27,7 +27,11 @@ impl Timer {
 
     pub fn elapsed (&self) -> Duration {
         match self.start {
-            Some(time) => time.elapsed(),
+            Some(time) => if time.elapsed() < self.duration {
+                time.elapsed()
+            } else {
+                self.duration
+            },
             None => Duration::ZERO,
         }
     }

typing_rust

Commit d29b02a0114e

Commit `d29b02a0114e`