proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-06 11:34:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

time: update to nom 7

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-08-19 12:22:27 +02:00
parent b3e2a1f574
commit 552f14e916
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxmox-time/Cargo.toml
View File

@ -12,7 +12,7 @@ exclude = [ "debian" ]
anyhow = "1.0" anyhow = "1.0"
bitflags = "1.2.1" bitflags = "1.2.1"
lazy_static = "1.4" lazy_static = "1.4"
nom = "5.1" nom = "7"
[target.'cfg(not(target_arch="wasm32"))'.dependencies] [target.'cfg(not(target_arch="wasm32"))'.dependencies]
libc = { version = "0.2", features = [ "extra_traits" ] } libc = { version = "0.2", features = [ "extra_traits" ] }

8
proxmox-time/debian/control
View File

@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 12),
librust-lazy-static-1+default-dev (>= 1.4-~~) <!nocheck>, librust-lazy-static-1+default-dev (>= 1.4-~~) <!nocheck>,
librust-libc-0.2+default-dev <!nocheck>, librust-libc-0.2+default-dev <!nocheck>,
librust-libc-0.2+extra-traits-dev <!nocheck>, librust-libc-0.2+extra-traits-dev <!nocheck>,
librust-nom-5+default-dev (>= 5.1-~~) <!nocheck> librust-nom-7+default-dev <!nocheck>
Maintainer: Proxmox Support Team <support@proxmox.com> Maintainer: Proxmox Support Team <support@proxmox.com>
Standards-Version: 4.5.1 Standards-Version: 4.5.1
Vcs-Git: git://git.proxmox.com/git/proxmox.git Vcs-Git: git://git.proxmox.com/git/proxmox.git
@ -30,15 +30,15 @@ Depends:
librust-lazy-static-1+default-dev (>= 1.4-~~), librust-lazy-static-1+default-dev (>= 1.4-~~),
librust-libc-0.2+default-dev, librust-libc-0.2+default-dev,
librust-libc-0.2+extra-traits-dev, librust-libc-0.2+extra-traits-dev,
librust-nom-5+default-dev (>= 5.1-~~) librust-nom-7+default-dev
Provides: Provides:
librust-proxmox-time+default-dev (= ${binary:Version}), librust-proxmox-time+default-dev (= ${binary:Version}),
librust-proxmox-time-1-dev (= ${binary:Version}), librust-proxmox-time-1-dev (= ${binary:Version}),
librust-proxmox-time-1+default-dev (= ${binary:Version}), librust-proxmox-time-1+default-dev (= ${binary:Version}),
librust-proxmox-time-1.1-dev (= ${binary:Version}), librust-proxmox-time-1.1-dev (= ${binary:Version}),
librust-proxmox-time-1.1+default-dev (= ${binary:Version}), librust-proxmox-time-1.1+default-dev (= ${binary:Version}),
librust-proxmox-time-1.1.2-dev (= ${binary:Version}), librust-proxmox-time-1.1.3-dev (= ${binary:Version}),
librust-proxmox-time-1.1.2+default-dev (= ${binary:Version}) librust-proxmox-time-1.1.3+default-dev (= ${binary:Version})
Description: Time utilities and TmEditor - Rust source code Description: Time utilities and TmEditor - Rust source code
This package contains the source for the Rust proxmox-time crate, packaged by This package contains the source for the Rust proxmox-time crate, packaged by
debcargo for use with cargo and dh-cargo. debcargo for use with cargo and dh-cargo.

6
proxmox-time/src/calendar_event.rs
View File

@ -6,7 +6,7 @@ use nom::{
character::complete::space0, character::complete::space0,
combinator::opt, combinator::opt,
error::context, error::context,
multi::separated_nonempty_list, multi::separated_list1,
sequence::{preceded, terminated, tuple}, sequence::{preceded, terminated, tuple},
}; };
@ -326,7 +326,7 @@ fn parse_calendar_event_incomplete(mut i: &str) -> IResult<&str, CalendarEvent>
let (n, range_list) = context( let (n, range_list) = context(
"weekday range list", "weekday range list",
separated_nonempty_list(tag(","), parse_weekdays_range), separated_list1(tag(","), parse_weekdays_range),
)(i)?; )(i)?;
has_dayspec = true; has_dayspec = true;
@ -416,7 +416,7 @@ fn parse_date_time_comp_list(
return Ok((rest, Vec::new())); return Ok((rest, Vec::new()));
} }
separated_nonempty_list(tag(","), parse_date_time_comp(max))(i) separated_list1(tag(","), parse_date_time_comp(max))(i)
} }
} }

5
proxmox-time/src/daily_duration.rs
View File

@ -3,8 +3,7 @@ use std::convert::{TryFrom, TryInto};
use anyhow::Error; use anyhow::Error;
use nom::{ use nom::{
bytes::complete::tag, character::complete::space0, error::context, bytes::complete::tag, character::complete::space0, error::context, multi::separated_list1,
multi::separated_nonempty_list,
}; };
use crate::parse_helpers::{parse_complete_line, parse_error, parse_hm_time, IResult}; use crate::parse_helpers::{parse_complete_line, parse_error, parse_hm_time, IResult};
@ -94,7 +93,7 @@ fn parse_daily_duration_incomplete(mut i: &str) -> IResult<&str, DailyDuration>
if i.starts_with(|c: char| char::is_ascii_alphabetic(&c)) { if i.starts_with(|c: char| char::is_ascii_alphabetic(&c)) {
let (n, range_list) = context( let (n, range_list) = context(
"weekday range list", "weekday range list",
separated_nonempty_list(tag(","), parse_weekdays_range), separated_list1(tag(","), parse_weekdays_range),
)(i)?; )(i)?;
i = space0(n)?.0; i = space0(n)?.0;

2
proxmox-time/src/parse_helpers.rs
View File

@ -6,7 +6,7 @@ use nom::{
bytes::complete::tag, bytes::complete::tag,
character::complete::digit1, character::complete::digit1,
combinator::{all_consuming, map_res, opt, recognize}, combinator::{all_consuming, map_res, opt, recognize},
error::{ParseError, VerboseError}, error::{ContextError, VerboseError},
sequence::{preceded, tuple}, sequence::{preceded, tuple},
}; };