Updated all dependencies. Fixes #5

Cargo.toml

@@ -9,13 +9,13 @@ keywords = ["game", "sokoban"]
 license = "Apache-2.0"
 
 [dependencies]
-bitflags = "0.3.2"
-sdl2 = "0.8.0"
-sdl2_image = "0.2.5"
-sdl2_ttf = "0.6.1"
-xml-rs = "0.1.25"
+bitflags = "0.3.3"
+sdl2 = "0.12.0"
+sdl2_image = "0.6.0"
+sdl2_ttf = "0.10.0"
+xml-rs = "0.2.2"
 
 [dependencies.clap]
-clap = "1.4.0"
+clap = "1.5.3"
 features = ["yaml"]
 

src/main.rs

@@ -33,7 +33,7 @@ use sdl2::event::Event;
 use sdl2::keyboard::Keycode;
 use sdl2_image::INIT_PNG;
 use xml::reader::EventReader;
-use xml::reader::events::*;
+use xml::reader::XmlEvent;
 
 pub mod error;
 pub mod game;
@@ -72,7 +72,7 @@ pub fn main() {
         .unwrap_or_else(|err| panic!("Failed to get an SDL renderer for the main window: {}", err));
 
     sdl2_image::init(INIT_PNG);
-    sdl2_ttf::init();
+    let _ttf = sdl2_ttf::init();
 
     let mut drawer = Drawer::new(renderer);
 
@@ -125,7 +125,6 @@ pub fn main() {
             _ => {}
         }
     }
-    sdl2_ttf::quit();
     sdl2_image::quit();
 }
 
@@ -134,14 +133,14 @@ fn load_slc_file(path: &Path) -> Result<Vec<Level>, error::SokobanError> {
     let mut collection = Vec::new();
     let file = try!(File::open(&path));
     let reader = BufReader::new(file);
-    let mut parser = EventReader::new(reader);
+    let parser = EventReader::new(reader);
 
     let mut level_title = String::new();
     let mut level_str = String::new();
     let mut reading_level = false;
-    for e in parser.events() {
+    for e in parser {
         match e {
-            XmlEvent::StartElement { ref name, ref attributes, .. } => {
+            Ok(XmlEvent::StartElement { ref name, ref attributes, .. }) => {
                 if name.local_name == "L" {
                     reading_level = true;
                 } else if name.local_name == "Level" {
@@ -150,15 +149,15 @@ fn load_slc_file(path: &Path) -> Result<Vec<Level>, error::SokobanError> {
                     }
                 }
             }
-            XmlEvent::EndElement { name } => {
+            Ok(XmlEvent::EndElement { name }) => {
                 if name.local_name == "Level" {
                     let mut level = try!(Level::from_str(&level_str));
                     level.set_title(level_title.clone());
                     collection.push(level);
                     level_str.clear();
                 }
             }
-            XmlEvent::Characters(ref data) => {
+            Ok(XmlEvent::Characters(ref data)) => {
                 if reading_level {
                     level_str.push_str(data);
                     level_str.push('\n');

src/render.rs

@@ -20,7 +20,7 @@ use sdl2::rect::Rect;
 use sdl2::pixels::{Color, PixelFormatEnum};
 use sdl2::render::{Renderer, Texture};
 use sdl2_image::LoadTexture;
-use sdl2_ttf::Font;
+use sdl2_ttf::{self, Font};
 
 use game::{Level, Position, Direction};
 
@@ -160,7 +160,7 @@ impl<'a> Drawer<'a> {
 
     /// Draws text in the status bar
     fn draw_status_text(&mut self, text: &str, location: StatusBarLocation) {
-        let surface = self.font.render_str_blended(text, self.bar_text_color).unwrap();
+        let surface = self.font.render(text, sdl2_ttf::blended(self.bar_text_color)).unwrap();
         let texture = self.renderer.create_texture_from_surface(&surface).unwrap();
         let margin = 4;
         let (w, h) = {