From dd131cb487f78242661001e49787cec710415591 Mon Sep 17 00:00:00 2001
From: 0xChasingFire <0xchasingfire@gmail.com>
Date: Thu, 27 May 2021 20:34:46 +0800
Subject: [PATCH] threads and iter5
---
exercises/standard_library_types/iterators5.rs | 4 +++-
exercises/threads/threads1.rs | 10 ++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/exercises/standard_library_types/iterators5.rs b/exercises/standard_library_types/iterators5.rs
index d8d4453..5710cde 100644
--- a/exercises/standard_library_types/iterators5.rs
+++ b/exercises/standard_library_types/iterators5.rs
@@ -11,7 +11,6 @@
//
// Make the code compile and the tests pass.
-// I AM NOT DONE
use std::collections::HashMap;
@@ -35,6 +34,8 @@ fn count_for(map: &HashMap<String, Progress>, value: Progress) -> usize {
fn count_iterator(map: &HashMap<String, Progress>, value: Progress) -> usize {
// map is a hashmap with String keys and Progress values.
// map = { "variables1": Complete, "from_str": None, ... }
+ // map.keys().len()
+ count_for(map, value)
}
fn count_collection_for(collection: &[HashMap<String, Progress>], value: Progress) -> usize {
@@ -53,6 +54,7 @@ fn count_collection_iterator(collection: &[HashMap<String, Progress>], value: Pr
// collection is a slice of hashmaps.
// collection = [{ "variables1": Complete, "from_str": None, ... },
// { "variables2": Complete, ... }, ... ]
+ count_collection_for(collection, value)
}
#[cfg(test)]
diff --git a/exercises/threads/threads1.rs b/exercises/threads/threads1.rs
index f31b317..8c175b1 100644
--- a/exercises/threads/threads1.rs
+++ b/exercises/threads/threads1.rs
@@ -6,9 +6,7 @@
// of "waiting..." and the program ends without timing out when running,
// you've got it :)
-// I AM NOT DONE
-
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
use std::thread;
use std::time::Duration;
@@ -17,15 +15,15 @@ struct JobStatus {
}
fn main() {
- let status = Arc::new(JobStatus { jobs_completed: 0 });
+ let status = Arc::new(Mutex::new(JobStatus { jobs_completed: 0 }));
let status_shared = status.clone();
thread::spawn(move || {
for _ in 0..10 {
thread::sleep(Duration::from_millis(250));
- status_shared.jobs_completed += 1;
+ status_shared.lock().unwrap().jobs_completed += 1;
}
});
- while status.jobs_completed < 10 {
+ while status.lock().unwrap().jobs_completed < 10 {
println!("waiting... ");
thread::sleep(Duration::from_millis(500));
}