diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-03-08 12:06:42 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-03-08 12:06:42 +0100 |
commit | cb9f6e7f46eb1a05071947d5f28bb1fe45313734 (patch) | |
tree | 6e5a8e08e5b204f202de335d412de3f69196ce12 /bin/domain/imag-timetrack/src/list.rs | |
parent | 00aa4df88edae1d5eeb3fb365af05f95bd0de3b4 (diff) | |
parent | 666193dfc26181b6606cb85de5389c4ed6ece5eb (diff) |
Merge branch 'replace-failure-with-anyhow'
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'bin/domain/imag-timetrack/src/list.rs')
-rw-r--r-- | bin/domain/imag-timetrack/src/list.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/domain/imag-timetrack/src/list.rs b/bin/domain/imag-timetrack/src/list.rs index d158303b..bf9719be 100644 --- a/bin/domain/imag-timetrack/src/list.rs +++ b/bin/domain/imag-timetrack/src/list.rs @@ -24,9 +24,9 @@ use prettytable::Cell; use kairos::parser::Parsed; use kairos::parser::parse as kairos_parse; use clap::ArgMatches; -use failure::Fallible as Result; -use failure::ResultExt; -use failure::Error; +use anyhow::Result; +use anyhow::Context; +use anyhow::Error; use resiter::Filter; use resiter::AndThen; use resiter::Map; @@ -46,13 +46,14 @@ pub fn list(rt: &Runtime) -> Result<()> { Some(Ok(Parsed::TimeType(tt))) => { let tt = tt .calculate() - .context(format_err!("Failed to calculate date from '{}'", cmd.value_of(name).unwrap()))?; + .map_err(|e| Error::from(e.compat())) + .context(anyhow!("Failed to calculate date from '{}'", cmd.value_of(name).unwrap()))?; Ok(tt.get_moment().cloned()) }, Some(Ok(Parsed::Iterator(_))) => { - Err(format_err!("Expected single point in time, got '{}', which yields a list of dates", cmd.value_of(name).unwrap())) + Err(anyhow!("Expected single point in time, got '{}', which yields a list of dates", cmd.value_of(name).unwrap())) }, - Some(Err(e)) => Err(e), + Some(Err(e)) => Err(Error::from(e.compat())), None => Ok(None), } }; |