From 7f4d223a4a215eec4b208a9382b9a7cfb38a2c74 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Thu, 21 Nov 2019 13:10:37 +0100
Subject: [PATCH] rename sorted-data to proxmox-sortable_macro

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 Cargo.toml                                            | 7 +++----
 {sorted-data => proxmox-sortable-macro}/Cargo.toml    | 2 +-
 {sorted-data => proxmox-sortable-macro}/src/lib.rs    | 0
 {sorted-data => proxmox-sortable-macro}/tests/test.rs | 2 +-
 proxmox/Cargo.toml                                    | 4 ++--
 proxmox/src/lib.rs                                    | 6 +++++-
 6 files changed, 12 insertions(+), 9 deletions(-)
 rename {sorted-data => proxmox-sortable-macro}/Cargo.toml (91%)
 rename {sorted-data => proxmox-sortable-macro}/src/lib.rs (100%)
 rename {sorted-data => proxmox-sortable-macro}/tests/test.rs (95%)

diff --git a/Cargo.toml b/Cargo.toml
index 454b3a16..7a957f1b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,11 @@
 [workspace]
 members = [
-    "proxmox-tools",
+    "proxmox",
     "proxmox-api",
     "proxmox-api-macro",
+    "proxmox-sortable-macro",
     "proxmox-sys",
-    "proxmox",
-
-    "sorted-data",
+    "proxmox-tools",
 
 # This is an api server test and may be temporarily broken by changes to
 # proxmox-api or proxmox-api-macro, but should ultimately be updated to work
diff --git a/sorted-data/Cargo.toml b/proxmox-sortable-macro/Cargo.toml
similarity index 91%
rename from sorted-data/Cargo.toml
rename to proxmox-sortable-macro/Cargo.toml
index 5dff0ed1..5aa7f8ee 100644
--- a/sorted-data/Cargo.toml
+++ b/proxmox-sortable-macro/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sorted-data"
+name = "proxmox-sortable-macro"
 version = "0.1.0"
 authors = ["Wolfgang Bumiller <w.bumiller@proxmox.com>"]
 edition = "2018"
diff --git a/sorted-data/src/lib.rs b/proxmox-sortable-macro/src/lib.rs
similarity index 100%
rename from sorted-data/src/lib.rs
rename to proxmox-sortable-macro/src/lib.rs
diff --git a/sorted-data/tests/test.rs b/proxmox-sortable-macro/tests/test.rs
similarity index 95%
rename from sorted-data/tests/test.rs
rename to proxmox-sortable-macro/tests/test.rs
index ea3f9e3e..f1eb463c 100644
--- a/sorted-data/tests/test.rs
+++ b/proxmox-sortable-macro/tests/test.rs
@@ -1,4 +1,4 @@
-use sorted_data::sortable;
+use proxmox_sortable_macro::sortable;
 
 // The way #[sorted] works we require an 'identity' macro due to the inability of the syntax tree
 // visitor to change the type of a syntax tree element.
diff --git a/proxmox/Cargo.toml b/proxmox/Cargo.toml
index a295a408..7d92a4e5 100644
--- a/proxmox/Cargo.toml
+++ b/proxmox/Cargo.toml
@@ -12,10 +12,10 @@ proxmox-api = { path = "../proxmox-api" }
 proxmox-api-macro = { path = "../proxmox-api-macro", optional = true }
 proxmox-sys = { path = "../proxmox-sys" }
 proxmox-tools = { path = "../proxmox-tools" }
-sorted-data = { path = "../sorted-data", optional = true }
+proxmox-sortable-macro = { path = "../proxmox-sortable-macro", optional = true }
 
 [features]
 default = []
 valgrind = ["proxmox-tools/valgrind"]
 api-macro = ["proxmox-api-macro"]
-sortable-macro = ["sorted-data"]
+sortable-macro = ["proxmox-sortable-macro"]
diff --git a/proxmox/src/lib.rs b/proxmox/src/lib.rs
index 0f7a8e3d..1248a299 100644
--- a/proxmox/src/lib.rs
+++ b/proxmox/src/lib.rs
@@ -11,5 +11,9 @@ pub mod api {
 
 #[cfg(feature = "sortable-macro")]
 pub use proxmox_tools::identity;
+
 #[cfg(feature = "sortable-macro")]
-pub use sorted_data::{self, sortable};
+pub use proxmox_sortable_macro as sortable_macro;
+
+#[cfg(feature = "sortable-macro")]
+pub use proxmox_sortable_macro::sortable;