changeset 27:67ce650d5de5

Run rustfmt
author Lewin Bormann <lbo@spheniscida.de>
date Sun, 31 Jan 2016 16:21:32 +0000
parents 5a61cde90fe6
children 7ef79a1865f3
files src/formats/lines.rs src/formats/util.rs src/formats/writelog.rs src/map.rs src/mapreducer.rs
diffstat 5 files changed, 34 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/formats/lines.rs	Sun Jan 31 16:20:16 2016 +0000
+++ b/src/formats/lines.rs	Sun Jan 31 16:21:32 2016 +0000
@@ -107,7 +107,7 @@
         let f = fs::OpenOptions::new().write(true).truncate(true).create(true).open(path);
         match f {
             Err(e) => panic!("Couldn't open lines output file {}: {}", name, e),
-            Ok(f) => return LinesWriter { file: f }
+            Ok(f) => return LinesWriter { file: f },
         }
     }
 }
@@ -160,7 +160,14 @@
         }
 
         {
-            assert_eq!(fs::OpenOptions::new().read(true).open("test_output_1").unwrap().metadata().unwrap().len(), 200);
+            assert_eq!(fs::OpenOptions::new()
+                           .read(true)
+                           .open("test_output_1")
+                           .unwrap()
+                           .metadata()
+                           .unwrap()
+                           .len(),
+                       200);
         }
         fs::remove_file("test_output_1");
     }
--- a/src/formats/util.rs	Sun Jan 31 16:20:16 2016 +0000
+++ b/src/formats/util.rs	Sun Jan 31 16:21:32 2016 +0000
@@ -59,7 +59,12 @@
         match (k, v) {
             (None, _) => None,
             (_, None) => None,
-            (Some(k_), Some(v_)) => Some(Record { key: k_, value: v_ }),
+            (Some(k_), Some(v_)) => {
+                Some(Record {
+                    key: k_,
+                    value: v_,
+                })
+            }
         }
     }
 }
--- a/src/formats/writelog.rs	Sun Jan 31 16:20:16 2016 +0000
+++ b/src/formats/writelog.rs	Sun Jan 31 16:21:32 2016 +0000
@@ -126,7 +126,7 @@
         let writer = WriteLogWriter::<fs::File>::new_to_file(&path, false);
         match writer {
             Err(e) => panic!("Could not open {}: {}", path, e),
-            Ok(w) => w
+            Ok(w) => w,
         }
     }
 }
--- a/src/map.rs	Sun Jan 31 16:20:16 2016 +0000
+++ b/src/map.rs	Sun Jan 31 16:21:32 2016 +0000
@@ -41,7 +41,9 @@
         loop {
             match self.input.pop_front() {
                 None => break,
-                Some(record) => { self.sorted_input.insert(record.key, record.value); },
+                Some(record) => {
+                    self.sorted_input.insert(record.key, record.value);
+                }
             }
         }
     }
@@ -61,10 +63,14 @@
                 let val;
                 match self.sorted_input.remove(k) {
                     None => continue,
-                    Some(v) => val = v
+                    Some(v) => val = v,
                 }
                 let mut e = MEmitter::new();
-                self.mr.map(&mut e, Record { key: k.clone(), value: val });
+                self.mr.map(&mut e,
+                            Record {
+                                key: k.clone(),
+                                value: val,
+                            });
                 self.insert_result(e);
             }
 
@@ -78,12 +84,12 @@
                 let r1 = self.output.write(k.as_bytes());
                 match r1 {
                     Err(e) => panic!("couldn't write map output: {}", e),
-                    Ok(_) => ()
+                    Ok(_) => (),
                 }
                 let r2 = self.output.write(v.as_bytes());
                 match r2 {
                     Err(e) => panic!("couldn't write map output: {}", e),
-                    Ok(_) => ()
+                    Ok(_) => (),
                 }
             }
         }
@@ -97,8 +103,13 @@
             }
 
             match e {
-                None => { self.sorted_output.insert(r.key, vec![r.value]); },
-                Some(mut v) => { v.push(r.value); self.sorted_output.insert(r.key, v); },
+                None => {
+                    self.sorted_output.insert(r.key, vec![r.value]);
+                }
+                Some(mut v) => {
+                    v.push(r.value);
+                    self.sorted_output.insert(r.key, v);
+                }
             }
         }
     }
--- a/src/mapreducer.rs	Sun Jan 31 16:20:16 2016 +0000
+++ b/src/mapreducer.rs	Sun Jan 31 16:21:32 2016 +0000
@@ -96,4 +96,3 @@
         h.finish() as u32 % n
     }
 }
-