Auto merge of rust-num#73 - Ms2ger:num, r=oli-obk

Use num_traits.

Author: homu

json/Cargo.toml

@@ -14,5 +14,5 @@ nightly-testing = ["clippy"]
 
 [dependencies]
 serde = "^0.7.0"
-num = { version = "~0.1.27", default-features = false }
+num-traits = "~0.1.32"
 clippy = { version = "^0.*", optional = true }

json/src/lib.rs

@@ -116,7 +116,7 @@
 
 #![cfg_attr(feature = "nightly-testing", plugin(clippy))]
 #![deny(missing_docs)]
-extern crate num;
+extern crate num_traits;
 extern crate core;
 extern crate serde;
 

json/src/value.rs

@@ -39,7 +39,7 @@ use std::io;
 use std::str;
 use std::vec;
 
-use num::NumCast;
+use num_traits::NumCast;
 
 use serde::de;
 use serde::ser;

json_tests/Cargo.toml

@@ -18,7 +18,7 @@ syntex = { version = "*", optional = true }
 [dependencies]
 clippy = { version = "^0.*", optional = true }
 indoc = "*"
-num = "*"
+num-traits = "*"
 rustc-serialize = "*"
 serde = "*"
 serde_json = { version = "*", path = "../json" }

json_tests/benches/bench.rs

@@ -6,7 +6,7 @@
 
 #![feature(test)]
 
-extern crate num;
+extern crate num_traits;
 extern crate rustc_serialize;
 extern crate serde;
 extern crate serde_json;

json_tests/benches/bench_log.rs

@@ -1,5 +1,5 @@
 use std::io::{self, Read, Write};
-use num::FromPrimitive;
+use num_traits::FromPrimitive;
 use test::{Bencher, black_box};
 
 use rustc_serialize;