use proxmox-sortable-macro directly

instead of via proxmox-sys

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

diff --git a/Cargo.toml b/Cargo.toml
index 2c3ed6c118cd7d1c97dad2bffd0bc1803a456212..6fca3c4ecbd9d8ad127653d03433204a51c4a8db 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,6 +72,7 @@ proxmox-schema = "1.3.6"
 proxmox-section-config = "1"
 proxmox-serde = "0.1.1"
 proxmox-shared-memory = "0.2.3"
+proxmox-sortable-macro = "0.1.2"
 proxmox-subscription = { version = "0.3", features = [ "api-types" ] }
 proxmox-sys = "0.4.2"
 proxmox-tfa = { version = "2.1", features = [ "api", "api-types" ] }
@@ -214,8 +215,9 @@ proxmox-schema = { workspace = true, features = [ "api-macro" ] }
 proxmox-section-config.workspace = true
 proxmox-serde = { workspace = true, features = [ "serde_json" ] }
 proxmox-shared-memory.workspace = true
+proxmox-sortable-macro.workspace = true
 proxmox-subscription.workspace = true
-proxmox-sys = { workspace = true, features = [ "sortable-macro", "timer" ] }
+proxmox-sys = { workspace = true, features = [ "timer" ] }
 proxmox-tfa.workspace = true
 proxmox-time.workspace = true
 proxmox-uuid.workspace = true

diff --git a/proxmox-backup-client/Cargo.toml b/proxmox-backup-client/Cargo.toml
index 0d8783f8e5a10321a249703b109ecf5bbeeee694..89a47111d24dbf3d094a795907cb1b360ecf74d8 100644 (file)
--- a/proxmox-backup-client/Cargo.toml
+++ b/proxmox-backup-client/Cargo.toml
@@ -28,7 +28,8 @@ proxmox-fuse.workspace = true
 proxmox-io.workspace = true
 proxmox-router = { workspace = true, features = [ "cli" ] }
 proxmox-schema = { workspace = true, features = [ "api-macro" ] }
-proxmox-sys = { workspace = true,  features = [ "sortable-macro" ] }
+proxmox-sortable-macro.workspace = true
+proxmox-sys.workspace = true
 proxmox-time.workspace = true
 
 pbs-api-types.workspace = true

diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs
index 6810c19cd6826ca2199f63ae797e1bead26086d6..242556d043af75358645ff2482f96ff18f5304a9 100644 (file)
--- a/proxmox-backup-client/src/mount.rs
+++ b/proxmox-backup-client/src/mount.rs
@@ -15,7 +15,7 @@ use tokio::signal::unix::{signal, SignalKind};
 
 use proxmox_router::{cli::*, ApiHandler, ApiMethod, RpcEnvironment};
 use proxmox_schema::*;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::BackupNamespace;
 use pbs_client::tools::key_source::get_encryption_key_password;

diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml
index 08f77d886d3eee6617a3cde5c1743f3ec3b9ea00..161b371d38da7db334552c462f9f2f7d89de4772 100644 (file)
--- a/proxmox-restore-daemon/Cargo.toml
+++ b/proxmox-restore-daemon/Cargo.toml
@@ -31,7 +31,8 @@ proxmox-compression.workspace = true
 proxmox-rest-server.workspace = true
 proxmox-router = { workspace = true, features = [ "cli", "server" ] }
 proxmox-schema = { workspace = true, features = [ "api-macro" ] }
-proxmox-sys = { workspace = true,  features = [ "sortable-macro" ] }
+proxmox-sortable-macro.workspace = true
+proxmox-sys.workspace = true
 proxmox-time.workspace = true
 
 pbs-api-types.workspace = true

diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
index dd2a13cfe7cf19b4664a46dfb151214918779a42..fef7ba9b7eae7ef5c0c0b59ce4748538a57ce13e 100644 (file)
--- a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
+++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
@@ -20,7 +20,7 @@ use proxmox_router::{
 };
 use proxmox_schema::*;
 use proxmox_sys::fs::read_subdir;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::file_restore::{FileRestoreFormat, RestoreDaemonStatus};
 use pbs_client::pxar::{create_archive, Flags, PxarCreateOptions, ENCODER_MAX_ENTRIES};

diff --git a/src/api2/access/mod.rs b/src/api2/access/mod.rs
index d3e21763b6926462edb6a451d2a36cfcd4d74a51..82085376050af0cece9aae4577ca5f2773f8d228 100644 (file)
--- a/src/api2/access/mod.rs
+++ b/src/api2/access/mod.rs
@@ -10,7 +10,7 @@ use proxmox_router::{
     http_err, list_subdirs_api_method, Permission, Router, RpcEnvironment, SubdirMap,
 };
 use proxmox_schema::api;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::{
     Authid, Userid, ACL_PATH_SCHEMA, PASSWORD_SCHEMA, PRIVILEGES, PRIV_PERMISSIONS_MODIFY,

diff --git a/src/api2/access/openid.rs b/src/api2/access/openid.rs
index 095726fd171e8dc7394ef9224f5fd106122cf012..7154b0862873b24bbb7a035aedc1a12efee08ddf 100644 (file)
--- a/src/api2/access/openid.rs
+++ b/src/api2/access/openid.rs
@@ -6,7 +6,7 @@ use proxmox_router::{
     http_err, list_subdirs_api_method, Permission, Router, RpcEnvironment, SubdirMap,
 };
 use proxmox_schema::api;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use proxmox_openid::{OpenIdAuthenticator, OpenIdConfig};
 

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 8d3a6146237e204a2118573027b4a1a4f6fd5daa..2fdef99e47d2f8660ab5ef24b253518389b180a1 100644 (file)
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -25,7 +25,7 @@ use proxmox_schema::*;
 use proxmox_sys::fs::{
     file_read_firstline, file_read_optional_string, replace_file, CreateOptions,
 };
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 use proxmox_sys::{task_log, task_warn};
 
 use pxar::accessor::aio::Accessor;

diff --git a/src/api2/admin/mod.rs b/src/api2/admin/mod.rs
index 9b6fc9add20b9b81e65109565b01930f3ef9e6b3..168dc038d7d1ac93629112588d6cb38990c978ee 100644 (file)
--- a/src/api2/admin/mod.rs
+++ b/src/api2/admin/mod.rs
@@ -2,7 +2,7 @@
 
 use proxmox_router::list_subdirs_api_method;
 use proxmox_router::{Router, SubdirMap};
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 pub mod datastore;
 pub mod metrics;

diff --git a/src/api2/admin/prune.rs b/src/api2/admin/prune.rs
index 2edf52f4477e5e81431521ce3d703d807232d356..a5ebf29757d648b50e625fa4c657952db938682a 100644 (file)
--- a/src/api2/admin/prune.rs
+++ b/src/api2/admin/prune.rs
@@ -7,7 +7,7 @@ use proxmox_router::{
     list_subdirs_api_method, ApiMethod, Permission, Router, RpcEnvironment, SubdirMap,
 };
 use proxmox_schema::api;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::{
     Authid, PruneJobConfig, PruneJobStatus, DATASTORE_SCHEMA, JOB_ID_SCHEMA, PRIV_DATASTORE_AUDIT,

diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs
index e2a7e7a6b32f8671a29d54db9c01174efa31bb7e..4e2ba0be8a8274619b711a124af866972a136854 100644 (file)
--- a/src/api2/admin/sync.rs
+++ b/src/api2/admin/sync.rs
@@ -8,7 +8,7 @@ use proxmox_router::{
     SubdirMap,
 };
 use proxmox_schema::api;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::{Authid, SyncJobConfig, SyncJobStatus, DATASTORE_SCHEMA, JOB_ID_SCHEMA};
 use pbs_config::sync;

diff --git a/src/api2/admin/verify.rs b/src/api2/admin/verify.rs
index 52635bed43265b5f2e002a0bd0bc663735598a3a..66695236cf9c7563b6121e1f788021bb0e1cb36f 100644 (file)
--- a/src/api2/admin/verify.rs
+++ b/src/api2/admin/verify.rs
@@ -8,7 +8,7 @@ use proxmox_router::{
     SubdirMap,
 };
 use proxmox_schema::api;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::{
     Authid, VerificationJobConfig, VerificationJobStatus, DATASTORE_SCHEMA, JOB_ID_SCHEMA,

diff --git a/src/api2/backup/mod.rs b/src/api2/backup/mod.rs
index 0ebadaa5a461b6c9cbf289b011244f6272487eb8..652d5baa5588564fc57c65f68bab5a5f49536a69 100644 (file)
--- a/src/api2/backup/mod.rs
+++ b/src/api2/backup/mod.rs
@@ -14,7 +14,7 @@ use proxmox_router::{
     ApiHandler, ApiMethod, ApiResponseFuture, Permission, Router, RpcEnvironment, SubdirMap,
 };
 use proxmox_schema::*;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::{
     Authid, BackupNamespace, BackupType, Operation, SnapshotVerifyState, VerifyState,

diff --git a/src/api2/backup/upload_chunk.rs b/src/api2/backup/upload_chunk.rs
index 78d6953710be81847d880a032da6a316eacd9f94..20259660a1d8a1b54051b4c5ce63f5c66f1ce6cf 100644 (file)
--- a/src/api2/backup/upload_chunk.rs
+++ b/src/api2/backup/upload_chunk.rs
@@ -11,7 +11,7 @@ use serde_json::{json, Value};
 
 use proxmox_router::{ApiHandler, ApiMethod, ApiResponseFuture, RpcEnvironment};
 use proxmox_schema::*;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::{BACKUP_ARCHIVE_NAME_SCHEMA, CHUNK_DIGEST_SCHEMA};
 use pbs_datastore::file_formats::{DataBlobHeader, EncryptedDataBlobHeader};

diff --git a/src/api2/config/access/mod.rs b/src/api2/config/access/mod.rs
index a75d89b4e9146dfeaa6fe8341a8afdb6af418533..614bd5e6cf0ab155c52ac6be688ba569a034d2c2 100644 (file)
--- a/src/api2/config/access/mod.rs
+++ b/src/api2/config/access/mod.rs
@@ -1,6 +1,6 @@
 use proxmox_router::list_subdirs_api_method;
 use proxmox_router::{Router, SubdirMap};
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 pub mod ldap;
 pub mod openid;

diff --git a/src/api2/config/metrics/mod.rs b/src/api2/config/metrics/mod.rs
index 6af04f930101dda2a2ba89b295fdf6af0a376bd3..98904660ca5a67527ae51ea6010ba427b923ba4f 100644 (file)
--- a/src/api2/config/metrics/mod.rs
+++ b/src/api2/config/metrics/mod.rs
@@ -1,6 +1,6 @@
 use proxmox_router::list_subdirs_api_method;
 use proxmox_router::{Router, SubdirMap};
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 pub mod influxdbhttp;
 pub mod influxdbudp;

diff --git a/src/api2/config/mod.rs b/src/api2/config/mod.rs
index 265b6fc86dec237ff19776dcdefc0cb853a6a9eb..6cfeaea105e939cd793742348c644341dd8971d6 100644 (file)
--- a/src/api2/config/mod.rs
+++ b/src/api2/config/mod.rs
@@ -2,7 +2,7 @@
 
 use proxmox_router::list_subdirs_api_method;
 use proxmox_router::{Router, SubdirMap};
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 pub mod access;
 pub mod acme;

diff --git a/src/api2/config/remote.rs b/src/api2/config/remote.rs
index 2f02d1215eeb91fe1716a73663691399a3b830ab..76dd3b899053d47845c22a00bcae128b0334db30 100644 (file)
--- a/src/api2/config/remote.rs
+++ b/src/api2/config/remote.rs
@@ -5,7 +5,7 @@ use pbs_api_types::BackupNamespace;
 use pbs_api_types::NamespaceListItem;
 use proxmox_router::list_subdirs_api_method;
 use proxmox_router::SubdirMap;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 use serde_json::Value;
 
 use proxmox_router::{http_bail, http_err, ApiMethod, Permission, Router, RpcEnvironment};

diff --git a/src/api2/mod.rs b/src/api2/mod.rs
index 2a83020cc182e4133d13bba1ad2ffff615efd9e7..b404bbdb9549cc7b20cb7b57e6c6d08f33e869a8 100644 (file)
--- a/src/api2/mod.rs
+++ b/src/api2/mod.rs
@@ -1,6 +1,6 @@
 //! The Proxmox Backup Server API
 
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 pub mod access;
 pub mod admin;

diff --git a/src/api2/node/disks/mod.rs b/src/api2/node/disks/mod.rs
index c16be46aac89187fb7975053846e4ffe77808017..5ee959cd304fae5599131aa4b8f9bcc80acf7551 100644 (file)
--- a/src/api2/node/disks/mod.rs
+++ b/src/api2/node/disks/mod.rs
@@ -5,7 +5,8 @@ use proxmox_router::{
     list_subdirs_api_method, Permission, Router, RpcEnvironment, RpcEnvironmentType, SubdirMap,
 };
 use proxmox_schema::api;
-use proxmox_sys::{sortable, task_log};
+use proxmox_sortable_macro::sortable;
+use proxmox_sys::task_log;
 
 use pbs_api_types::{
     BLOCKDEVICE_NAME_SCHEMA, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA,

diff --git a/src/api2/node/mod.rs b/src/api2/node/mod.rs
index 763e6ea9ea901a9675de5b5775069242472e550c..339aadff1eb3ccbe6371eebd3c80e9224b1389cc 100644 (file)
--- a/src/api2/node/mod.rs
+++ b/src/api2/node/mod.rs
@@ -13,7 +13,7 @@ use serde_json::{json, Value};
 use tokio::io::{AsyncBufReadExt, BufReader};
 
 use proxmox_sys::fd::fd_change_cloexec;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use proxmox_http::websocket::WebSocket;
 use proxmox_router::list_subdirs_api_method;

diff --git a/src/api2/node/services.rs b/src/api2/node/services.rs
index 3d3b8501f8fd876073a35aef19d83adab35727de..4a73b42d7e4184ff39e37dfd18db7b5a31edc3e2 100644 (file)
--- a/src/api2/node/services.rs
+++ b/src/api2/node/services.rs
@@ -5,7 +5,7 @@ use serde_json::{json, Value};
 
 use proxmox_router::{list_subdirs_api_method, Permission, Router, RpcEnvironment, SubdirMap};
 use proxmox_schema::api;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::{Authid, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, SERVICE_ID_SCHEMA};
 

diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs
index d386f805fc2796d52449066dee88422c832a62a0..0f43aaf40e73a152d3e56d0885bbeb1f05087a6f 100644 (file)
--- a/src/api2/node/tasks.rs
+++ b/src/api2/node/tasks.rs
@@ -14,7 +14,7 @@ use proxmox_router::{
     RpcEnvironment, SubdirMap,
 };
 use proxmox_schema::{api, BooleanSchema, IntegerSchema, ObjectSchema, Schema};
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::{
     Authid, TaskListItem, TaskStateType, Tokenname, Userid, DATASTORE_SCHEMA, NODE_SCHEMA,

diff --git a/src/api2/reader/mod.rs b/src/api2/reader/mod.rs
index 1ac4ac40276b0a7598d4f6b2b68715e2d30034ab..b1a5612b00c7f1338ac45b536297937a03c48226 100644 (file)
--- a/src/api2/reader/mod.rs
+++ b/src/api2/reader/mod.rs
@@ -14,7 +14,7 @@ use proxmox_router::{
     Router, RpcEnvironment, SubdirMap,
 };
 use proxmox_schema::{BooleanSchema, ObjectSchema};
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 
 use pbs_api_types::{
     Authid, Operation, BACKUP_ARCHIVE_NAME_SCHEMA, BACKUP_ID_SCHEMA, BACKUP_NAMESPACE_SCHEMA,

diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs
index 2d46553760a41c30c041b200e7260bb82414dfd6..020dd492b4d81fbe557d6f72e213831f3fee3e3a 100644 (file)
--- a/src/api2/tape/drive.rs
+++ b/src/api2/tape/drive.rs
@@ -10,7 +10,7 @@ use proxmox_router::{
 };
 use proxmox_schema::api;
 use proxmox_section_config::SectionConfigData;
-use proxmox_sys::sortable;
+use proxmox_sortable_macro::sortable;
 use proxmox_sys::{task_log, task_warn};
 use proxmox_uuid::Uuid;