Update sdl2.

src/component.rs

@@ -3,10 +3,11 @@ use sdl2::render::Renderer;
 
 use game_object::GameObject;
 
+
 pub trait Updatable {
-    fn update(&self, &GameObject);
+    fn update(&self, object: &GameObject);
 }
 
 pub trait Renderable {
-    fn render(&self, &GameObject, f64, &mut Renderer, &Rect);
+    fn render(&self, object: &GameObject, f64, &mut Renderer, &Rect);
 }

src/main.rs

@@ -1,12 +1,11 @@
 extern crate sdl2;
-extern crate sdl2_image;
 
 use std::path::Path;
 
-use sdl2_image::LoadTexture;
 use sdl2::rect::Rect;
 use sdl2::keyboard::Keycode;
 use sdl2::pixels::Color;
+use sdl2::image::LoadTexture;
 
 use tile::Layer;
 use camera::Camera;
@@ -56,7 +55,7 @@ fn main() {
     let sdl_context = sdl2::init().unwrap();
     let video_subsystem = sdl_context.video().unwrap();
 
-    let _ = sdl2_image::init(sdl2_image::INIT_PNG).unwrap();
+    let _ = sdl2::image::init(sdl2::image::INIT_PNG).unwrap();
 
     let window = video_subsystem.window("Super Matte Bros", SCREEN_WIDTH, SCREEN_HEIGHT).position_centered().build().unwrap();
     let mut renderer = window.renderer().software().build().unwrap();
@@ -171,7 +170,7 @@ fn main() {
 
     let mut event_pump = sdl_context.event_pump().unwrap();
 
-    'main : loop {
+    'main: loop {
         let current = timer.current_time();
         let elapsed = current - previous;