Skip to content

Commit 9e8a047

Browse files
author
Sebastian Thiel
committed
fix(cli): compatibility with serde 0.6
0.7 has a weird assertion error that might have happened if files get too large.
1 parent 33f2813 commit 9e8a047

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/rust/cli/cmn.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ impl TokenStorage for JsonTokenStorage {
412412
Err(err) =>
413413
match err.kind() {
414414
io::ErrorKind::NotFound => Ok(()),
415-
_ => Err(json::Error::Io(err))
415+
_ => Err(json::Error::IoError(err))
416416
},
417417
Ok(_) => Ok(()),
418418
}
@@ -425,7 +425,7 @@ impl TokenStorage for JsonTokenStorage {
425425
Err(serde_err) => Err(serde_err),
426426
}
427427
},
428-
Err(io_err) => Err(json::Error::Io(io_err))
428+
Err(io_err) => Err(json::Error::IoError(io_err))
429429
}
430430
}
431431
}
@@ -442,7 +442,7 @@ impl TokenStorage for JsonTokenStorage {
442442
Err(io_err) => {
443443
match io_err.kind() {
444444
io::ErrorKind::NotFound => Ok(None),
445-
_ => Err(json::Error::Io(io_err))
445+
_ => Err(json::Error::IoError(io_err))
446446
}
447447
}
448448
}
@@ -681,7 +681,7 @@ pub fn application_secret_from_directory(dir: &str,
681681
= json::from_str(json_console_secret).unwrap();
682682
match json::to_writer_pretty(&mut f, &console_secret) {
683683
Err(serde_err) => match serde_err {
684-
json::Error::Io(err) => err,
684+
json::Error::IoError(err) => err,
685685
_ => panic!("Unexpected serde error: {:#?}", serde_err)
686686
},
687687
Ok(_) => continue,
@@ -694,7 +694,7 @@ pub fn application_secret_from_directory(dir: &str,
694694
},
695695
Ok(f) => {
696696
match json::de::from_reader::<_, ConsoleApplicationSecret>(f) {
697-
Err(json::Error::Io(err)) =>
697+
Err(json::Error::IoError(err)) =>
698698
return secret_io_error(err),
699699
Err(json_err) =>
700700
return Err(CLIError::Configuration(

0 commit comments

Comments
 (0)