From da2e372b19f0963c5d57e969b6b6056cbc9a8c6f Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 16 Dec 2021 11:02:53 +0100 Subject: [PATCH] cleanup schema function calls Signed-off-by: Wolfgang Bumiller --- pbs-api-types/src/jobs.rs | 4 ++-- pbs-api-types/src/tape/media_location.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pbs-api-types/src/jobs.rs b/pbs-api-types/src/jobs.rs index d6479a98..c6664104 100644 --- a/pbs-api-types/src/jobs.rs +++ b/pbs-api-types/src/jobs.rs @@ -345,8 +345,8 @@ impl std::str::FromStr for GroupFilter { fn from_str(s: &str) -> Result { match s.split_once(":") { - Some(("group", value)) => parse_simple_value(value, &BACKUP_GROUP_SCHEMA).map(|_| GroupFilter::Group(value.to_string())), - Some(("type", value)) => parse_simple_value(value, &BACKUP_TYPE_SCHEMA).map(|_| GroupFilter::BackupType(value.to_string())), + Some(("group", value)) => BACKUP_GROUP_SCHEMA.parse_simple_value(value).map(|_| GroupFilter::Group(value.to_string())), + Some(("type", value)) => BACKUP_TYPE_SCHEMA.parse_simple_value(value).map(|_| GroupFilter::BackupType(value.to_string())), Some(("regex", value)) => Ok(GroupFilter::Regex(Regex::new(value)?)), Some((ty, _value)) => Err(format_err!("expected 'group', 'type' or 'regex' prefix, got '{}'", ty)), None => Err(format_err!("input doesn't match expected format '|regex:REGEX>'")), diff --git a/pbs-api-types/src/tape/media_location.rs b/pbs-api-types/src/tape/media_location.rs index 496bd000..b81ea9a8 100644 --- a/pbs-api-types/src/tape/media_location.rs +++ b/pbs-api-types/src/tape/media_location.rs @@ -1,6 +1,6 @@ use anyhow::{bail, Error}; -use proxmox_schema::{parse_simple_value, ApiStringFormat, Schema, StringSchema}; +use proxmox_schema::{ApiStringFormat, Schema, StringSchema}; use crate::{CHANGER_NAME_SCHEMA, PROXMOX_SAFE_ID_FORMAT}; @@ -33,10 +33,10 @@ impl proxmox_schema::ApiType for MediaLocation { let location: MediaLocation = text.parse()?; match location { MediaLocation::Online(ref changer) => { - parse_simple_value(changer, &CHANGER_NAME_SCHEMA)?; + CHANGER_NAME_SCHEMA.parse_simple_value(changer)?; } MediaLocation::Vault(ref vault) => { - parse_simple_value(vault, &VAULT_NAME_SCHEMA)?; + VAULT_NAME_SCHEMA.parse_simple_value(vault)?; } MediaLocation::Offline => { /* OK */ } }