From 40d43d24e83ff3a7dfdc82ae94fae898a4c39267 Mon Sep 17 00:00:00 2001
From: Theodore Schnepper <tschnepper@espressosys.com>
Date: Wed, 4 Sep 2024 09:58:42 -0600
Subject: [PATCH 1/2] Replace version and edition shorthands in crates

The `cargo-sort` utility seems to not be able to understand the shorthand assignment
for the workspace.

Example:

This is problematic and causes cargo-sort to error.

```
version.workspace = true
```

This works with cargo-sort
```
version = { workspace = true }
```

This replaces the shorthand with the longer form so that `cargo-sort` can
work and not interfere with the nix precommit hook.
---
 crates/legacy/Cargo.toml      | 4 ++--
 crates/marketplace/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/legacy/Cargo.toml b/crates/legacy/Cargo.toml
index 3bc34af4..5a87e934 100644
--- a/crates/legacy/Cargo.toml
+++ b/crates/legacy/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hotshot-builder-core"
-version.workspace = true
-edition.workspace = true
+version = { workspace = true }
+edition = { workspace = true }
 
 [dependencies]
 hotshot = { workspace = true }
diff --git a/crates/marketplace/Cargo.toml b/crates/marketplace/Cargo.toml
index ed7b5a63..bc564e4a 100644
--- a/crates/marketplace/Cargo.toml
+++ b/crates/marketplace/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "marketplace-builder-core"
-version.workspace = true
-edition.workspace = true
+version = { workspace = true }
+edition = { workspace = true }
 
 [dependencies]
 hotshot = { workspace = true }

From fa1894c528cef416964c9f0ffb55c617bf69437c Mon Sep 17 00:00:00 2001
From: Theodore Schnepper <tschnepper@espressosys.com>
Date: Wed, 4 Sep 2024 10:02:40 -0600
Subject: [PATCH 2/2] Apply cargo-sort to Cargo files

---
 crates/legacy/Cargo.toml      |  8 ++++----
 crates/marketplace/Cargo.toml | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/crates/legacy/Cargo.toml b/crates/legacy/Cargo.toml
index 5a87e934..498c92ac 100644
--- a/crates/legacy/Cargo.toml
+++ b/crates/legacy/Cargo.toml
@@ -4,10 +4,6 @@ version = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-hotshot = { workspace = true }
-hotshot-builder-api = { workspace = true }
-hotshot-events-service = { workspace = true }
-hotshot-types = { workspace = true }
 
 anyhow = { workspace = true }
 async-broadcast = { workspace = true }
@@ -21,6 +17,10 @@ committable = { workspace = true }
 derivative = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
+hotshot = { workspace = true }
+hotshot-builder-api = { workspace = true }
+hotshot-events-service = { workspace = true }
+hotshot-types = { workspace = true }
 lru = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 sha2 = { workspace = true }
diff --git a/crates/marketplace/Cargo.toml b/crates/marketplace/Cargo.toml
index bc564e4a..39f55f1c 100644
--- a/crates/marketplace/Cargo.toml
+++ b/crates/marketplace/Cargo.toml
@@ -4,11 +4,6 @@ version = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-hotshot = { workspace = true }
-hotshot-builder-api = { workspace = true }
-hotshot-events-service = { workspace = true }
-hotshot-task-impls = { workspace = true }
-hotshot-types = { workspace = true }
 
 anyhow = "1"
 async-broadcast = "0.7"
@@ -22,7 +17,13 @@ derivative = { workspace = true }
 either = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
+hotshot = { workspace = true }
+hotshot-builder-api = { workspace = true }
+hotshot-events-service = { workspace = true }
+hotshot-task-impls = { workspace = true }
+hotshot-types = { workspace = true }
 lru = { workspace = true }
+multimap = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 sha2 = { workspace = true }
@@ -35,7 +36,6 @@ toml = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
 vbs = { workspace = true }
-multimap = { workspace = true }
 
 [dev-dependencies]
 hotshot-example-types = { workspace = true }