Formatting.

Author: mschlumpp

src/bin/cli.rs

@@ -15,8 +15,8 @@ use geometrify::{ProgressReporter, RandomPointGenerator, Filter};
 use geometrify::geometrify::Geometrify;
 
 use image::open;
-use std::path::Path;
 use std::io::Stdout;
+use std::path::Path;
 
 use pbr::ProgressBar;
 
@@ -26,9 +26,7 @@ struct PbrProgressReporter {
 
 impl PbrProgressReporter {
     fn new() -> PbrProgressReporter {
-        PbrProgressReporter {
-            bar: None,
-        }
+        PbrProgressReporter { bar: None }
     }
 }
 
@@ -40,13 +38,17 @@ impl ProgressReporter for PbrProgressReporter {
     }
 
     fn step(&mut self) {
-        let ref mut bar = self.bar.as_mut().expect("ProgressReporter was not initialized");
+        let ref mut bar = self.bar
+            .as_mut()
+            .expect("ProgressReporter was not initialized");
         bar.inc();
     }
 
     fn finish(&mut self) {
         {
-            let ref mut bar = self.bar.as_mut().expect("ProgressReporter was not initialized");
+            let ref mut bar = self.bar
+                .as_mut()
+                .expect("ProgressReporter was not initialized");
             bar.finish();
         }
         self.bar = None;
@@ -61,35 +63,36 @@ fn main() {
             Arg::with_name("INPUT")
                 .required(true)
                 .help("Input file")
-                .index(1)
+                .index(1),
         )
         .arg(
             Arg::with_name("OUTPUT")
                 .required(true)
                 .help("Output file")
-                .index(2)
+                .index(2),
         )
         .arg(
             Arg::with_name("samples")
                 .short("s")
                 .long("samples")
                 .help("Number of primitives to select from")
                 .default_value("50")
-                .takes_value(true)
+                .takes_value(true),
         )
         .arg(
             Arg::with_name("iterations")
                 .short("i")
                 .long("iterations")
                 .default_value("100")
                 .help("Number of primitives to place")
-                .takes_value(true)
+                .takes_value(true),
         )
         .get_matches();
 
 
-    let source = open(&Path::new(matches.value_of("INPUT").expect("expected input file")))
-        .expect("Can't open source file");
+    let source = open(&Path::new(
+        matches.value_of("INPUT").expect("expected input file"),
+    )).expect("Can't open source file");
     let sourcebuf = source.to_rgba();
 
 
@@ -112,6 +115,8 @@ fn main() {
     let outputbuf = filter.apply(&sourcebuf, &mut progress);
 
     outputbuf
-        .save(&Path::new(matches.value_of("OUTPUT").expect("expected output file")))
+        .save(&Path::new(
+            matches.value_of("OUTPUT").expect("expected output file"),
+        ))
         .expect("Can't save image");
 }

src/bin/web.rs

@@ -23,19 +23,19 @@ fn index() -> &'static str {
     "Hello world!"
 }
 
-#[post("/geometrify", format="image/png", data = "<data>")]
+#[post("/geometrify", format = "image/png", data = "<data>")]
 fn geometrify_process(data: Data) -> &'static str {
-    let mut buf = vec!();
-    data.open().read_to_end(&mut buf).expect("Can't read into memory");
-    let image = image::load_from_memory(&buf).expect("Can't load image").to_rgba();
+    let mut buf = vec![];
+    data.open()
+        .read_to_end(&mut buf)
+        .expect("Can't read into memory");
+    let image = image::load_from_memory(&buf)
+        .expect("Can't load image")
+        .to_rgba();
     drop(buf);
 
     let pointgen = Box::new(RandomPointGenerator::new());
-    let mut filter = Geometrify::new(
-        pointgen,
-        4,
-        6,
-    );
+    let mut filter = Geometrify::new(pointgen, 4, 6);
 
     let mut progress = SilentProgressReporter::new();
     let out = filter.apply(&image, &mut progress);
@@ -44,8 +44,7 @@ fn geometrify_process(data: Data) -> &'static str {
 }
 
 fn main() {
-    rocket::ignite().mount("/", routes![
-        index,
-        geometrify_process
-    ]).launch();
+    rocket::ignite()
+        .mount("/", routes![index, geometrify_process])
+        .launch();
 }

src/lib.rs

@@ -71,14 +71,14 @@ pub struct SilentProgressReporter;
 
 impl SilentProgressReporter {
     pub fn new() -> SilentProgressReporter {
-        SilentProgressReporter { }
+        SilentProgressReporter {}
     }
 }
 
 impl ProgressReporter for SilentProgressReporter {
-    fn init(&mut self, _: u64) { }
-    fn step(&mut self) { }
-    fn finish(&mut self) { }
+    fn init(&mut self, _: u64) {}
+    fn step(&mut self) {}
+    fn finish(&mut self) {}
 }
 
 pub trait Filter {