From 94c821e09d2b75756dd3dfa2d5f508b079413cf1 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 30 Apr 2015 17:13:56 +0200 Subject: [PATCH] fix(CLI): adjust `JsonTokenStorage` to yup-oauth Signature of `set()` changed to return a `Result<(), _>` instead of an `Option<_>`. Related to https://github.com/Byron/yup-oauth2/issues/5 [skip ci] --- src/rust/cli/cmn.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/rust/cli/cmn.rs b/src/rust/cli/cmn.rs index f2a91ef419..1ac51088a0 100644 --- a/src/rust/cli/cmn.rs +++ b/src/rust/cli/cmn.rs @@ -212,27 +212,27 @@ impl TokenStorage for JsonTokenStorage { type Error = json::Error; // NOTE: logging might be interesting, currently we swallow all errors - fn set(&mut self, scope_hash: u64, _: &Vec<&str>, token: Option) -> Option { + fn set(&mut self, scope_hash: u64, _: &Vec<&str>, token: Option) -> Result<(), json::Error> { match token { None => { match fs::remove_file(self.path(scope_hash)) { Err(err) => match err.kind() { - io::ErrorKind::NotFound => None, - _ => Some(json::Error::IoError(err)) + io::ErrorKind::NotFound => Ok(()), + _ => Err(json::Error::IoError(err)) }, - Ok(_) => None + Ok(_) => Ok(()), } } Some(token) => { match fs::OpenOptions::new().create(true).write(true).open(&self.path(scope_hash)) { Ok(mut f) => { match json::to_writer_pretty(&mut f, &token) { - Ok(_) => None, - Err(io_err) => Some(json::Error::IoError(io_err)), + Ok(_) => Ok(()), + Err(io_err) => Err(json::Error::IoError(io_err)), } }, - Err(io_err) => Some(json::Error::IoError(io_err)) + Err(io_err) => Err(json::Error::IoError(io_err)) } } }