summaryrefslogtreecommitdiffstats
path: root/bin/domain/imag-timetrack/src
diff options
context:
space:
mode:
Diffstat (limited to 'bin/domain/imag-timetrack/src')
-rw-r--r--bin/domain/imag-timetrack/src/cont.rs4
-rw-r--r--bin/domain/imag-timetrack/src/day.rs4
-rw-r--r--bin/domain/imag-timetrack/src/lib.rs9
-rw-r--r--bin/domain/imag-timetrack/src/list.rs13
-rw-r--r--bin/domain/imag-timetrack/src/month.rs4
-rw-r--r--bin/domain/imag-timetrack/src/shell.rs12
-rw-r--r--bin/domain/imag-timetrack/src/start.rs4
-rw-r--r--bin/domain/imag-timetrack/src/stop.rs4
-rw-r--r--bin/domain/imag-timetrack/src/track.rs10
-rw-r--r--bin/domain/imag-timetrack/src/week.rs4
-rw-r--r--bin/domain/imag-timetrack/src/year.rs4
11 files changed, 37 insertions, 35 deletions
diff --git a/bin/domain/imag-timetrack/src/cont.rs b/bin/domain/imag-timetrack/src/cont.rs
index 95a71c1e..cb28d788 100644
--- a/bin/domain/imag-timetrack/src/cont.rs
+++ b/bin/domain/imag-timetrack/src/cont.rs
@@ -22,8 +22,8 @@ use std::cmp::Ord;
use filters::filter::Filter;
use itertools::Itertools;
use chrono::NaiveDateTime;
-use failure::Fallible as Result;
-use failure::Error;
+use anyhow::Result;
+use anyhow::Error;
use resiter::Filter as RFilter;
use libimagtimetrack::store::TimeTrackStore;
diff --git a/bin/domain/imag-timetrack/src/day.rs b/bin/domain/imag-timetrack/src/day.rs
index 540aa625..ff5b6574 100644
--- a/bin/domain/imag-timetrack/src/day.rs
+++ b/bin/domain/imag-timetrack/src/day.rs
@@ -22,8 +22,8 @@ use std::str::FromStr;
use filters::filter::Filter;
use chrono::NaiveDateTime;
-use failure::Fallible as Result;
-use failure::Error;
+use anyhow::Result;
+use anyhow::Error;
use resiter::AndThen;
use resiter::Filter as RFilter;
diff --git a/bin/domain/imag-timetrack/src/lib.rs b/bin/domain/imag-timetrack/src/lib.rs
index d03489e8..3f0791d6 100644
--- a/bin/domain/imag-timetrack/src/lib.rs
+++ b/bin/domain/imag-timetrack/src/lib.rs
@@ -43,7 +43,8 @@ extern crate filters;
extern crate itertools;
extern crate prettytable;
extern crate kairos;
-#[macro_use] extern crate failure;
+#[macro_use] extern crate anyhow;
+extern crate failure;
extern crate resiter;
extern crate libimagerror;
@@ -76,8 +77,8 @@ use crate::week::week;
use crate::year::year;
use clap::App;
-use failure::Fallible as Result;
-use failure::err_msg;
+use anyhow::Result;
+
use libimagrt::runtime::Runtime;
use libimagrt::application::ImagApplication;
@@ -107,7 +108,7 @@ impl ImagApplication for ImagTimetrack {
if rt.handle_unknown_subcommand("imag-bookmark", other, rt.cli())?.success() {
Ok(())
} else {
- Err(err_msg("Failed to handle unknown subcommand"))
+ Err(anyhow!("Failed to handle unknown subcommand"))
}
},
}
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),
}
};
diff --git a/bin/domain/imag-timetrack/src/month.rs b/bin/domain/imag-timetrack/src/month.rs
index 941d2ce2..56b3ede2 100644
--- a/bin/domain/imag-timetrack/src/month.rs
+++ b/bin/domain/imag-timetrack/src/month.rs
@@ -22,8 +22,8 @@ use std::str::FromStr;
use filters::filter::Filter;
use chrono::NaiveDateTime;
-use failure::Error;
-use failure::Fallible as Result;
+use anyhow::Error;
+use anyhow::Result;
use resiter::AndThen;
use resiter::Filter as RFilter;
diff --git a/bin/domain/imag-timetrack/src/shell.rs b/bin/domain/imag-timetrack/src/shell.rs
index 5a888d8b..f4dde8d9 100644
--- a/bin/domain/imag-timetrack/src/shell.rs
+++ b/bin/domain/imag-timetrack/src/shell.rs
@@ -21,9 +21,9 @@ use std::env;
use std::process::Command;
use filters::filter::Filter;
-use failure::Fallible as Result;
-use failure::err_msg;
-use failure::Error;
+use anyhow::Result;
+
+use anyhow::Error;
use resiter::Filter as RFilter;
use resiter::AndThen;
@@ -60,10 +60,10 @@ pub fn shell(rt: &Runtime) -> Result<()> {
.map(mkshell)
.map_err(|e| match e {
env::VarError::NotPresent => {
- err_msg("No $SHELL variable in environment, cannot work!")
+ anyhow!("No $SHELL variable in environment, cannot work!")
},
env::VarError::NotUnicode(_) => {
- err_msg("SHELL variable is not unicode, cannot work!")
+ anyhow!("SHELL variable is not unicode, cannot work!")
}
})
}
@@ -75,7 +75,7 @@ pub fn shell(rt: &Runtime) -> Result<()> {
}
if !shellcmd.status()?.success() {
- return Err(format_err!("Failed to execute {:?}", shellcmd))
+ return Err(anyhow!("Failed to execute {:?}", shellcmd))
}
let stop = ::chrono::offset::Local::now().naive_local();
let filter = has_one_of_tags(&tags);
diff --git a/bin/domain/imag-timetrack/src/start.rs b/bin/domain/imag-timetrack/src/start.rs
index abfeb9e6..50ad3c27 100644
--- a/bin/domain/imag-timetrack/src/start.rs
+++ b/bin/domain/imag-timetrack/src/start.rs
@@ -20,8 +20,8 @@
use std::str::FromStr;
use chrono::naive::NaiveDateTime;
-use failure::Error;
-use failure::Fallible as Result;
+use anyhow::Error;
+use anyhow::Result;
use libimagrt::runtime::Runtime;
use libimagtimetrack::tag::TimeTrackingTag;
diff --git a/bin/domain/imag-timetrack/src/stop.rs b/bin/domain/imag-timetrack/src/stop.rs
index 37b44133..c2662f74 100644
--- a/bin/domain/imag-timetrack/src/stop.rs
+++ b/bin/domain/imag-timetrack/src/stop.rs
@@ -21,8 +21,8 @@ use std::str::FromStr;
use filters::filter::Filter;
use chrono::NaiveDateTime;
-use failure::Fallible as Result;
-use failure::Error;
+use anyhow::Result;
+use anyhow::Error;
use resiter::Filter as RFilter;
use resiter::Map;
use resiter::AndThen;
diff --git a/bin/domain/imag-timetrack/src/track.rs b/bin/domain/imag-timetrack/src/track.rs
index d5188bc6..deda6837 100644
--- a/bin/domain/imag-timetrack/src/track.rs
+++ b/bin/domain/imag-timetrack/src/track.rs
@@ -20,9 +20,9 @@
use clap::ArgMatches;
use chrono::naive::NaiveDate;
use chrono::naive::NaiveDateTime;
-use failure::Error;
-use failure::Fallible as Result;
-use failure::err_msg;
+use anyhow::Error;
+use anyhow::Result;
+
use libimagrt::runtime::Runtime;
use libimagtimetrack::tag::TimeTrackingTag;
@@ -48,8 +48,8 @@ pub fn track(rt: &Runtime) -> Result<()> {
}
}
- let start = get_time(&cmd, "start-time")?.ok_or_else(|| err_msg("No start-time"))?;
- let stop = get_time(&cmd, "end-time")?.ok_or_else(|| err_msg("No end-time"))?;
+ let start = get_time(&cmd, "start-time")?.ok_or_else(|| anyhow!("No start-time"))?;
+ let stop = get_time(&cmd, "end-time")?.ok_or_else(|| anyhow!("No end-time"))?;
cmd.values_of("tags")
.unwrap() // enforced by clap
diff --git a/bin/domain/imag-timetrack/src/week.rs b/bin/domain/imag-timetrack/src/week.rs
index 1578f2f8..5a554496 100644
--- a/bin/domain/imag-timetrack/src/week.rs
+++ b/bin/domain/imag-timetrack/src/week.rs
@@ -22,8 +22,8 @@ use std::str::FromStr;
use filters::filter::Filter;
use chrono::NaiveDateTime;
-use failure::Error;
-use failure::Fallible as Result;
+use anyhow::Error;
+use anyhow::Result;
use resiter::AndThen;
use resiter::Filter as RFilter;
diff --git a/bin/domain/imag-timetrack/src/year.rs b/bin/domain/imag-timetrack/src/year.rs
index 70a40a0c..c53a36b0 100644
--- a/bin/domain/imag-timetrack/src/year.rs
+++ b/bin/domain/imag-timetrack/src/year.rs
@@ -22,8 +22,8 @@ use std::str::FromStr;
use filters::filter::Filter;
use chrono::NaiveDateTime;
-use failure::Error;
-use failure::Fallible as Result;
+use anyhow::Error;
+use anyhow::Result;
use resiter::AndThen;
use resiter::Filter as RFilter;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 03:52:47 +0000