From 07fa0775cd1fabae58210bc911be4bb55cd8d64b Mon Sep 17 00:00:00 2001
From: Alex Zenla <alex@mycelium.engineering>
Date: Mon, 29 Jan 2024 07:53:35 -0800
Subject: [PATCH] move all dependencies to workspace Cargo.toml

---
 Cargo.toml               | 39 ++++++++++++++++++++++++
 hypha/Cargo.toml         | 65 ++++++++++++++++------------------------
 loopdev/Cargo.toml       |  6 ++--
 xen/xencall/Cargo.toml   | 13 ++++----
 xen/xenclient/Cargo.toml | 21 ++++++-------
 xen/xenevtchn/Cargo.toml |  4 +--
 xen/xenstore/Cargo.toml  |  6 ++--
 7 files changed, 87 insertions(+), 67 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 73701b5..d4d7027 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,3 +8,42 @@ members = [
     "loopdev",
 ]
 resolver = "2"
+
+[workspace.dependencies]
+log = "0.4.20"
+libc = "0.2"
+nix = "0.27.1"
+bytemuck = "1.14.0"
+slice-copy = "0.3.0"
+memchr = "2"
+xz2 = "0.1"
+flate2 = "1.0"
+elf = "0.7.4"
+env_logger = "0.11.0"
+errno = "0.3.0"
+oci-spec = "0.6.4"
+backhand = "0.14.2"
+sha256 = "1.5.0"
+serde = "1.0.196"
+serde_json = "1.0.113"
+walkdir = "2"
+directories = "5.0.1"
+tar = "0.4.40"
+zstd = "0.13.0"
+termion = "3.0.0"
+path-clean = "1.0.1"
+ureq = "2.9.1"
+url = "2.5.0"
+cli-tables = "0.2.1"
+
+[workspace.dependencies.uuid]
+version = "1.6.1"
+features = ["v4"]
+
+[workspace.dependencies.sys-mount]
+version = "2.1.1"
+default-features = false
+
+[workspace.dependencies.clap]
+version = "4.4.18"
+features = ["derive"]
diff --git a/hypha/Cargo.toml b/hypha/Cargo.toml
index 2d6477e..40ceb55 100644
--- a/hypha/Cargo.toml
+++ b/hypha/Cargo.toml
@@ -4,54 +4,41 @@ version = "0.0.1"
 edition = "2021"
 resolver = "2"
 
+[dependencies]
+log = { workspace = true }
+env_logger = { workspace = true }
+zstd = { workspace = true }
+flate2 = { workspace = true }
+tar = { workspace = true }
+directories = { workspace = true }
+walkdir = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+sha256 = { workspace = true }
+url = { workspace = true }
+ureq = { workspace = true }
+path-clean = { workspace = true }
+termion = { workspace = true }
+cli-tables = { workspace = true }
+clap = { workspace = true }
+sys-mount = { workspace = true }
+oci-spec = { workspace = true }
+backhand = { workspace = true }
+uuid = { workspace = true }
+
+[dependencies.nix]
+workspace = true
+features = ["process"]
+
 [dependencies.xenclient]
 path = "../xen/xenclient"
 
 [dependencies.loopdev]
 path = "../loopdev"
 
-[dependencies]
-log = "0.4.20"
-env_logger = "0.11.0"
-zstd = "0.13.0"
-flate2 = "1.0.28"
-tar = "0.4.40"
-directories = "5.0.1"
-walkdir = "2"
-serde = "1.0.195"
-serde_json = "1.0.111"
-sha256 = "1.5.0"
-url = "2.5.0"
-ureq = "2.9.1"
-path-clean = "1.0.1"
-termion = "3.0.0"
-cli-tables = "0.2.1"
-
 [dependencies.xenstore]
 path = "../xen/xenstore"
 
-[dependencies.clap]
-version = "4.4.18"
-features = ["derive"]
-
-[dependencies.oci-spec]
-version = "0.6.4"
-
-[dependencies.backhand]
-version = "0.14.2"
-
-[dependencies.uuid]
-version = "1.6.1"
-features = ["v4"]
-
-[dependencies.sys-mount]
-default-features = false
-version = "2.1.1"
-
-[dependencies.nix]
-features = ["process"]
-version = "0.27.1"
-
 [lib]
 path = "src/lib.rs"
 
diff --git a/loopdev/Cargo.toml b/loopdev/Cargo.toml
index 3a29611..5632b9e 100644
--- a/loopdev/Cargo.toml
+++ b/loopdev/Cargo.toml
@@ -12,9 +12,9 @@ edition = "2021"
 name = "loopdev"
 
 [dependencies]
-errno = "0.3.0"
-libc = "0.2.105"
+errno = { workspace = true }
+libc = { workspace = true }
 
 [dependencies.nix]
-version = "0.27.1"
+workspace = true
 features = ["ioctl"]
diff --git a/xen/xencall/Cargo.toml b/xen/xencall/Cargo.toml
index c91bcf5..64a2a02 100644
--- a/xen/xencall/Cargo.toml
+++ b/xen/xencall/Cargo.toml
@@ -8,19 +8,16 @@ resolver = "2"
 path = "src/lib.rs"
 
 [dependencies]
-libc = "0.2"
-log = "0.4.20"
-
-[dependencies.uuid]
-version = "1.6.1"
-features = ["v4"]
+libc = { workspace = true }
+log = { workspace = true }
+uuid = { workspace = true }
 
 [dependencies.nix]
-version = "0.27.1"
+workspace = true
 features = ["ioctl"]
 
 [dev-dependencies]
-env_logger = "0.11.0"
+env_logger = { workspace = true }
 
 [[example]]
 name = "xencall-domain-info"
diff --git a/xen/xenclient/Cargo.toml b/xen/xenclient/Cargo.toml
index a04401a..fbf2e71 100644
--- a/xen/xenclient/Cargo.toml
+++ b/xen/xenclient/Cargo.toml
@@ -5,13 +5,14 @@ edition = "2021"
 resolver = "2"
 
 [dependencies]
-libc = "0.2"
-elf = "0.7.4"
-flate2 = "1.0"
-xz2 = "0.1"
-memchr = "2"
-slice-copy = "0.3.0"
-log = "0.4.20"
+libc = { workspace = true }
+elf = { workspace = true }
+flate2 = { workspace = true }
+xz2 = { workspace = true }
+memchr = { workspace = true }
+slice-copy = { workspace = true }
+log = { workspace = true }
+uuid = { workspace = true }
 
 [dependencies.xencall]
 path = "../xencall"
@@ -22,12 +23,8 @@ path = "../xenstore"
 [dependencies.xenevtchn]
 path = "../xenevtchn"
 
-[dependencies.uuid]
-version = "1.6.1"
-features = ["v4"]
-
 [dev-dependencies]
-env_logger = "0.11.1"
+env_logger = { workspace = true }
 
 [lib]
 path = "src/lib.rs"
diff --git a/xen/xenevtchn/Cargo.toml b/xen/xenevtchn/Cargo.toml
index 9e80e69..8409f92 100644
--- a/xen/xenevtchn/Cargo.toml
+++ b/xen/xenevtchn/Cargo.toml
@@ -5,10 +5,10 @@ edition = "2021"
 resolver = "2"
 
 [dependencies]
-log = "0.4.20"
+log = { workspace = true }
 
 [dependencies.nix]
-version = "0.27.1"
+workspace = true
 features = ["ioctl"]
 
 [lib]
diff --git a/xen/xenstore/Cargo.toml b/xen/xenstore/Cargo.toml
index 2bf3a16..1ae16ae 100644
--- a/xen/xenstore/Cargo.toml
+++ b/xen/xenstore/Cargo.toml
@@ -8,11 +8,11 @@ resolver = "2"
 path = "src/lib.rs"
 
 [dependencies]
-libc = "0.2"
-log = "0.4.20"
+libc = { workspace = true }
+log = { workspace = true }
 
 [dependencies.bytemuck]
-version = "1.14.0"
+workspace = true
 features = ["derive"]
 
 [[example]]