From 6e422d96d7cda4621f20a47afd29a26851ca1b43 Mon Sep 17 00:00:00 2001
From: pinkforest <36498018+pinkforest@users.noreply.github.com>
Date: Wed, 28 Jun 2023 09:38:06 +0000
Subject: [PATCH] Re-organize Cargo manifests to workspace

---
 Cargo.toml                  | 12 ++++++++++++
 curve25519-dalek/Cargo.toml |  5 +----
 ed25519-dalek/Cargo.toml    |  4 ++--
 x25519-dalek/Cargo.toml     |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..a891c67
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,12 @@
+[workspace]
+members = [
+    "curve25519-dalek",
+    "curve25519-dalek-derive",
+    "ed25519-dalek",
+    "x25519-dalek"
+]
+resolver = "2"
+
+[profile.dev]
+opt-level = 2
+
diff --git a/curve25519-dalek/Cargo.toml b/curve25519-dalek/Cargo.toml
index cc7a5ca..7b1d9ac 100644
--- a/curve25519-dalek/Cargo.toml
+++ b/curve25519-dalek/Cargo.toml
@@ -67,7 +67,4 @@ precomputed-tables = []
 legacy_compatibility = []
 
 [target.'cfg(all(not(curve25519_dalek_backend = "fiat"), not(curve25519_dalek_backend = "serial"), target_arch = "x86_64"))'.dependencies]
-curve25519-dalek-derive = { version = "0.1", path = "curve25519-dalek-derive" }
-
-[profile.dev]
-opt-level = 2
+curve25519-dalek-derive = { version = "0.1", path = "../curve25519-dalek-derive" }
diff --git a/ed25519-dalek/Cargo.toml b/ed25519-dalek/Cargo.toml
index f37d5b3..d6fc526 100644
--- a/ed25519-dalek/Cargo.toml
+++ b/ed25519-dalek/Cargo.toml
@@ -25,7 +25,7 @@ rustdoc-args = [
 features = ["batch", "digest", "hazmat", "pem", "serde"]
 
 [dependencies]
-curve25519-dalek = { version = "=4.0.0-rc.3", default-features = false, features = ["digest"] }
+curve25519-dalek = { version = "=4.0.0-rc.3", path = "../curve25519-dalek", default-features = false, features = ["digest"] }
 ed25519 = { version = ">=2.2, <2.3", default-features = false }
 signature = { version = ">=2.0, <2.1", optional = true, default-features = false }
 sha2 = { version = "0.10", default-features = false }
@@ -37,7 +37,7 @@ serde = { version = "1.0", default-features = false, optional = true }
 zeroize = { version = "1.5", default-features = false, optional = true }
 
 [dev-dependencies]
-curve25519-dalek = { version = "=4.0.0-rc.3", default-features = false, features = ["digest", "rand_core"] }
+curve25519-dalek = { version = "=4.0.0-rc.3", path = "../curve25519-dalek", default-features = false, features = ["digest", "rand_core"] }
 blake2 = "0.10"
 sha3 = "0.10"
 hex = "0.4"
diff --git a/x25519-dalek/Cargo.toml b/x25519-dalek/Cargo.toml
index 201968b..0875139 100644
--- a/x25519-dalek/Cargo.toml
+++ b/x25519-dalek/Cargo.toml
@@ -38,7 +38,7 @@ rustdoc-args = [
 features = ["getrandom", "reusable_secrets", "serde", "static_secrets"]
 
 [dependencies]
-curve25519-dalek = { version = "=4.0.0-rc.3", default-features = false }
+curve25519-dalek = { version = "=4.0.0-rc.3", path = "../curve25519-dalek", default-features = false }
 rand_core = { version = "0.6", default-features = false }
 serde = { version = "1", default-features = false, optional = true, features = ["derive"] }
 zeroize = { version = "1", default-features = false, optional = true, features = ["zeroize_derive"] }