From: Dietmar Maurer <dietmar@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 06/15] move src/tools/compression.rs to pbs-server crate
Date: Mon, 20 Sep 2021 09:38:04 +0200 [thread overview]
Message-ID: <20210920073813.3178009-6-dietmar@proxmox.com> (raw)
In-Reply-To: <20210920073813.3178009-1-dietmar@proxmox.com>
---
{src/tools => pbs-server/src}/compression.rs | 0
pbs-server/src/lib.rs | 3 +++
src/server/rest.rs | 8 +++++---
src/tools/mod.rs | 1 -
4 files changed, 8 insertions(+), 4 deletions(-)
rename {src/tools => pbs-server/src}/compression.rs (100%)
diff --git a/src/tools/compression.rs b/pbs-server/src/compression.rs
similarity index 100%
rename from src/tools/compression.rs
rename to pbs-server/src/compression.rs
diff --git a/pbs-server/src/lib.rs b/pbs-server/src/lib.rs
index bc8334ba..069d80b4 100644
--- a/pbs-server/src/lib.rs
+++ b/pbs-server/src/lib.rs
@@ -4,6 +4,9 @@ use anyhow::{bail, format_err, Error};
use proxmox::tools::fd::Fd;
+mod compression;
+pub use compression::*;
+
pub mod daemon;
pub mod formatter;
diff --git a/src/server/rest.rs b/src/server/rest.rs
index 767ce85a..e1a081b6 100644
--- a/src/server/rest.rs
+++ b/src/server/rest.rs
@@ -34,13 +34,15 @@ use proxmox::tools::fs::CreateOptions;
use pbs_tools::compression::{DeflateEncoder, Level};
use pbs_tools::stream::AsyncReaderStream;
use pbs_api_types::{Authid, Userid};
-use pbs_server::{ApiConfig, FileLogger, FileLogOptions, AuthError, RestEnvironment};
+use pbs_server::{
+ ApiConfig, FileLogger, FileLogOptions, AuthError, RestEnvironment, CompressionMethod,
+};
use pbs_server::formatter::*;
-use crate::auth_helpers::*;
use pbs_config::CachedUserInfo;
+
+use crate::auth_helpers::*;
use crate::tools;
-use crate::tools::compression::CompressionMethod;
extern "C" {
fn tzset();
diff --git a/src/tools/mod.rs b/src/tools/mod.rs
index 8fd441b5..f2576b08 100644
--- a/src/tools/mod.rs
+++ b/src/tools/mod.rs
@@ -14,7 +14,6 @@ use proxmox_http::{
pub mod apt;
pub mod async_io;
-pub mod compression;
pub mod config;
pub mod disks;
--
2.30.2
next prev parent reply other threads:[~2021-09-20 7:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 7:37 [pbs-devel] [PATCH proxmox-backup 01/15] start new pbs-server workspace Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 02/15] move ApiConfig, FileLogger and CommandoSocket to " Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 03/15] move src/tools/daemon.rs " Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 04/15] move src/server/environment.rs to pbs-server crate Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 05/15] move src/server/formatter.rs " Dietmar Maurer
2021-09-20 7:38 ` Dietmar Maurer [this message]
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 07/15] move normalize_uri_path and extract_cookie " Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 08/15] rest server: simplify get_index() method signature Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 09/15] make get_index and ApiConfig property (callback) Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 10/15] rest server: return UserInformation from ApiAuth::check_auth Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 11/15] rest server: do not use pbs_api_types::Authid Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 12/15] rest server: cleanup auth-log handling Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 13/15] move src/server/rest.rs to pbs-server crate Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 14/15] move proxmox_restore_daemon code into extra crate Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 15/15] basically a (semantic) revert of commit 991be99c37c6f55f43a3d9a2c54edb2a8dc6d4f2 "buildsys: workaround linkage issues from openid/curl build server stuff separate" Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210920073813.3178009-6-dietmar@proxmox.com \
--to=dietmar@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox