From 8e0d91bb24e15bdab7149871094e25c4ebe88985 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <programble@gmail.com>
Date: Sat, 28 Nov 2015 14:44:01 -0500
Subject: [PATCH] Add Json variant to Error

---
 src/error.rs | 8 +++++++-
 src/lib.rs   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/error.rs b/src/error.rs
index 474b741..7ac6183 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,7 +1,8 @@
 use std::{error, fmt, io, result};
 
-use url;
 use hyper;
+use rustc_serialize::json;
+use url;
 
 /// Errors that can occur during authentication flow.
 #[derive(Debug)]
@@ -9,6 +10,7 @@ pub enum Error {
     Io(io::Error),
     Url(url::ParseError),
     Hyper(hyper::Error),
+    Json(json::DecoderError),
     Todo,
 }
 
@@ -21,6 +23,7 @@ impl fmt::Display for Error {
             Error::Io(ref err) => write!(f, "{}", err),
             Error::Url(ref err) => write!(f, "{}", err),
             Error::Hyper(ref err) => write!(f, "{}", err),
+            Error::Json(ref err) => write!(f, "{}", err),
             Error::Todo => write!(f, "Not implemented!"),
         }
     }
@@ -32,6 +35,7 @@ impl error::Error for Error {
             Error::Io(_) => "OAuth2 IO error",
             Error::Url(_) => "OAuth2 URL error",
             Error::Hyper(_) => "OAuth2 Hyper error",
+            Error::Json(_) => "OAuth2 JSON error",
             Error::Todo => "OAuth2 not implemented error",
         }
     }
@@ -41,6 +45,7 @@ impl error::Error for Error {
             Error::Io(ref err) => Some(err),
             Error::Url(ref err) => Some(err),
             Error::Hyper(ref err) => Some(err),
+            Error::Json(ref err) => Some(err),
             _ => None,
         }
     }
@@ -59,3 +64,4 @@ macro_rules! impl_from {
 impl_from!(Error::Io, io::Error);
 impl_from!(Error::Url, url::ParseError);
 impl_from!(Error::Hyper, hyper::Error);
+impl_from!(Error::Json, json::DecoderError);
diff --git a/src/lib.rs b/src/lib.rs
index 60522ed..f9376ef 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,6 @@
 extern crate chrono;
 extern crate hyper;
+extern crate rustc_serialize;
 extern crate url;
 
 pub use client::Client;