chore: updates serde::json to serde_json crate

Author: kbknapp

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "doapi"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Kevin K. <kbknapp@gmail.com>"]
 description = "A wrapper library for the DigitalOcean API v2"
 license = "MIT"
@@ -10,10 +10,11 @@ readme = "README.md"
 keywords = ["do", "lib", "digitalocean", "digital", "ocean"]
 
 [dependencies]
-hyper = "*"
-regex = "*"
-serde_macros = "*"
-serde = "*"
+hyper = "~0.6.11"
+regex = "~0.1.41"
+serde_macros = "~0.5.3"
+serde = "~0.5.3"
+serde_json = "~0.6.0"
 
 [features]
 default = []

src/lib.rs

@@ -2,6 +2,7 @@
 #![plugin(serde_macros)]
 
 extern crate serde;
+extern crate serde_json;
 extern crate hyper;
 extern crate regex;
 

src/request/builder/arrays.rs

@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use serde::json;
+use serde_json;
 
 use request::DoRequest;
 use request::RequestBuilder;
@@ -21,7 +21,7 @@ impl<'t> DoRequest<response::ResponseStringArray> for RequestBuilder<'t, respons
             Ok(ref s) => {
                 debug!("Success");
                 debug!("Retrieving Value");
-                match json::from_str::<response::ResponseStringArray>(s) {
+                match serde_json::from_str::<response::ResponseStringArray>(s) {
                     Ok(ob) => {
                         debug!("Success");
                         Ok(ob)

src/request/builder/dns.rs

@@ -2,7 +2,7 @@ use std::fmt::{self, Write};
 use std::marker::PhantomData;
 
 use hyper::method::Method;
-use serde::json;
+use serde_json;
 
 use response;
 use request::RequestBuilder;
@@ -139,7 +139,7 @@ impl<'t> RequestBuilder<'t, response::DnsRecords> {
             auth: self.auth,
             url: self.url,
             resp_t: PhantomData,
-            body: Some(json::to_string(record).ok().unwrap())
+            body: Some(serde_json::to_string(record).ok().unwrap())
         }
     }
 }

src/request/builder/droplets.rs

@@ -2,7 +2,7 @@ use std::fmt;
 use std::marker::PhantomData;
 
 use hyper::method::Method;
-use serde::json;
+use serde_json;
 
 use response;
 use request::RequestBuilder;
@@ -423,7 +423,7 @@ impl<'t> RequestBuilder<'t, response::Droplets> {
                 auth: self.auth,
                 url: self.url,
                 resp_t: PhantomData,
-                body: Some(json::to_string(&d).ok().unwrap())
+                body: Some(serde_json::to_string(&d).ok().unwrap())
             }
         }
 
@@ -432,7 +432,7 @@ impl<'t> RequestBuilder<'t, response::Droplets> {
             auth: self.auth,
             url: self.url,
             resp_t: PhantomData,
-            body: Some(json::to_string(droplet).ok().unwrap())
+            body: Some(serde_json::to_string(droplet).ok().unwrap())
         }
 
     }

src/request/builder/request.rs

@@ -2,7 +2,8 @@ use std::marker::PhantomData;
 use std::iter::Iterator;
 use std::fmt;
 
-use serde::{json, Deserialize};
+use serde::{Deserialize};
+use serde_json;
 use hyper::method::Method;
 
 use response::{self, RawPagedResponse, NamedResponse, NotArray};
@@ -90,7 +91,7 @@ impl<'t, I> PagedRequest for RequestBuilder<'t, Vec<I>>
                 name.push('s');
                 let re = regex!(&format!("\"{}\"", name));
                 let json_str = &re.replace(&s[..], "\"collection\"");
-                match json::from_str::<response::RawPagedResponse<I>>(json_str) {
+                match serde_json::from_str::<response::RawPagedResponse<I>>(json_str) {
                 // FIXME ^^
                     Ok(val) => {
                         return Ok(val)
@@ -125,7 +126,7 @@ impl<'t, I> DoRequest<Vec<I>> for RequestBuilder<'t, Vec<I>>
                 let re = regex!(&format!("\"{}\"", name));
                 let res = &re.replace(&s[..], "\"collection\"");
                 debug!("Getting object from json string");
-                match json::from_str::<response::RawPagedResponse<I>>(res) {
+                match serde_json::from_str::<response::RawPagedResponse<I>>(res) {
                 // FIXME ^^
                     Ok(mut val) => {
                         debug!("Sucess");

src/request/dorequest.rs

@@ -6,7 +6,7 @@ use hyper::method::Method;
 use hyper::net::Fresh;
 use hyper::header::{ContentType, Authorization};
 
-use serde::json::{self, Value};
+use serde_json::{self, Value};
 use serde::de::Deserialize;
 
 use response::{self, DoError, NamedResponse};
@@ -102,17 +102,17 @@ pub trait DoRequest<T> : BaseRequest
         debug!("inside retrieve_obj() for regular type");
         match self.retrieve_json() {
             Ok(ref s) => {
-                match json::from_str::<Value>(s) {
+                match serde_json::from_str::<Value>(s) {
                     Ok(ob) => {
                         match ob.find(&obj) {
                             Some(t) => {
-                                match json::from_value(t.clone()) {
+                                match serde_json::from_value(t.clone()) {
                                     Ok(t) => Ok(t),
                                     Err(e) => Err(e.to_string())
                                 }
                             },
                             None => {
-                                match json::from_value::<DoError>(ob.clone()) {
+                                match serde_json::from_value::<DoError>(ob.clone()) {
                                     Ok(err) => Err(err.to_string()),
                                     Err(e)  => Err(e.to_string())
                                 }