depend on proxmox-async 0.2

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" }

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,

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" ] }

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;

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" }

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"

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::{

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" ] }

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" ] }

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"

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" ] }

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;