Macro rules are not hygienic, and current rust macro visibility rules
are a nightmare. Using const_format::concatcp!() is a much cleaner
solution.
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
base64 = "0.13"
bitflags = "1.2.1"
bytes = "1.0"
base64 = "0.13"
bitflags = "1.2.1"
bytes = "1.0"
crc32fast = "1"
crossbeam-channel = "0.5"
endian_trait = "0.6"
crc32fast = "1"
crossbeam-channel = "0.5"
endian_trait = "0.6"
[dependencies]
anyhow.workspace = true
[dependencies]
anyhow.workspace = true
+const_format = { workspace = true, optional = true }
lazy_static.workspace = true
regex.workspace = true
serde.workspace = true
lazy_static.workspace = true
regex.workspace = true
serde.workspace = true
api-macro = ["dep:proxmox-api-macro"]
upid-api-impl = [ "dep:libc", "dep:nix" ]
api-macro = ["dep:proxmox-api-macro"]
upid-api-impl = [ "dep:libc", "dep:nix" ]
+api-types = [ "dep:const_format" ]
# Testing only
test-harness = []
# Testing only
test-harness = []
//! The "basic" api types we generally require along with some of their macros.
//! The "basic" api types we generally require along with some of their macros.
+use const_format::concatcp;
use crate::{ApiStringFormat, Schema, StringSchema};
#[rustfmt::skip]
use crate::{ApiStringFormat, Schema, StringSchema};
#[rustfmt::skip]
-#[macro_export]
-macro_rules! SAFE_ID_REGEX_STR { () => { r"(?:[A-Za-z0-9_][A-Za-z0-9._\-]*)" }; }
+const SAFE_ID_REGEX_STR: &str = r"(?:[A-Za-z0-9_][A-Za-z0-9._\-]*)";
const_regex! {
/// Regex for safe identifiers.
const_regex! {
/// Regex for safe identifiers.
/// contains further information why it is reasonable to restict
/// names this way. This is not only useful for filenames, but for
/// any identifier command line tools work with.
/// contains further information why it is reasonable to restict
/// names this way. This is not only useful for filenames, but for
/// any identifier command line tools work with.
- pub SAFE_ID_REGEX = concat!(r"^", SAFE_ID_REGEX_STR!(), r"$");
- pub PASSWORD_REGEX = r"^[[:^cntrl:]]*$"; // everything but control characters
- pub SINGLE_LINE_COMMENT_REGEX = r"^[[:^cntrl:]]*$"; // everything but control characters
+ pub SAFE_ID_REGEX = concatcp!(r"^", SAFE_ID_REGEX_STR, r"$");
+ /// Password. Allow everything but control characters.
+ pub PASSWORD_REGEX = r"^[[:^cntrl:]]*$";
+ /// Single line comment. Allow everything but control characters.
+ pub SINGLE_LINE_COMMENT_REGEX = r"^[[:^cntrl:]]*$";
}
pub const SAFE_ID_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SAFE_ID_REGEX);
}
pub const SAFE_ID_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SAFE_ID_REGEX);