diff --git a/src/server/formatter.rs b/proxmox-rest-server/src/formatter.rs similarity index 100% rename from src/server/formatter.rs rename to proxmox-rest-server/src/formatter.rs diff --git a/proxmox-rest-server/src/lib.rs b/proxmox-rest-server/src/lib.rs index 42e78d89..bc8334ba 100644 --- a/proxmox-rest-server/src/lib.rs +++ b/proxmox-rest-server/src/lib.rs @@ -5,6 +5,7 @@ use anyhow::{bail, format_err, Error}; use proxmox::tools::fd::Fd; pub mod daemon; +pub mod formatter; mod environment; pub use environment::*; diff --git a/src/server/h2service.rs b/src/server/h2service.rs index 332b3b1a..a79387c0 100644 --- a/src/server/h2service.rs +++ b/src/server/h2service.rs @@ -11,8 +11,9 @@ use hyper::{Body, Request, Response, StatusCode}; use proxmox::api::{ApiResponseFuture, HttpError, Router, RpcEnvironment}; use proxmox::http_err; +use proxmox_rest_server::formatter::*; + use crate::tools; -use crate::server::formatter::*; use crate::server::WorkerTask; /// Hyper Service implementation to handle stateful H2 connections. diff --git a/src/server/rest.rs b/src/server/rest.rs index 6af6fa55..8beecb55 100644 --- a/src/server/rest.rs +++ b/src/server/rest.rs @@ -35,8 +35,7 @@ use pbs_tools::compression::{DeflateEncoder, Level}; use pbs_tools::stream::AsyncReaderStream; use pbs_api_types::{Authid, Userid}; use proxmox_rest_server::{ApiConfig, FileLogger, FileLogOptions, AuthError, RestEnvironment}; - -use super::formatter::*; +use proxmox_rest_server::formatter::*; use crate::auth_helpers::*; use pbs_config::CachedUserInfo;