Fix build errors

Update settings.rs to use serde_json instead of rustc-serialize
Update dependencies

Closes coeuvre#30

Cargo.toml

@@ -10,7 +10,10 @@ name = "rust-2048"
 path = "src/main.rs"
 
 [dependencies]
-rustc-serialize = "0.3"
+rustc-serialize = "0.3.24"
+serde = "1.0.79"
+serde_json = "1.0.27"
+serde_derive = "1.0.79"
 rand = "0.3.7"
 piston_window = "0.127.0"
 pistoncore-sdl2_window = "0.68.0"

src/main.rs

@@ -1,3 +1,5 @@
+#[macro_use]
+extern crate serde_derive;
 extern crate rustc_serialize;
 extern crate rand;
 extern crate piston_window;

src/settings.rs

@@ -1,9 +1,11 @@
+extern crate serde;
+extern crate serde_json;
 
+use self::serde_json::Error;
 use std::env::current_exe;
-use std::io::{BufWriter, BufReader, Write};
-use std::fs::{File};
+use std::fs::File;
+use std::io::{BufReader, BufWriter, Write};
 use std::path::Path;
-use rustc_serialize::{ json, Encodable, Decodable };
 
 static SETTING_FILENAME: &'static str = "settings.json";
 
@@ -39,7 +41,7 @@ impl Settings {
         Settings::from_settings_in_json(&SettingsInJson::load())
     }
 
-    fn from_settings_in_json<'a>(s: &'a SettingsInJson) -> Settings {
+    fn from_settings_in_json(s: &SettingsInJson) -> Settings {
         let board_size = [
             s.tile_size * s.tile_width as f64 + s.tile_padding * (s.tile_width + 1) as f64,
             s.tile_size * s.tile_height as f64 + s.tile_padding * (s.tile_height + 1) as f64,
@@ -125,7 +127,7 @@ impl Settings {
     }
 }
 
-#[derive(RustcEncodable, RustcDecodable)]
+#[derive(Serialize, Deserialize)]
 struct SettingsInJson {
     asset_folder: String,
 
@@ -229,23 +231,31 @@ impl SettingsInJson {
                 let file = File::open(&path).unwrap();
                 let mut reader = BufReader::new(file);
         */
-            let file = File::open(&path);
+        let file = File::open(&path);
 
-            match file {
-                Err(e) => {
-                    println!("Configuration file can't be open ({}). Try to generate a default one.", e);
-                    let default = SettingsInJson::default_settings();
-                    default.save();
-                    return default;
-                },
-                _ => {}
+        match file {
+            Err(e) => {
+                println!("Configuration file can't be open ({}). Try to generate a default one.", e);
+                let default = SettingsInJson::default_settings();
+                default.save();
+                return default;
             }
+            _ => {}
+        }
 
-            let mut reader = BufReader::new(file.unwrap());
-        // End FIXME
-
-        let mut decoder = json::Decoder::new(json::Json::from_reader(&mut reader).unwrap());
-        Decodable::decode(&mut decoder).unwrap()
+        let mut reader = BufReader::new(file.unwrap());
+        let v: Result<SettingsInJson, Error> = serde_json::from_reader(&mut reader);
+        match v {
+            Ok(settings) => {
+                return settings;
+            }
+            Err(e) => {
+                println!("WARNING: Failed to read settings from file. Try to generate a default one. {}", e);
+                let new_settings = SettingsInJson::default_settings();
+                new_settings.save();
+                return new_settings;
+            }
+        }
     }
 
     pub fn save(&self) {
@@ -260,12 +270,12 @@ impl SettingsInJson {
         let file = File::create(&path.with_file_name(SETTING_FILENAME)).unwrap();
         let mut writer = BufWriter::new(file);
 
-        match json::encode(self) {
+        match serde_json::to_string(self) {
             Ok(encoded) => {
                 if let Err(e) = writer.write(encoded.as_bytes()) {
                     println!("WARNING: Failed to save settings: {}", e);
                 }
-            },
+            }
             Err(e) => {
                 println!("WARNING: Failed to save settings: {}", e);
             }