1 files changed, 52 insertions, 37 deletions

diff --git a/src/app.rs b/src/app.rs
index 83e30e8..2e14dbc 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,5 +1,5 @@
 use crate::{
-    bitmap::{positive_angle_with_x, abs_difference, Axis, MapPoint, Pixmap},
+    bitmap::{abs_difference, positive_angle_with_x, Axis, MapPoint, Pixmap},
     brush::{Brush, CircleBrush, LineBrush, RectSelectBrush},
     cache::Cache,
     command::CommandBox,
@@ -458,27 +458,34 @@ impl<'ctx> AppState<'ctx> {
                             "{:.width$}°",
                             angle,
                             width = if (angle - ANGLE).abs() < 1e-3 { 3 } else { 0 }
-                            ),
-                            PINK,
-                            (self.mouse.0 + size as i32, self.mouse.1 + size as i32),
-                            );
+                        ),
+                        PINK,
+                        (self.mouse.0 + size as i32, self.mouse.1 + size as i32),
+                    );
                     for MapPoint { x, y } in line.into_iter() {
                         self.canvas.set_draw_color(PINK);
                         self.canvas
                             .fill_rect(Rect::new(
-                                    x as i32 * cs as i32 + self.start.x(),
-                                    y as i32 * cs as i32 + self.start.y(),
-                                    cs,
-                                    cs,
-                                    ))
+                                x as i32 * cs as i32 + self.start.x(),
+                                y as i32 * cs as i32 + self.start.y(),
+                                cs,
+                                cs,
+                            ))
                             .unwrap();
                     }
                 }
             }
-            Brush::RectSelect(RectSelectBrush { start: Some(s), end: Some(e), active_end }) => {
+            Brush::RectSelect(RectSelectBrush {
+                start: Some(s),
+                end: Some(e),
+                ..
+            }) => {
                 self.canvas.set_draw_color(PINK);
                 let (width, height) = (abs_difference(s.x, e.x), abs_difference(s.y, e.y));
-                let MapPoint{x: start_x, y: start_y} = utils::rect_coords(s, e).0;
+                let MapPoint {
+                    x: start_x,
+                    y: start_y,
+                } = utils::rect_coords(s, e).0;
                 let start_loc_x = self.start.x() + (start_x * cs) as i32;
                 let start_loc_y = self.start.y() + (start_y * cs) as i32;
                 draw_text(
@@ -488,11 +495,11 @@ impl<'ctx> AppState<'ctx> {
                     PINK,
                     (start_loc_x, start_loc_y - 20),
                 );
-                self.canvas.draw_rect(
-                    rect!(start_loc_x, start_loc_y, width * cs, height * cs)
-                    ).unwrap();
+                self.canvas
+                    .draw_rect(rect!(start_loc_x, start_loc_y, width * cs, height * cs))
+                    .unwrap();
             }
-            _ => ()
+            _ => (),
         }
     }
 
@@ -748,7 +755,7 @@ impl<'ctx> AppState<'ctx> {
                                     Keycode::Escape => {
                                         match self.brush {
                                             Brush::RectSelect(_) => self.brush = Brush::rect(),
-                                            _ => ()
+                                            _ => (),
                                         }
                                         continue;
                                     }
@@ -879,42 +886,50 @@ impl<'ctx> AppState<'ctx> {
                             } => {
                                 if mousestate.is_mouse_button_pressed(MouseButton::Left) {
                                     match self.brush {
-                                        Brush::RectSelect(RectSelectBrush{start, end, active_end}) => {
+                                        Brush::RectSelect(RectSelectBrush {
+                                            start,
+                                            end,
+                                            active_end,
+                                        }) => {
                                             if active_end {
-                                                self.brush = Brush::RectSelect(RectSelectBrush{
+                                                self.brush = Brush::RectSelect(RectSelectBrush {
                                                     start,
-                                                    end: self.idx_at_coord((x, y)).map(MapPoint::from),
-                                                    active_end
+                                                    end: self
+                                                        .idx_at_coord((x, y))
+                                                        .map(MapPoint::from),
+                                                    active_end,
                                                 });
                                             } else {
-                                                self.brush = Brush::RectSelect(RectSelectBrush{
-                                                    start: self.idx_at_coord((x, y)).map(MapPoint::from),
+                                                self.brush = Brush::RectSelect(RectSelectBrush {
+                                                    start: self
+                                                        .idx_at_coord((x, y))
+                                                        .map(MapPoint::from),
                                                     end,
-                                                    active_end
+                                                    active_end,
                                                 });
                                             }
-                                        },
-                                        Brush::Circle(CircleBrush { size }) 
+                                        }
+                                        Brush::Circle(CircleBrush { size })
                                         | Brush::Line(LineBrush { size, .. }) => {
                                             let pt = (x, y);
                                             let val = self.active_color;
                                             if let Ok(o) = self.paint_point(pt, val, size) {
                                                 self.current_operation.extend(o);
                                             }
-                                        },
-                                        _ => ()
+                                        }
+                                        _ => (),
                                     }
                                 } else if mousestate.is_mouse_button_pressed(MouseButton::Right) {
                                     match self.brush {
-                                        Brush::Circle(CircleBrush { size }) 
-                                            | Brush::Line(LineBrush { size, .. }) => {
-                                                let pt = (x, y);
-                                                let val = !self.active_color;
-                                                if let Ok(o) = self.paint_point(pt, val, size) {
-                                                    self.current_operation.extend(o);
-                                                }
-                                            },
-                                        _ => ()
+                                        Brush::Circle(CircleBrush { size })
+                                        | Brush::Line(LineBrush { size, .. }) => {
+                                            let pt = (x, y);
+                                            let val = !self.active_color;
+                                            if let Ok(o) = self.paint_point(pt, val, size) {
+                                                self.current_operation.extend(o);
+                                            }
+                                        }
+                                        _ => (),
                                     }
                                 }
                             }