tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/tools/systemd/parse_time.rs: improve error message

Browse Source
This commit is contained in:
Dietmar Maurer 2020-05-20 09:43:16 +02:00
parent dd7a7eae8f
commit 479e4932b5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/systemd/parse_time.rs
View File

@ -193,7 +193,17 @@ fn parse_time_spec(i: &str) -> IResult<&str, (Vec<DateTimeValue>, Vec<DateTimeVa
pub fn parse_calendar_event(i: &str) -> Result<CalendarEvent, Error> { pub fn parse_calendar_event(i: &str) -> Result<CalendarEvent, Error> {
match all_consuming(parse_calendar_event_incomplete)(i) { match all_consuming(parse_calendar_event_incomplete)(i) {
Err(err) => bail!("unable to parse calendar event: {}", err), Err(nom::Err::Error(VerboseError { errors })) |
Err(nom::Err::Failure(VerboseError { errors })) => {
if errors.is_empty() {
bail!("unable to parse calendar event");
} else {
bail!("unable to parse calendar event at '{}': {:?}", errors[0].0, errors[0].1);
}
}
Err(err) => {
bail!("unable to parse calendar event: {}", err);
}
Ok((_, ce)) => Ok(ce), Ok((_, ce)) => Ok(ce),
} }
} }
@ -231,7 +241,7 @@ fn parse_calendar_event_incomplete(mut i: &str) -> IResult<&str, CalendarEvent>
})); }));
} }
"monthly" | "weekly" | "yearly" | "quarterly" | "semiannually" => { "monthly" | "weekly" | "yearly" | "quarterly" | "semiannually" => {
unimplemented!(); return Err(parse_error(i, "unimplemented date or time specification"));
} }
_ => { /* continue */ } _ => { /* continue */ }
} }