Merge pull request #39 from babariviere/master

Migration from rustc_serialize to serde

Author: maciejkula

Cargo.toml

@@ -19,16 +19,18 @@ build = "build.rs"
 
 [dependencies]
 rand = "0.3"
-rustc-serialize = "0.3.16"
 crossbeam = "0.2.9"
+serde = "1.0"
+serde_derive = "1.0"
 
 [build-dependencies]
 gcc = "0.3"
 
 [dev-dependencies]
-bincode = "0.6.0"
+bincode = "1.0"
 csv = "0.14"
 hyper = "0.7.0"
+serde_json = "1.0"
 time = "0.1"
 
 [features]

readme.md

@@ -53,7 +53,7 @@ A number of models support both parallel model fitting and prediction.
 
 ### Model serialization
 
-Model serialization is supported via `rustc_serialize`. This will probably change to `serde` once compiler plugins land in stable.
+Model serialization is supported via `serde`.
 
 ## Using `rustlearn`
 Usage should be straightforward.
@@ -139,9 +139,8 @@ model.fit(&data, &target).unwrap();
 
 // Optionally serialize and deserialize the model
 
-// let encoded = bincode::rustc_serialize::encode(&model,
-//                                                bincode::SizeLimit::Infinite).unwrap();
-// let decoded: OneVsRestWrapper<RandomForest> = bincode::rustc_serialize::decode(&encoded).unwrap();
+// let encoded = bincode::serialize(&model).unwrap();
+// let decoded: OneVsRestWrapper<RandomForest> = bincode::deserialize(&encoded).unwrap();
 
 let prediction = model.predict(&data).unwrap();
 ```