remove src/tools/common_regex.rs, use proxmox::tools::common_regex instead

This commit is contained in:
Dietmar Maurer
2019-08-03 16:44:31 +02:00
parent fd329bdcd7
commit 7f66c29e5c
5 changed files with 5 additions and 52 deletions

View File

@ -1,6 +1,8 @@
use failure::*;
use proxmox::tools::fs::{file_get_contents, file_set_contents};
use proxmox::tools::*; // required to use IPRE!() macro ???
use crate::api2::*;
use crate::api_schema::*;
//use crate::api_schema::router::*;

View File

@ -8,7 +8,7 @@ use serde_json::{json, Value};
use std::sync::Arc;
use lazy_static::lazy_static;
use crate::tools::common_regex;
use proxmox::tools::common_regex;
use std::process::{Command, Stdio};
fn dump_journal(

View File

@ -3,7 +3,7 @@ use lazy_static::lazy_static;
use std::sync::Arc;
use crate::api_schema::*;
use crate::tools::{self, common_regex};
use proxmox::tools::common_regex;
lazy_static!{
@ -38,7 +38,7 @@ lazy_static!{
StringSchema::new("Node name (or 'localhost')")
.format(
Arc::new(ApiStringFormat::VerifyFn(|node| {
if node == "localhost" || node == tools::nodename() {
if node == "localhost" || node == crate::tools::nodename() {
Ok(())
} else {
bail!("no such node '{}'", node);