From 7c04f0752584294cf9352e74979175c2d10b68cf Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 30 Nov 2021 13:12:09 +0100 Subject: [PATCH] remove use of deprecated functions from proxmox-time Depend on proxmox-time 1.1.1 Signed-off-by: Dominik Csapak Signed-off-by: Dietmar Maurer --- pbs-api-types/Cargo.toml | 2 +- pbs-api-types/src/tape/media_pool.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pbs-api-types/Cargo.toml b/pbs-api-types/Cargo.toml index e56269b0..44e60d57 100644 --- a/pbs-api-types/Cargo.toml +++ b/pbs-api-types/Cargo.toml @@ -19,7 +19,7 @@ serde = { version = "1.0", features = ["derive"] } proxmox-lang = "1.0.0" proxmox-schema = { version = "1.0.1", features = [ "api-macro" ] } proxmox-serde = "0.1" -proxmox-time = "1.1" +proxmox-time = "1.1.1" proxmox-uuid = { version = "1.0.0", features = [ "serde" ] } proxmox-sys = "0.2" # only needed for nodename()?? diff --git a/pbs-api-types/src/tape/media_pool.rs b/pbs-api-types/src/tape/media_pool.rs index 3b1cb0f5..c0cba2bd 100644 --- a/pbs-api-types/src/tape/media_pool.rs +++ b/pbs-api-types/src/tape/media_pool.rs @@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize}; use proxmox_schema::{api, Schema, StringSchema, ApiStringFormat, Updater}; -use proxmox_time::{parse_calendar_event, parse_time_span, CalendarEvent, TimeSpan}; +use proxmox_time::{CalendarEvent, TimeSpan}; use crate::{ PROXMOX_SAFE_ID_FORMAT, @@ -62,7 +62,7 @@ impl std::str::FromStr for MediaSetPolicy { return Ok(MediaSetPolicy::AlwaysCreate); } - let event = parse_calendar_event(s)?; + let event = s.parse()?; Ok(MediaSetPolicy::CreateAt(event)) } @@ -97,7 +97,7 @@ impl std::str::FromStr for RetentionPolicy { return Ok(RetentionPolicy::KeepForever); } - let time_span = parse_time_span(s)?; + let time_span = s.parse()?; Ok(RetentionPolicy::ProtectFor(time_span)) }