renumber

Author: nikomatsakis

src/example20.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 use std::collections::HashMap;
 use std::f32::INFINITY;
 use std::thread;
@@ -9,10 +11,10 @@ struct Store {
 
 impl Store {
     fn new(name: String) -> Store {
-        Store {
-            name: name,
-            prices: HashMap::new(),
-        }
+    Store {
+        name: name,
+        prices: HashMap::new(),
+    }
     }
 
     fn add_item(&mut self, name: String, price: f32) {
@@ -49,27 +51,22 @@ fn build_stores() -> Vec<Store> {
 }
 
 fn find_best_store(stores: Vec<Store>, shopping_list: &Vec<String>) -> String {
-    let threads: Vec<_> =
-        stores.into_iter()
-              .map(|store| {
-                  let shopping_list = shopping_list.clone();
-                  thread::spawn(move || {
-                      let sum = compute_sum(&store, &shopping_list);
-                      (store.name, sum)
-                  })
-              })
-              .collect();
-
+    assert!(stores.len() > 0);
     let mut best = None;
     let mut best_price = INFINITY;
-    for thread in threads {
-        let (name, sum) = thread.join().unwrap(); // propoagate panics
+    for store in stores {
+        let name = store.name.clone();
+        let shopping_list = shopping_list.clone();
+        let handle = thread::spawn(move || {
+            compute_sum(&store, &shopping_list)
+        });
+        let sum = handle.join().unwrap();
         if sum < best_price {
             best = Some(name);
             best_price = sum;
         }
     }
-    best.unwrap()
+    best.unwrap() // there will always be at least one store
 }
 
 fn compute_sum(store: &Store, shopping_list: &Vec<String>) -> f32 {
@@ -82,7 +79,6 @@ pub fn main() {
     let shopping_list = vec![format!("chocolate"),
                              format!("doll"),
                              format!("bike")];
-
     let stores = build_stores();
     let best_store = find_best_store(stores, &shopping_list);
     println!("Best store: {}", best_store);

src/example15.rs renamed to src/example20sol.rs

@@ -1,6 +1,5 @@
-#![allow(dead_code)]
-
 use std::collections::HashMap;
+use std::f32::INFINITY;
 use std::thread;
 
 struct Store {
@@ -10,10 +9,10 @@ struct Store {
 
 impl Store {
     fn new(name: String) -> Store {
-    Store {
-        name: name,
-        prices: HashMap::new(),
-    }
+        Store {
+            name: name,
+            prices: HashMap::new(),
+        }
     }
 
     fn add_item(&mut self, name: String, price: f32) {
@@ -50,22 +49,27 @@ fn build_stores() -> Vec<Store> {
 }
 
 fn find_best_store(stores: Vec<Store>, shopping_list: &Vec<String>) -> String {
-    assert!(stores.len() > 0);
+    let threads: Vec<_> =
+        stores.into_iter()
+              .map(|store| {
+                  let shopping_list = shopping_list.clone();
+                  thread::spawn(move || {
+                      let sum = compute_sum(&store, &shopping_list);
+                      (store.name, sum)
+                  })
+              })
+              .collect();
+
     let mut best = None;
     let mut best_price = INFINITY;
-    for store in stores {
-        let name = store.name.clone();
-        let shopping_list = shopping_list.clone();
-        let handle = thread::spawn(move || {
-            compute_sum(&store, &shopping_list)
-        });
-        let sum = handle.join().unwrap();
+    for thread in threads {
+        let (name, sum) = thread.join().unwrap(); // propoagate panics
         if sum < best_price {
-            best = Some(store.name);
+            best = Some(name);
             best_price = sum;
         }
     }
-    best.unwrap() // there will always be at least one store
+    best.unwrap()
 }
 
 fn compute_sum(store: &Store, shopping_list: &Vec<String>) -> f32 {
@@ -78,6 +82,7 @@ pub fn main() {
     let shopping_list = vec![format!("chocolate"),
                              format!("doll"),
                              format!("bike")];
+
     let stores = build_stores();
     let best_store = find_best_store(stores, &shopping_list);
     println!("Best store: {}", best_store);

src/main.rs

@@ -4,6 +4,7 @@ mod example02;
 mod example03;
 mod example10;
 mod example20;
+mod example20sol;
 mod example30;
 mod example40;
 
@@ -25,6 +26,7 @@ fn main() {
 
     println!("----------------------------------------------------------------------");
     example20::main();
+    example20sol::main();
 
     println!("----------------------------------------------------------------------");
     example30::main();