From 2f810a4da67233716ad93e00afff6e8b260f4807 Mon Sep 17 00:00:00 2001
From: mo8it <mo8it@proton.me>
Date: Wed, 17 Apr 2024 23:34:27 +0200
Subject: Clean up and unify exercises

---
 exercises/20_threads/threads1.rs |  5 -----
 exercises/20_threads/threads2.rs |  5 -----
 exercises/20_threads/threads3.rs | 38 +++++++++++++++++++++-----------------
 3 files changed, 21 insertions(+), 27 deletions(-)

(limited to 'exercises/20_threads')

diff --git a/exercises/20_threads/threads1.rs b/exercises/20_threads/threads1.rs
index be1301d..bf0b8e0 100644
--- a/exercises/20_threads/threads1.rs
+++ b/exercises/20_threads/threads1.rs
@@ -1,12 +1,7 @@
-// threads1.rs
-//
 // This program spawns multiple threads that each run for at least 250ms, and
 // each thread returns how much time they took to complete. The program should
 // wait until all the spawned threads have finished and should collect their
 // return values into a vector.
-//
-// Execute `rustlings hint threads1` or use the `hint` watch subcommand for a
-// hint.
 
 use std::thread;
 use std::time::{Duration, Instant};
diff --git a/exercises/20_threads/threads2.rs b/exercises/20_threads/threads2.rs
index 13cb840..2bdeba9 100644
--- a/exercises/20_threads/threads2.rs
+++ b/exercises/20_threads/threads2.rs
@@ -1,11 +1,6 @@
-// threads2.rs
-//
 // Building on the last exercise, we want all of the threads to complete their
 // work but this time the spawned threads need to be in charge of updating a
 // shared value: JobStatus.jobs_completed
-//
-// Execute `rustlings hint threads2` or use the `hint` watch subcommand for a
-// hint.
 
 use std::sync::Arc;
 use std::thread;
diff --git a/exercises/20_threads/threads3.rs b/exercises/20_threads/threads3.rs
index 35b914a..13abc45 100644
--- a/exercises/20_threads/threads3.rs
+++ b/exercises/20_threads/threads3.rs
@@ -1,8 +1,3 @@
-// threads3.rs
-//
-// Execute `rustlings hint threads3` or use the `hint` watch subcommand for a
-// hint.
-
 use std::sync::mpsc;
 use std::sync::Arc;
 use std::thread;
@@ -42,20 +37,29 @@ fn send_tx(q: Queue, tx: mpsc::Sender<u32>) -> () {
     });
 }
 
-#[test]
 fn main() {
-    let (tx, rx) = mpsc::channel();
-    let queue = Queue::new();
-    let queue_length = queue.length;
+    // You can optionally experiment here.
+}
 
-    send_tx(queue, tx);
+#[cfg(test)]
+mod tests {
+    use super::*;
 
-    let mut total_received: u32 = 0;
-    for received in rx {
-        println!("Got: {}", received);
-        total_received += 1;
-    }
+    #[test]
+    fn threads3() {
+        let (tx, rx) = mpsc::channel();
+        let queue = Queue::new();
+        let queue_length = queue.length;
+
+        send_tx(queue, tx);
 
-    println!("total numbers received: {}", total_received);
-    assert_eq!(total_received, queue_length)
+        let mut total_received: u32 = 0;
+        for received in rx {
+            println!("Got: {}", received);
+            total_received += 1;
+        }
+
+        println!("total numbers received: {}", total_received);
+        assert_eq!(total_received, queue_length)
+    }
 }
-- 
cgit v1.2.3