Merge branch '0.2'

1 files changed, 9 insertions, 5 deletions

diff --git a/examples/dining_philosophers.rs b/examples/dining_philosophers.rs
index 35aa330..dc4dd51 100644
--- a/examples/dining_philosophers.rs
+++ b/examples/dining_philosophers.rs
@@ -1,6 +1,6 @@
 use std::{thread, time::Duration};
 
-use happylock::{LockCollection, Mutex, ThreadKey};
+use happylock::{collection, Mutex, ThreadKey};
 
 static PHILOSOPHERS: [Philosopher; 5] = [
 	Philosopher {
@@ -50,8 +50,8 @@ impl Philosopher {
 		thread::sleep(Duration::from_secs(1));
 
 		// safety: no philosopher asks for the same fork twice
-		let forks =
-			unsafe { LockCollection::new_unchecked([&FORKS[self.left], &FORKS[self.right]]) };
+		let forks = [&FORKS[self.left], &FORKS[self.right]];
+		let forks = unsafe { collection::RefLockCollection::new_unchecked(&forks) };
 		let forks = forks.lock(key);
 		println!("{} is eating...", self.name);
 		thread::sleep(Duration::from_secs(1));
@@ -61,9 +61,13 @@ impl Philosopher {
 }
 
 fn main() {
-	let handles = PHILOSOPHERS
+	let handles: Vec<_> = PHILOSOPHERS
 		.iter()
-		.map(|philosopher| thread::spawn(move || philosopher.cycle()));
+		.map(|philosopher| thread::spawn(move || philosopher.cycle()))
+		// The `collect` is absolutely necessary, because we're using lazy
+		// iterators. If `collect` isn't used, then the thread won't spawn
+		// until we try to join on it.
+		.collect();
 
 	for handle in handles {
 		_ = handle.join();