OMGeeky/google-apis-rs
1
0
Fork 0
mirror of https://github.com/OMGeeky/google-apis-rs.git synced 2026-01-01 09:03:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): compatibility with serde 0.6

Browse Source 
0.7 has a weird assertion error that might have happened
if files get too large.
This commit is contained in:
Sebastian Thiel
2016-04-10 12:59:59 +02:00
parent 33f281360a
commit 9e8a047ebf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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::Io(err))
_ => Err(json::Error::IoError(err))
},
Ok(_) => Ok(()),
}
@@ -425,7 +425,7 @@ impl TokenStorage for JsonTokenStorage {
Err(serde_err) => Err(serde_err),
}
},
Err(io_err) => Err(json::Error::Io(io_err))
Err(io_err) => Err(json::Error::IoError(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::Io(io_err))
_ => Err(json::Error::IoError(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::Io(err) => err,
json::Error::IoError(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::Io(err)) =>
Err(json::Error::IoError(err)) =>
return secret_io_error(err),
Err(json_err) =>
return Err(CLIError::Configuration(