From ffb09c335017e518b793c2a71e452647039121d5 Mon Sep 17 00:00:00 2001
From: Zeeshan Lakhani <zeeshan.lakhani@gmail.com>
Date: Wed, 21 Jun 2023 16:14:35 +0900
Subject: [PATCH] chore: workspace inherit fun

---
 .pre-commit-config.yaml        |  6 ------
 Cargo.lock                     |  4 ++--
 homestar-core/Cargo.toml       | 24 +++++++++++-------------
 homestar-guest-wasm/Cargo.toml |  4 ++--
 homestar-runtime/Cargo.toml    | 24 +++++++++++-------------
 homestar-wasm/Cargo.toml       | 26 ++++++++++++--------------
 6 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7cc10d97..16466c40 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -34,12 +34,6 @@ repos:
         files: \.nix$
         language: system
 
-  - repo: https://github.com/DevinR528/cargo-sort
-    rev: v1.0.9
-    hooks:
-      - id: cargo-sort
-        args: ["-w"]
-
   - repo: https://github.com/compilerla/conventional-pre-commit
     rev: v2.1.1
     hooks:
diff --git a/Cargo.lock b/Cargo.lock
index cf669b37..08eb5d00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6551,9 +6551,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.3.3"
+version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
+checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81"
 dependencies = [
  "getrandom 0.2.9",
  "rand 0.8.5",
diff --git a/homestar-core/Cargo.toml b/homestar-core/Cargo.toml
index 4230cb67..4b09985e 100644
--- a/homestar-core/Cargo.toml
+++ b/homestar-core/Cargo.toml
@@ -5,13 +5,13 @@ description = "Homestar core library for working with tasks, instructions, etc"
 keywords = ["ipld", "tasks", "receipts", "ipvm"]
 categories = ["workflow-engines", "core", "libraries"]
 include = ["/src", "README.md", "LICENSE"]
-license = { workspace = true }
+license.workspace = true
 readme = "README.md"
-edition = { workspace = true }
-rust-version = { workspace = true }
+edition.workspace = true
+rust-version.workspace = true
 documentation = "https://docs.rs/homestar-core"
 repository = "https://github.com/ipvm-wg/homestar"
-authors = { workspace = true }
+authors.workspace = true
 
 [lib]
 path = "src/lib.rs"
@@ -19,22 +19,20 @@ bench = false
 doctest = true
 
 [dependencies]
-# return to version.workspace = true after the following issue is fixed:
-# https://github.com/DevinR528/cargo-sort/issues/47
-anyhow = { workspace = true }
-byte-unit = { workspace = true }
+anyhow .workspace = true
+byte-unit.workspace = true
 diesel = { version = "2.0", features = ["sqlite"] }
-enum-as-inner = { workspace = true }
-enum-assoc = { workspace = true }
+enum-as-inner.workspace = true
+enum-assoc.workspace = true
 generic-array = { version = "0.14", features = ["serde"] }
 indexmap = "1.9"
-libipld = { workspace = true }
+libipld.workspace = true
 libsqlite3-sys = { version = "0.26", features = ["bundled"] }
 proptest = { version = "1.2", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 signature = "2.0"
-thiserror = { workspace = true }
-tracing = { workspace = true }
+thiserror.workspace = true
+tracing.workspace = true
 ucan = "0.3"
 url = { version = "2.3", features = ["serde"] }
 uuid = { version = "1.3", default-features = false, features = ["v4", "fast-rng"] }
diff --git a/homestar-guest-wasm/Cargo.toml b/homestar-guest-wasm/Cargo.toml
index 9da78d2f..17509a01 100644
--- a/homestar-guest-wasm/Cargo.toml
+++ b/homestar-guest-wasm/Cargo.toml
@@ -2,8 +2,8 @@
 name = "homestar-guest-wasm"
 publish = false
 version = "0.1.0"
-edition = { workspace = true }
-rust-version = { workspace = true }
+edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 image = { version = "0.24", default-features = false, features = ["png"] }
diff --git a/homestar-runtime/Cargo.toml b/homestar-runtime/Cargo.toml
index 01982b0d..1ffe7c10 100644
--- a/homestar-runtime/Cargo.toml
+++ b/homestar-runtime/Cargo.toml
@@ -5,13 +5,13 @@ description = "Homestar CLI"
 keywords = ["ipfs", "workflows", "ipld", "ipvm"]
 categories = ["workflow-engines", "distributed-systems", "runtimes", "networking"]
 include = ["/src", "README.md", "LICENSE"]
-license = { workspace = true }
+license.workspace = true
 readme = "README.md"
-edition = { workspace = true }
-rust-version = { workspace = true }
+edition.workspace = true
+rust-version.workspace = true
 documentation = "https://docs.rs/homestar"
 repository = "https://github.com/ipvm-wg/homestar"
-authors = { workspace = true }
+authors.workspace = true
 
 [lib]
 path = "src/lib.rs"
@@ -27,12 +27,10 @@ bench = false
 
 [dependencies]
 ansi_term = { version = "0.12", optional = true, default-features = false }
-# return to version.workspace = true after the following issue is fixed:
-# https://github.com/DevinR528/cargo-sort/issues/47
-anyhow = { workspace = true }
+anyhow.workspace = true
 async-trait = "0.1"
 axum = { version = "0.6", features = ["ws", "headers"] }
-byte-unit = { workspace = true }
+byte-unit.workspace = true
 clap = { version = "4.3", features = ["derive", "color", "help"] }
 concat-in-place = "1.1"
 config = "0.13"
@@ -41,7 +39,7 @@ crossbeam = "0.8"
 dagga = "0.2"
 diesel = { version = "2.1", features = ["sqlite", "r2d2", "returning_clauses_for_sqlite_3_35"] }
 dotenvy = "0.15"
-enum-assoc = { workspace = true }
+enum-assoc.workspace = true
 futures = "0.3"
 headers = "0.3"
 homestar-core = { version = "0.1", path = "../homestar-core" }
@@ -52,7 +50,7 @@ indexmap = "1.9"
 ipfs-api = { version = "0.17", optional = true }
 ipfs-api-backend-hyper = { version = "0.6", features = ["with-builder", "with-send-sync"], optional = true }
 itertools = "0.10"
-libipld = { workspace = true }
+libipld.workspace = true
 libp2p = { version = "0.51", default-features = false, features = ["kad", "request-response", "macros", "identify", "mdns", "gossipsub", "tokio", "dns", "mplex", "tcp", "noise", "yamux", "websocket"] }
 libsqlite3-sys = { version = "0.26", features = ["bundled"] }
 openssl = { version = "0.10", features = ["vendored"] }
@@ -60,10 +58,10 @@ proptest = { version = "1.2", optional = true }
 reqwest = { version = "0.11", features = ["json"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-serde_ipld_dagcbor = { workspace = true }
+serde_ipld_dagcbor.workspace = true
 thiserror = "1.0"
-tokio = { workspace = true }
-tracing = { workspace = true }
+tokio.workspace = true
+tracing.workspace = true
 tracing-appender = "0.2"
 tracing-logfmt = "0.3"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "parking_lot", "registry"] }
diff --git a/homestar-wasm/Cargo.toml b/homestar-wasm/Cargo.toml
index d6ba6cad..75452fd1 100644
--- a/homestar-wasm/Cargo.toml
+++ b/homestar-wasm/Cargo.toml
@@ -5,13 +5,13 @@ description = "Homestar Wasm / Wasmtime implementation and IPLD <=> WIT interpre
 keywords = ["wasm", "wasmtime", "wit", "ipld", "ipvm"]
 categories = ["wasm", "execution-engines"]
 include = ["/src", "README.md", "LICENSE"]
-license = { workspace = true }
+license.workspace = true
 readme = "README.md"
-edition = { workspace = true }
-rust-version = { workspace = true }
+edition.workspace = true
+rust-version.workspace = true
 documentation = "https://docs.rs/homestar-wasm"
 repository = "https://github.com/ipvm-wg/homestar"
-authors = { workspace = true }
+authors.workspace = true
 
 [lib]
 path = "src/lib.rs"
@@ -19,20 +19,18 @@ bench = false
 doctest = true
 
 [dependencies]
-# return to version.workspace = true after the following issue is fixed:
-# https://github.com/DevinR528/cargo-sort/issues/47
-anyhow = { workspace = true }
-async-trait = { workspace = true }
+anyhow.workspace = true
+async-trait.workspace = true
 atomic_refcell = "0.1"
-enum-as-inner = { workspace = true }
+enum-as-inner.workspace = true
 heck = "0.4"
 homestar-core = { version = "0.1", path = "../homestar-core" }
 itertools = "0.10"
-libipld = { workspace = true }
+libipld.workspace = true
 rust_decimal = "1.30"
 stacker = "0.1"
-thiserror = { workspace = true }
-tracing = { workspace = true }
+thiserror.workspace = true
+tracing.workspace = true
 wasi-common = "8.0"
 wasmparser = "0.104"
 wasmtime = { version = "8.0", features = ["async", "component-model", "default"] }
@@ -43,8 +41,8 @@ wit-component = "0.8"
 [dev-dependencies]
 criterion = "0.5"
 image = "0.24"
-serde_ipld_dagcbor = { workspace = true }
-tokio = { workspace = true }
+serde_ipld_dagcbor.workspace = true
+tokio.workspace = true
 
 [features]
 default = []