From 9e8a047ebfddd7a94226b8d559b03325abf7ab54 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sun, 10 Apr 2016 12:59:59 +0200 Subject: [PATCH] fix(cli): compatibility with serde 0.6 0.7 has a weird assertion error that might have happened if files get too large. --- src/rust/cli/cmn.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rust/cli/cmn.rs b/src/rust/cli/cmn.rs index f0263a8b58..2cf4fbacf2 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::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(