move TaskState trait to pbs-datastore

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

pbs-api-types/src/lib.rs

@@ -1,3 +1,5 @@
+//! Basic API types used by most of the PBS code.
+
 use proxmox::api::schema::{ApiStringFormat, Schema, StringSchema};
 use proxmox::const_regex;
 

pbs-datastore/Cargo.toml

@@ -9,6 +9,7 @@ description = "low level pbs data storage access"
 anyhow = "1.0"
 crc32fast = "1"
 endian_trait = { version = "0.6", features = [ "arrays" ] }
+log = "0.4"
 nix = "0.19.1"
 openssl = "0.10"
 serde = { version = "1.0", features = ["derive"] }

pbs-datastore/src/lib.rs

@@ -191,6 +191,7 @@ pub mod data_blob_writer;
 pub mod file_formats;
 pub mod index;
 pub mod key_derivation;
+pub mod task;
 
 pub use checksum_reader::ChecksumReader;
 pub use checksum_writer::ChecksumWriter;

pbs-datastore/src/task.rs

@@ -0,0 +1,21 @@
+use anyhow::Error;
+
+/// `WorkerTask` methods commonly used from contexts otherwise not related to the API server.
+pub trait TaskState {
+    /// If the task should be aborted, this should fail with a reasonable error message.
+    fn check_abort(&self) -> Result<(), Error>;
+
+    /// Create a log message for this task.
+    fn log(&self, level: log::Level, message: &std::fmt::Arguments);
+}
+
+/// Convenience implementation:
+impl<T: TaskState + ?Sized> TaskState for std::sync::Arc<T> {
+    fn check_abort(&self) -> Result<(), Error> {
+        <T as TaskState>::check_abort(&*self)
+    }
+
+    fn log(&self, level: log::Level, message: &std::fmt::Arguments) {
+        <T as TaskState>::log(&*self, level, message)
+    }
+}

src/task.rs

@@ -1,24 +1,4 @@
-use anyhow::Error;
+pub use pbs_datastore::task::TaskState;
-
-/// `WorkerTask` methods commonly used from contexts otherwise not related to the API server.
-pub trait TaskState {
-    /// If the task should be aborted, this should fail with a reasonable error message.
-    fn check_abort(&self) -> Result<(), Error>;
-
-    /// Create a log message for this task.
-    fn log(&self, level: log::Level, message: &std::fmt::Arguments);
-}
-
-/// Convenience implementation:
-impl<T: TaskState + ?Sized> TaskState for std::sync::Arc<T> {
-    fn check_abort(&self) -> Result<(), Error> {
-        <T as TaskState>::check_abort(&*self)
-    }
-
-    fn log(&self, level: log::Level, message: &std::fmt::Arguments) {
-        <T as TaskState>::log(&*self, level, message)
-    }
-}
 
 #[macro_export]
 macro_rules! task_error {