From 7e12788c601cb7f6e7ad2249ee123f9b29aa196d Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 1 Mar 2023 13:40:39 +0100
Subject: [PATCH] sys: drop sortable and identity macros

We should not use the sys crate to pull in the sortable
macro, just depend on its crate instead...
And the identity macro used to be required by the sortable
macro, but is not anymore and has been deprecated for a
while, so we can now drop it.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 proxmox-sys/Cargo.toml |  4 ----
 proxmox-sys/src/lib.rs | 14 --------------
 2 files changed, 18 deletions(-)

diff --git a/proxmox-sys/Cargo.toml b/proxmox-sys/Cargo.toml
index 161eea35..2b44bd01 100644
--- a/proxmox-sys/Cargo.toml
+++ b/proxmox-sys/Cargo.toml
@@ -21,16 +21,12 @@ serde_json.workspace = true
 serde = { workspace = true, features = [ "derive" ] }
 zstd = { workspace = true, optional = true}
 
-# Macro crates:
-proxmox-sortable-macro = { workspace = true, optional = true }
-
 proxmox-io.workspace = true
 proxmox-lang.workspace = true
 proxmox-time.workspace = true
 
 [features]
 default = []
-sortable-macro = ["dep:proxmox-sortable-macro"]
 logrotate = ["dep:zstd"]
 acl = []
 crypt = []
diff --git a/proxmox-sys/src/lib.rs b/proxmox-sys/src/lib.rs
index 8a6b9ef3..7e590586 100644
--- a/proxmox-sys/src/lib.rs
+++ b/proxmox-sys/src/lib.rs
@@ -18,20 +18,6 @@ pub mod systemd;
 mod worker_task_context;
 pub use worker_task_context::*;
 
-#[deprecated(
-    since = "0.2.2",
-    note = "the sortable macro does not require this anymore, it will be removed"
-)]
-/// An identity (nop) macro. Used by the `#[sortable]` proc macro.
-#[cfg(feature = "sortable-macro")]
-#[macro_export]
-macro_rules! identity {
-    ($($any:tt)*) => ($($any)*)
-}
-
-#[cfg(feature = "sortable-macro")]
-pub use proxmox_sortable_macro::sortable;
-
 #[allow(deprecated)]
 use fd::Fd;