From c3bff5ee9fc965a4682b82c9073922c133667e6f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 15 Aug 2024 14:44:29 -0400
Subject: [PATCH 1/2] build-sys: Move a few dev-deps to workspace deps

Just to increase sharing.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 Cargo.toml                   | 3 +++
 lib/Cargo.toml               | 6 +++---
 tests-integration/Cargo.toml | 2 +-
 utils/Cargo.toml             | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f2c63fd9a..2d7c69e30 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,10 +23,13 @@ camino = "1.1.6"
 cap-std-ext = "4.0.2"
 chrono = { version = "0.4.38", default-features = false }
 clap = "4.5.4"
+indoc = "2.0.5"
 fn-error-context = "0.2.1"
 libc = "0.2.154"
 serde = "1.0.199"
 serde_json = "1.0.116"
+similar-asserts = "1.5.0"
+static_assertions = "1.1.0"
 tempfile = "3.10.1"
 tracing = "0.1.40"
 tokio = ">= 1.37.0"
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 96dcb2d39..1f63cfbc9 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -49,9 +49,9 @@ uuid = { version = "1.8.0", features = ["v4"] }
 tini = "1.3.0"
 
 [dev-dependencies]
-indoc = "2.0.5"
-similar-asserts = { version = "1.5.0" }
-static_assertions = "1.1.0"
+indoc = { workspace = true }
+similar-asserts = { workspace = true }
+static_assertions = { workspace = true }
 
 [features]
 default = ["install"]
diff --git a/tests-integration/Cargo.toml b/tests-integration/Cargo.toml
index 7a07fdc55..87b9a95df 100644
--- a/tests-integration/Cargo.toml
+++ b/tests-integration/Cargo.toml
@@ -16,7 +16,7 @@ camino = { workspace = true }
 cap-std-ext = { workspace = true }
 clap = { workspace = true, features = ["derive","cargo"] }
 fn-error-context = { workspace = true }
-indoc = "2.0.5"
+indoc = { workspace = true }
 libtest-mimic = "0.7.3"
 oci-spec = "0.6.5"
 rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process"] }
diff --git a/utils/Cargo.toml b/utils/Cargo.toml
index 0a28b807e..9d002e78f 100644
--- a/utils/Cargo.toml
+++ b/utils/Cargo.toml
@@ -15,8 +15,8 @@ tracing = { workspace = true }
 tokio = { workspace = true, features = ["process"] }
 
 [dev-dependencies]
-similar-asserts = { version = "1.5.0" }
-static_assertions = "1.1.0"
+similar-asserts = { workspace = true }
+static_assertions = { workspace = true }
 
 [lints]
 workspace = true

From f8f434a864e1e28c3c953fcbbd826abc40fbae1a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 15 Aug 2024 14:46:24 -0400
Subject: [PATCH 2/2] build-sys: Add rustix to workspace deps

Just sharing more.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 Cargo.toml                   | 1 +
 lib/Cargo.toml               | 2 +-
 tests-integration/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2d7c69e30..56382031a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,6 +26,7 @@ clap = "4.5.4"
 indoc = "2.0.5"
 fn-error-context = "0.2.1"
 libc = "0.2.154"
+rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process", "mount"] }
 serde = "1.0.199"
 serde_json = "1.0.116"
 similar-asserts = "1.5.0"
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 1f63cfbc9..cb31835d7 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -33,7 +33,7 @@ liboverdrop = "0.1.0"
 libsystemd = "0.7"
 openssl = "^0.10.64"
 regex = "1.10.4"
-rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process", "mount"] }
+rustix = { workspace = true }
 schemars = { version = "0.8.17", features = ["chrono"] }
 serde = { workspace = true, features = ["derive"] }
 serde_ignored = "0.1.10"
diff --git a/tests-integration/Cargo.toml b/tests-integration/Cargo.toml
index 87b9a95df..21d9a71d1 100644
--- a/tests-integration/Cargo.toml
+++ b/tests-integration/Cargo.toml
@@ -19,7 +19,7 @@ fn-error-context = { workspace = true }
 indoc = { workspace = true }
 libtest-mimic = "0.7.3"
 oci-spec = "0.6.5"
-rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process"] }
+rustix = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tempfile = { workspace = true }