Merge branch 'drop_rustc_serialization' of https://github.com/TheServerAsterisk/juniper into TheServerAsterisk-drop_rustc_serialization

# Conflicts:
#	examples/server.rs

Author: mhallin

.travis.yml

@@ -7,8 +7,8 @@ rust:
   - nightly
 
   # The two most recent stable releases before "stable"
-  - 1.13.0
-  - 1.14.0
+  - 1.15.0
+  - 1.16.0
 
 matrix:
   allow_failures:

Cargo.toml

@@ -20,15 +20,18 @@ name = "server"
 required-features = ["iron-handlers", "expose-test-schema"]
 
 [features]
-default = ["rustc-serialize"]
+default = ["serde", "serde_json"]
 nightly = []
-iron-handlers = ["iron", "rustc-serialize"]
+iron-handlers = ["iron", "default", "serde_derive", "urlencoded"]
 expose-test-schema = []
 
 [dependencies]
-rustc-serialize = { version = "^0.3.19", optional = true }
 iron = { version = "^0.5.1", optional = true }
 serde = { version = "^0.9.1", optional = true }
+serde_json = {version ="^0.9.1", optional = true }
+serde_derive = {version="^0.9.1", optional = true }
+urlencoded = {version="0.5", optional=true}
+
 
 [dev-dependencies]
 iron = "^0.5.1"

examples/server.rs

@@ -1,7 +1,7 @@
 extern crate iron;
 extern crate mount;
 extern crate logger;
-extern crate rustc_serialize;
+extern crate serde;
 extern crate juniper;
 
 use std::env;