Merge pull request #21 from oli-obk/master

Update to serde 1.0

Author: killercup

Cargo.toml

@@ -9,6 +9,6 @@ version = "0.1.0"
 clap = "2.9.2"
 colored = "1.2.0"
 quick-error = "1.1.0"
-serde = "0.8"
-serde_json = "0.8"
-serde_derive = "0.8"
+serde = "1.0"
+serde_json = "1.0"
+serde_derive = "1.0"

src/lib.rs

@@ -1,4 +1,3 @@
-#![feature(proc_macro)]
 #[macro_use]
 extern crate serde_derive;
 extern crate serde_json;