From be0faf0e1dd02c2efe4e8f903b948ae38596f04a Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Sat, 27 Feb 2016 12:30:09 +0100
Subject: [PATCH] chore(serde): upgrade to 0.7

Desired feature: ignore unknown fields, which is now on by default.
---
 src/mako/Cargo.toml.mako |  4 ++--
 src/rust/cli/cmn.rs      | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mako/Cargo.toml.mako b/src/mako/Cargo.toml.mako
index 49e4243a61..f124f8d26f 100644
--- a/src/mako/Cargo.toml.mako
+++ b/src/mako/Cargo.toml.mako
@@ -29,8 +29,8 @@ name = "${util.program_name()}"
 hyper = "0.7"
 ## Must match the one hyper uses, otherwise there are duplicate similarly named `Mime` structs
 mime = "0.1.0"
-serde = ">= 0.6.0"
-serde_json = ">= 0.6.0"
+serde = ">= 0.7.0"
+serde_json = ">= 0.7.0"
 yup-oauth2 = ">= 0.5.4"
 % for dep in cargo.get('dependencies', list()):
 ${dep}
diff --git a/src/rust/cli/cmn.rs b/src/rust/cli/cmn.rs
index 2cf4fbacf2..f0263a8b58 100644
--- a/src/rust/cli/cmn.rs
+++ b/src/rust/cli/cmn.rs
@@ -412,7 +412,7 @@ impl TokenStorage for JsonTokenStorage {
                     Err(err) =>
                         match err.kind() {
                             io::ErrorKind::NotFound => Ok(()),
-                            _ => Err(json::Error::IoError(err))
+                            _ => Err(json::Error::Io(err))
                         },
                     Ok(_) => Ok(()),
                 }
@@ -425,7 +425,7 @@ impl TokenStorage for JsonTokenStorage {
                             Err(serde_err) => Err(serde_err),
                         }
                     },
-                    Err(io_err) => Err(json::Error::IoError(io_err))
+                    Err(io_err) => Err(json::Error::Io(io_err))
                 }
             }
         }
@@ -442,7 +442,7 @@ impl TokenStorage for JsonTokenStorage {
             Err(io_err) => {
                 match io_err.kind() {
                     io::ErrorKind::NotFound => Ok(None),
-                    _ => Err(json::Error::IoError(io_err))
+                    _ => Err(json::Error::Io(io_err))
                 }
             }
         }
@@ -681,7 +681,7 @@ pub fn application_secret_from_directory(dir: &str,
                                             = json::from_str(json_console_secret).unwrap();
                             match json::to_writer_pretty(&mut f, &console_secret) {
                                 Err(serde_err) => match serde_err {
-                                    json::Error::IoError(err) => err,
+                                    json::Error::Io(err) => err,
                                     _ => panic!("Unexpected serde error: {:#?}", serde_err)
                                 },
                                 Ok(_) => continue,
@@ -694,7 +694,7 @@ pub fn application_secret_from_directory(dir: &str,
             },
             Ok(f) => {
                 match json::de::from_reader::<_, ConsoleApplicationSecret>(f) {
-                    Err(json::Error::IoError(err)) =>
+                    Err(json::Error::Io(err)) =>
                         return secret_io_error(err),
                     Err(json_err) =>
                         return Err(CLIError::Configuration(