Moved main loop to App

[kaka/rust-sdl-test.git] / src / common.rs

diff --git a/src/common.rs b/src/common.rs
index f5ebb6e..283640e 100644 (file)
--- a/src/common.rs
+++ b/src/common.rs
@@ -2,7 +2,9 @@ use std::ops::{Add, AddAssign, Mul};
 
 #[macro_export]
 macro_rules! point {
-    ( $x:expr, $y:expr ) => { Point2D { x:$x, y:$y } };
+    ( $x:expr, $y:expr ) => {
+        Point2D { x: $x, y: $y }
+    };
 }
 
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -17,11 +19,14 @@ impl Point2D<f64> {
     }
 }
 
-impl<T: Add<Output=T>> Add for Point2D<T> {
+impl<T: Add<Output = T>> Add for Point2D<T> {
     type Output = Point2D<T>;
 
     fn add(self, rhs: Point2D<T>) -> Self::Output {
-        Point2D { x: self.x + rhs.x, y: self.y + rhs.y }
+        Point2D {
+            x: self.x + rhs.x,
+            y: self.y + rhs.y,
+        }
     }
 }
 
@@ -38,16 +43,19 @@ pub struct Rect<T> {
     pub height: T,
 }
 
-impl<T: Mul<Output=T> + Copy> Rect<T> {
+impl<T: Mul<Output = T> + Copy> Rect<T> {
     #[allow(dead_code)]
     pub fn area(&self) -> T {
-       self.width * self.height
+        self.width * self.height
     }
 }
 
 impl<T> From<(T, T)> for Rect<T> {
     fn from(item: (T, T)) -> Self {
-       Rect { width: item.0, height: item.1 }
+        Rect {
+            width: item.0,
+            height: item.1,
+        }
     }
 }
 
@@ -75,7 +83,7 @@ mod tests {
     #[test]
     fn area_for_rect_of_multipliable_type() {
         let r: Rect<_> = (30, 20).into(); // the Into trait uses the From trait
-       assert_eq!(r.area(), 30 * 20);
+        assert_eq!(r.area(), 30 * 20);
         // let a = Rect::from(("a".to_string(), "b".to_string())).area(); // this doesn't work, because area() is not implemented for String
     }
 }