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

src/tools/nom.rs: move nom helpers into separate file

Browse Source
This commit is contained in:
Dietmar Maurer
2020-06-18 12:41:13 +02:00
parent 0686b1f4db
commit 177a2de992
5 changed files with 91 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,12 @@ use lazy_static::lazy_static;
use super::time::*;
use crate::tools::nom::{
parse_complete, parse_u64, parse_error, IResult,
};
use nom::{
error::{context, ParseError, VerboseError},
error::{context},
bytes::complete::{tag, take_while1},
combinator::{map_res, all_consuming, opt, recognize},
sequence::{pair, preceded, tuple},
@ -14,14 +18,6 @@ use nom::{
multi::separated_nonempty_list,
};
type IResult<I, O, E = VerboseError<I>> = Result<(I, O), nom::Err<E>>;
fn parse_error<'a>(i: &'a str, context: &'static str) -> nom::Err<VerboseError<&'a str>> {
let err = VerboseError { errors: Vec::new() };
let err = VerboseError::add_context(i, context, err);
nom::Err::Error(err)
}
lazy_static! {
pub static ref TIME_SPAN_UNITS: HashMap<&'static str, f64> = {
let mut map = HashMap::new();
@ -100,11 +96,7 @@ fn parse_time_comp(max: usize) -> impl Fn(&str) -> IResult<&str, u32> {
}
}
fn parse_u64(i: &str) -> IResult<&str, u64> {
map_res(recognize(digit1), str::parse)(i)
}
fn parse_weekday(i: &str) -> IResult<&str, WeekDays, VerboseError<&str>> {
fn parse_weekday(i: &str) -> IResult<&str, WeekDays> {
let (i, text) = alpha1(i)?;
match text.to_ascii_lowercase().as_str() {
@ -192,20 +184,7 @@ fn parse_time_spec(i: &str) -> IResult<&str, (Vec<DateTimeValue>, Vec<DateTimeVa
}
pub fn parse_calendar_event(i: &str) -> Result<CalendarEvent, Error> {
match all_consuming(parse_calendar_event_incomplete)(i) {
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),
}
parse_complete("calendar event", i, parse_calendar_event_incomplete)
}
fn parse_calendar_event_incomplete(mut i: &str) -> IResult<&str, CalendarEvent> {