OMGeeky/google-apis-rs
1
0
Fork 0
mirror of https://github.com/OMGeeky/google-apis-rs.git synced 2025-12-30 08:08:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore(serde): upgrade to 0.7

Browse Source 
Desired feature: ignore unknown fields, which is now on by default.
This commit is contained in:
Sebastian Thiel
2016-02-27 12:30:09 +01:00
parent 4878fcb803
commit be0faf0e1d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mako/Cargo.toml.mako
View File

@@ -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}

10
src/rust/cli/cmn.rs
View File

@@ -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(