From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id A72A81FF13F for ; Thu, 12 Mar 2026 14:52:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6301E17073; Thu, 12 Mar 2026 14:52:46 +0100 (CET) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Subject: [PATCH proxmox 12/26] time: use u64 parse helper from nom Date: Thu, 12 Mar 2026 14:52:13 +0100 Message-ID: <20260312135229.420729-13-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312135229.420729-1-l.wagner@proxmox.com> References: <20260312135229.420729-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773323523346 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: O4RVA7UISND37K63TTXZF7WASSDCBD5A X-Message-ID-Hash: O4RVA7UISND37K63TTXZF7WASSDCBD5A X-MailFrom: l.wagner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ...instead of our own implementation. Signed-off-by: Lukas Wagner --- proxmox-time/src/parse_helpers.rs | 5 ----- proxmox-time/src/time_span.rs | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/proxmox-time/src/parse_helpers.rs b/proxmox-time/src/parse_helpers.rs index 5c46a9d5..d2ca9d10 100644 --- a/proxmox-time/src/parse_helpers.rs +++ b/proxmox-time/src/parse_helpers.rs @@ -21,11 +21,6 @@ pub(crate) fn parse_error<'a>( nom::Err::Error(err) } -// Parse a 64 bit unsigned integer -pub(crate) fn parse_u64(i: &str) -> IResult<&str, u64> { - map_res(recognize(digit1), str::parse)(i) -} - // Parse complete input, generate simple error message (use this for simple line input). pub(crate) fn parse_complete_line<'a, F, O>(what: &str, i: &'a str, parser: F) -> Result where diff --git a/proxmox-time/src/time_span.rs b/proxmox-time/src/time_span.rs index c3c47f44..951e82e5 100644 --- a/proxmox-time/src/time_span.rs +++ b/proxmox-time/src/time_span.rs @@ -117,7 +117,7 @@ use anyhow::{Context, Error}; -use crate::parse_helpers::{parse_complete_line, parse_error, parse_u64, IResult}; +use crate::parse_helpers::{parse_complete_line, parse_error, IResult}; // Seconds-per-unit constants. Month and year are the systemd definitions: // 1 month = 30.44 days = 2,630,016 s (exact), 1 year = 365.25 days = 31,557,600 s (exact). @@ -776,7 +776,7 @@ fn parse_time_span_incomplete(mut i: &str) -> IResult<&str, TimeSpanParts> { if i.is_empty() { break; } - let (n, num) = parse_u64(i)?; + let (n, num) = nom::character::complete::u64(i)?; i = n.trim_start(); parsed_any = true; -- 2.47.3