Running rustfmt 1.28

canselcik · Jun 22, 2018 · 8ac1b7a · 8ac1b7a
1 parent c38a0a6
commit 8ac1b7a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/src/appctx.rs b/src/appctx.rs
@@ -324,7 +324,8 @@ impl<'a> ApplicationContext<'a> {
     }
 
     pub fn draw_elements(&mut self) {
-        let mut elems: std::vec::Vec<UIElementHandle> = self.ui_elements
+        let mut elems: std::vec::Vec<UIElementHandle> = self
+            .ui_elements
             .iter()
             .map(|(_key, value)| value.clone())
             .collect();

diff --git a/src/framebuffer/common.rs b/src/framebuffer/common.rs
@@ -146,7 +146,9 @@ impl mxcfb_rect {
 
 impl mxcfb_rect {
     pub fn contains_point(&self, y: u32, x: u32) -> bool {
-        !(x < self.left || x > (self.left + self.width) || y < self.top
+        !(x < self.left
+            || x > (self.left + self.width)
+            || y < self.top
             || y > (self.top + self.height))
     }
 }

diff --git a/src/framebuffer/draw.rs b/src/framebuffer/draw.rs
@@ -28,9 +28,11 @@ fn sample_bezier(startpt: (f32, f32), ctrlpt: (f32, f32), endpt: (f32, f32)) ->
     for i in 0..1000 {
         let t = (i as f32) / 1000.0;
         let precisept = (
-            (1.0 - t).powf(2.0) * startpt.0 + 2.0 * (1.0 - t) * t * ctrlpt.0
+            (1.0 - t).powf(2.0) * startpt.0
+                + 2.0 * (1.0 - t) * t * ctrlpt.0
                 + t.powf(2.0) * endpt.0,
-            (1.0 - t).powf(2.0) * startpt.1 + 2.0 * (1.0 - t) * t * ctrlpt.1
+            (1.0 - t).powf(2.0) * startpt.1
+                + 2.0 * (1.0 - t) * t * ctrlpt.1
                 + t.powf(2.0) * endpt.1,
         );
         let pt = (precisept.0 as i32, precisept.1 as i32);

diff --git a/src/framebuffer/io.rs b/src/framebuffer/io.rs
@@ -78,7 +78,8 @@ impl<'a> framebuffer::FramebufferIO for framebuffer::core::Framebuffer<'a> {
                     x,
                     y,
                     Rgba {
-                        data: self.read_pixel((rect.top + y) as usize, (rect.left + x) as usize)
+                        data: self
+                            .read_pixel((rect.top + y) as usize, (rect.left + x) as usize)
                             .as_native(),
                     },
                 );

diff --git a/src/input/ev.rs b/src/input/ev.rs
@@ -65,7 +65,8 @@ impl EvDevContext {
             Err(e) => error!("Error while reading events from epoll fd: {0}", e),
             Ok(mut dev) => {
                 let mut v = vec![epoll::Event {
-                    events: (epoll::Events::EPOLLET | epoll::Events::EPOLLIN
+                    events: (epoll::Events::EPOLLET
+                        | epoll::Events::EPOLLIN
                         | epoll::Events::EPOLLPRI)
                         .bits(),
                     data: 0,