From b0cd6f0f6d82aed6c5152d75f2fdb301ec4b615e Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 20 Mar 2024 12:20:55 +0100 Subject: [PATCH] compile fixup for previous commit by using concatcp restoring the old code does not work since we now don't have the components as macros anymore, switch to concatcp for it Signed-off-by: Wolfgang Bumiller --- pbs-config/Cargo.toml | 1 + pbs-config/src/network/helper.rs | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pbs-config/Cargo.toml b/pbs-config/Cargo.toml index af21956a..d11cd41e 100644 --- a/pbs-config/Cargo.toml +++ b/pbs-config/Cargo.toml @@ -7,6 +7,7 @@ description = "Configuration file management for PBS" [dependencies] anyhow.workspace = true +const_format.workspace = true lazy_static.workspace = true libc.workspace = true nix.workspace = true diff --git a/pbs-config/src/network/helper.rs b/pbs-config/src/network/helper.rs index 399a1e1b..9e195d71 100644 --- a/pbs-config/src/network/helper.rs +++ b/pbs-config/src/network/helper.rs @@ -4,6 +4,7 @@ use std::path::Path; use std::process::Command; use anyhow::{bail, format_err, Error}; +use const_format::concatcp; use lazy_static::lazy_static; use nix::ioctl_read_bad; use nix::sys::socket::{socket, AddressFamily, SockFlag, SockType}; @@ -89,13 +90,13 @@ pub fn check_netmask(mask: u8, is_v6: bool) -> Result<(), Error> { // parse ip address with optional cidr mask pub fn parse_address_or_cidr(cidr: &str) -> Result<(String, Option, bool), Error> { - /// NOTE: This is NOT the same regex as in proxmox-schema as this one has capture groups for - /// the addresses vs cidr portions! + // NOTE: This is NOT the same regex as in proxmox-schema as this one has capture groups for + // the addresses vs cidr portions! lazy_static! { pub static ref CIDR_V4_REGEX: Regex = - Regex::new(concat!(r"^(", IPV4RE!(), r")(?:/(\d{1,2}))?$")).unwrap(); + Regex::new(concatcp!(r"^(", IPV4RE_STR, r")(?:/(\d{1,2}))?$")).unwrap(); pub static ref CIDR_V6_REGEX: Regex = - Regex::new(concat!(r"^(", IPV6RE!(), r")(?:/(\d{1,3}))?$")).unwrap(); + Regex::new(concatcp!(r"^(", IPV6RE_STR, r")(?:/(\d{1,3}))?$")).unwrap(); } if let Some(caps) = CIDR_V4_REGEX.captures(cidr) {