depend on proxmox-async 0.2

diff --git a/Cargo.toml b/Cargo.toml
index 871fdfaa0e588f4747f6602147659169a9af54fe..e6447c217bec94b8f089883ce6e386b0421606c9 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -109,7 +109,7 @@ proxmox-sys = "0.1"
 
 proxmox-acme-rs = "0.3"
 proxmox-apt = "0.8.0"
-proxmox-async = "0.1"
+proxmox-async = "0.2"
 proxmox-openid = "0.9.0"
 
 pbs-api-types = { path = "pbs-api-types" }

diff --git a/debian/control b/debian/control
index 2731ee119e141a20f258ef174f5fea7a562c34f7..c627bea8ef6ebc1d6c7aeb713033c1841260058a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Build-Depends: debhelper (>= 12),
  librust-proxmox-0.15+default-dev (>= 0.15.3-~~),
  librust-proxmox-0.15+sortable-macro-dev (>= 0.15.3-~~),
  librust-proxmox-0.15+tokio-dev (>= 0.15.3-~~),
- librust-proxmox-async-0.1+default-dev,
+ librust-proxmox-async-0.2+default-dev,
  librust-proxmox-acme-rs-0.3+default-dev,
  librust-proxmox-apt-0.8+default-dev,
  librust-proxmox-borrow-1+default-dev,

diff --git a/pbs-client/Cargo.toml b/pbs-client/Cargo.toml
index a12f512b4716495b10c716f31ccf4562d991527b..076219f3f8995c20bafdec53ba3bff76cc06d9d7 100644 (file)
--- a/pbs-client/Cargo.toml
+++ b/pbs-client/Cargo.toml
@@ -29,7 +29,7 @@ xdg = "2.2"
 
 pathpatterns = "0.1.2"
 proxmox = "0.15.3"
-proxmox-async = "0.1"
+proxmox-async = "0.2"
 proxmox-fuse = "0.1.1"
 proxmox-http = { version = "0.5.4", features = [ "client", "http-helpers", "websocket" ] }
 proxmox-io = { version = "1", features = [ "tokio" ] }

diff --git a/pbs-client/src/pxar_backup_stream.rs b/pbs-client/src/pxar_backup_stream.rs
index 863c3fb46abb6f600d4332e916e53b13513678a2..484a3e32766b992e2f70b5ee21a1685623b66814 100644 (file)
--- a/pbs-client/src/pxar_backup_stream.rs
+++ b/pbs-client/src/pxar_backup_stream.rs
@@ -12,7 +12,7 @@ use nix::dir::Dir;
 use nix::fcntl::OFlag;
 use nix::sys::stat::Mode;
 
-use proxmox_async::tokio_writer_adapter::TokioWriterAdapter;
+use proxmox_async::blocking::TokioWriterAdapter;
 
 use pbs_datastore::catalog::CatalogWriter;
 use pbs_tools::sync::StdChannelWriter;

diff --git a/pbs-tools/Cargo.toml b/pbs-tools/Cargo.toml
index d0c6b3ff90e61f9b28ca3b9f64426cfe3b043ae2..3edfe48f75d99964eb04b5d304a11ec92b781eab 100644 (file)
--- a/pbs-tools/Cargo.toml
+++ b/pbs-tools/Cargo.toml
@@ -33,7 +33,7 @@ walkdir = "2"
 zstd = { version = "0.6", features = [ "bindgen" ] }
 
 proxmox = { version = "0.15.3", default-features = false, features = [ "tokio" ] }
-proxmox-async = "0.1"
+proxmox-async = "0.2"
 proxmox-borrow = "1"
 proxmox-io = { version = "1", features = [ "tokio" ] }
 proxmox-lang = { version = "1" }

diff --git a/proxmox-backup-client/Cargo.toml b/proxmox-backup-client/Cargo.toml
index 6b0348c0524fb007d88b0624b4cd39de92da492a..fcc86384f21470a53c227f3fcc750730dc35a11d 100644 (file)
--- a/proxmox-backup-client/Cargo.toml
+++ b/proxmox-backup-client/Cargo.toml
@@ -23,7 +23,7 @@ pathpatterns = "0.1.2"
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 
 proxmox = { version = "0.15.3", features = [ "sortable-macro" ] }
-proxmox-async = "0.1"
+proxmox-async = "0.2"
 proxmox-router = { version = "1.1", features = [ "cli" ] }
 proxmox-schema = { version = "1", features = [ "api-macro" ] }
 proxmox-time = "1"

diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
index ec479faa12255b975196efa431a5ae6afc665012..b4ad166a94f4ae00175f3c9c042b5d07bcc73080 100644 (file)
--- a/proxmox-backup-client/src/main.rs
+++ b/proxmox-backup-client/src/main.rs
@@ -17,7 +17,7 @@ use proxmox::tools::fs::{file_get_json, replace_file, CreateOptions, image_size}
 use proxmox_router::{ApiMethod, RpcEnvironment, cli::*};
 use proxmox_schema::api;
 use proxmox_time::{strftime_local, epoch_i64};
-use proxmox_async::tokio_writer_adapter::TokioWriterAdapter;
+use proxmox_async::blocking::TokioWriterAdapter;
 use pxar::accessor::{MaybeReady, ReadAt, ReadAtOperation};
 
 use pbs_api_types::{

diff --git a/proxmox-file-restore/Cargo.toml b/proxmox-file-restore/Cargo.toml
index bbd66705b4b412d39290454a6fb49a9b18488e3a..7b47b741414d8b77265a6fce60c65e156880793c 100644 (file)
--- a/proxmox-file-restore/Cargo.toml
+++ b/proxmox-file-restore/Cargo.toml
@@ -17,7 +17,7 @@ tokio = { version = "1.6", features = [ "io-std", "rt", "rt-multi-thread", "time
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 
 proxmox = { version = "0.15.3" }
-proxmox-async = "0.1"
+proxmox-async = "0.2"
 proxmox-lang = "1"
 proxmox-router = { version = "1.1", features = [ "cli" ] }
 proxmox-schema = { version = "1", features = [ "api-macro" ] }

diff --git a/proxmox-rest-server/Cargo.toml b/proxmox-rest-server/Cargo.toml
index b2f6ce80916424c08565d3f8dec3fc5d81f27fc9..d72e38b2e73e603144da1446130d4272f2a9542f 100644 (file)
--- a/proxmox-rest-server/Cargo.toml
+++ b/proxmox-rest-server/Cargo.toml
@@ -31,7 +31,7 @@ tower-service = "0.3.0"
 url = "2.1"
 
 proxmox = "0.15.3"
-proxmox-async = "0.1"
+proxmox-async = "0.2"
 proxmox-io = "1"
 proxmox-lang = "1"
 proxmox-http = { version = "0.5.0", features = [ "client" ] }

diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml
index c7ad9f049f9be72cb011662459ce549fd9c1d454..1484439d880026c5057d02c5e77a404ddd13059e 100644 (file)
--- a/proxmox-restore-daemon/Cargo.toml
+++ b/proxmox-restore-daemon/Cargo.toml
@@ -27,7 +27,7 @@ pathpatterns = "0.1.2"
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 
 proxmox = { version = "0.15.3", features = [ "sortable-macro" ] }
-proxmox-async = "0.1"
+proxmox-async = "0.2"
 proxmox-router = { version = "1.1", features = [ "cli" ] }
 proxmox-schema = { version = "1", features = [ "api-macro" ] }
 proxmox-time = "1"

diff --git a/pxar-bin/Cargo.toml b/pxar-bin/Cargo.toml
index 732b326246b96814d35d8f1b4843d64f376615cd..ca86e601dc9737d20bf707f735aa358293a9dcd0 100644 (file)
--- a/pxar-bin/Cargo.toml
+++ b/pxar-bin/Cargo.toml
@@ -17,7 +17,7 @@ tokio = { version = "1.6", features = [ "rt", "rt-multi-thread" ] }
 
 pathpatterns = "0.1.2"
 proxmox = "0.15.3"
-proxmox-async = "0.1"
+proxmox-async = "0.2"
 proxmox-schema = { version = "1", features = [ "api-macro" ] }
 proxmox-router = "1.1"
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index e95656ce0ba01830c434ebb590a9753d921467e6..5e5051b8403075a4a0d6b6494b1134a1160ae796 100644 (file)
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -23,7 +23,7 @@ use proxmox_router::{
 use proxmox_schema::*;
 use proxmox_sys::{task_log, task_warn};
 use proxmox_async::blocking::WrappedReaderStream;
-use proxmox_async::stream::{AsyncReaderStream, AsyncChannelWriter};
+use proxmox_async::{io::AsyncChannelWriter, stream::AsyncReaderStream};
 
 use pxar::accessor::aio::Accessor;
 use pxar::EntryKind;