run cargo fmt over 4in2 example

examples/embedded_linux_epd4in2/src/main.rs

@@ -1,17 +1,14 @@
 // the library for the embedded linux device
 extern crate linux_embedded_hal as lin_hal;
 use lin_hal::spidev::{self, SpidevOptions};
-use lin_hal::{Pin, Spidev};
 use lin_hal::sysfs_gpio::Direction;
 use lin_hal::Delay;
+use lin_hal::{Pin, Spidev};
 
 // the eink library
 extern crate epd_waveshare;
 use epd_waveshare::{
-    epd4in2::{
+    epd4in2::{Buffer4in2, EPD4in2},
-        EPD4in2,
-        Buffer4in2,
-    },
     graphics::{Display, DisplayRotation},
     prelude::*,
 };
@@ -19,7 +16,7 @@ use epd_waveshare::{
 // Graphics
 extern crate embedded_graphics;
 use embedded_graphics::coord::Coord;
-use embedded_graphics::fonts::{Font6x8, Font12x16};
+use embedded_graphics::fonts::{Font12x16, Font6x8};
 use embedded_graphics::prelude::*;
 use embedded_graphics::primitives::{Circle, Line};
 use embedded_graphics::Drawing;
@@ -37,9 +34,8 @@ fn main() {
 }
 
 fn run() -> Result<(), std::io::Error> {
-
     // Configure SPI
-    // Settings are taken from 
+    // Settings are taken from
     let mut spi = Spidev::open("/dev/spidev0.0").expect("spidev directory");
     let options = SpidevOptions::new()
         .bits_per_word(8)
@@ -49,13 +45,13 @@ fn run() -> Result<(), std::io::Error> {
     spi.configure(&options).expect("spi configuration");
 
     // Configure Digital I/O Pin to be used as Chip Select for SPI
-    let cs = Pin::new(26);//BCM7 CE0
+    let cs = Pin::new(26); //BCM7 CE0
     cs.export().expect("cs export");
     while !cs.is_exported() {}
     cs.set_direction(Direction::Out).expect("CS Direction");
     cs.set_value(1).expect("CS Value set to 1");
 
-    let busy = Pin::new(5);//pin 29
+    let busy = Pin::new(5); //pin 29
     busy.export().expect("busy export");
     while !busy.is_exported() {}
     busy.set_direction(Direction::In).expect("busy Direction");
@@ -71,58 +67,58 @@ fn run() -> Result<(), std::io::Error> {
     rst.export().expect("rst export");
     while !rst.is_exported() {}
     rst.set_direction(Direction::Out).expect("rst Direction");
-    rst.set_value(1).expect("rst Value set to 1");   
+    rst.set_value(1).expect("rst Value set to 1");
 
     let mut delay = Delay {};
 
-    
+    let mut epd4in2 =
-    let mut epd4in2 = EPD4in2::new(&mut spi, cs, busy, dc, rst, &mut delay).expect("eink initalize error");
+        EPD4in2::new(&mut spi, cs, busy, dc, rst, &mut delay).expect("eink initalize error");
 
     println!("Test all the rotations");
     let mut buffer = Buffer4in2::default();
     let mut display = Display::new(epd4in2.width(), epd4in2.height(), &mut buffer.buffer);
     display.set_rotation(DisplayRotation::Rotate0);
     display.draw(
-            Font6x8::render_str("Rotate 0!")
+        Font6x8::render_str("Rotate 0!")
-                .with_stroke(Some(Color::Black))
+            .with_stroke(Some(Color::Black))
-                .with_fill(Some(Color::White))                
+            .with_fill(Some(Color::White))
-                .translate(Coord::new(5, 50))
+            .translate(Coord::new(5, 50))
-                .into_iter(),
+            .into_iter(),
     );
 
     display.set_rotation(DisplayRotation::Rotate90);
     display.draw(
-            Font6x8::render_str("Rotate 90!")
+        Font6x8::render_str("Rotate 90!")
-                .with_stroke(Some(Color::Black))
+            .with_stroke(Some(Color::Black))
-                .with_fill(Some(Color::White))
+            .with_fill(Some(Color::White))
-                .translate(Coord::new(5, 50))
+            .translate(Coord::new(5, 50))
-                .into_iter(),
+            .into_iter(),
     );
 
     display.set_rotation(DisplayRotation::Rotate180);
     display.draw(
-            Font6x8::render_str("Rotate 180!")
+        Font6x8::render_str("Rotate 180!")
-                .with_stroke(Some(Color::Black))
+            .with_stroke(Some(Color::Black))
-                .with_fill(Some(Color::White))
+            .with_fill(Some(Color::White))
-                .translate(Coord::new(5, 50))
+            .translate(Coord::new(5, 50))
-                .into_iter(),
+            .into_iter(),
     );
 
     display.set_rotation(DisplayRotation::Rotate270);
     display.draw(
-            Font6x8::render_str("Rotate 270!")
+        Font6x8::render_str("Rotate 270!")
-                .with_stroke(Some(Color::Black))
+            .with_stroke(Some(Color::Black))
-                .with_fill(Some(Color::White))
+            .with_fill(Some(Color::White))
-                .translate(Coord::new(5, 50))
+            .translate(Coord::new(5, 50))
-                .into_iter(),
+            .into_iter(),
     );
 
-
     epd4in2.update_frame(&mut spi, &display.buffer()).unwrap();
-    epd4in2.display_frame(&mut spi).expect("display frame new graphics");
+    epd4in2
+        .display_frame(&mut spi)
+        .expect("display frame new graphics");
     delay.delay_ms(5000u16);
 
-
     println!("Now test new graphics with default rotation and some special stuff:");
     display.clear_buffer(Color::White);
 
@@ -168,12 +164,11 @@ fn run() -> Result<(), std::io::Error> {
             .translate(Coord::new(50, 200))
             .into_iter(),
     );
-    
 
     // a moving `Hello World!`
     let limit = 10;
     for i in 0..limit {
-        println!("Moving Hello World. Loop {} from {}", (i+1), limit);
+        println!("Moving Hello World. Loop {} from {}", (i + 1), limit);
 
         display.draw(
             Font6x8::render_str("  Hello World! ")
@@ -182,17 +177,18 @@ fn run() -> Result<(), std::io::Error> {
                     stroke_color: Some(Color::Black),
                     stroke_width: 0u8, // Has no effect on fonts
                 })
-                .translate(Coord::new(5 + i*12, 50))
+                .translate(Coord::new(5 + i * 12, 50))
                 .into_iter(),
-        );        
+        );
 
         epd4in2.update_frame(&mut spi, &display.buffer()).unwrap();
-        epd4in2.display_frame(&mut spi).expect("display frame new graphics");
+        epd4in2
+            .display_frame(&mut spi)
+            .expect("display frame new graphics");
 
         delay.delay_ms(1_000u16);
     }
 
-
     println!("Finished tests - going to sleep");
     epd4in2.sleep(&mut spi)
-}   
+}