hakari: use workspace-dotted format for importing workspace-hack

armaniAllie93 · Oct 5, 2023 · 218b847 · 218b847
1 parent 67b5b8c
commit 218b847
Show file tree

Hide file tree

Showing 100 changed files with 105 additions and 109 deletions.
diff --git a/.config/hakari.toml b/.config/hakari.toml
@@ -6,6 +6,10 @@ hakari-package = "workspace-hack"
 # Format for `workspace-hack = ...` lines in other Cargo.tomls.
 dep-format-version = "4"
 
+# Output lines as `omicron-workspace-hack.workspace = true`. Requires
+# cargo-hakari 0.9.28 or above.
+workspace-hack-line-style = "workspace-dotted"
+
 # Setting workspace.resolver = "2" in the root Cargo.toml is HIGHLY recommended.
 # Hakari works much better with the new feature resolver.
 # For more about the new feature resolver, see:

diff --git a/crates/anemo-benchmark/Cargo.toml b/crates/anemo-benchmark/Cargo.toml
@@ -13,7 +13,7 @@ mysten-network.workspace = true
 rand.workspace= true
 telemetry-subscribers.workspace = true
 tokio = { workspace = true, features = ["full"] }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [build-dependencies]
 anemo-build.workspace = true

diff --git a/crates/data-transform/Cargo.toml b/crates/data-transform/Cargo.toml
@@ -23,4 +23,4 @@ move-core-types.workspace = true
 move-bytecode-utils.workspace = true
 sui-json-rpc-types.workspace = true
 once_cell.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/mysten-common/Cargo.toml b/crates/mysten-common/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 tokio.workspace = true
 futures.workspace = true
 parking_lot.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/mysten-metrics/Cargo.toml b/crates/mysten-metrics/Cargo.toml
@@ -7,7 +7,6 @@ publish = false
 edition = "2021"
 
 [dependencies]
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 tracing.workspace = true
 scopeguard.workspace = true
 prometheus.workspace = true
@@ -21,3 +20,4 @@ futures.workspace = true
 async-trait.workspace = true
 
 prometheus-closure-metric.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/mysten-network/Cargo.toml b/crates/mysten-network/Cargo.toml
@@ -24,4 +24,4 @@ tonic-health.workspace = true
 tower.workspace = true
 tower-http.workspace = true
 tracing.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/mysten-util-mem-derive/Cargo.toml b/crates/mysten-util-mem-derive/Cargo.toml
@@ -17,4 +17,4 @@ proc-macro = true
 proc-macro2.workspace = true
 syn.workspace = true
 synstructure.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/mysten-util-mem/Cargo.toml b/crates/mysten-util-mem/Cargo.toml
@@ -22,7 +22,7 @@ ed25519-consensus.workspace = true
 smallvec = { workspace = true, optional = true }
 parking_lot = { workspace = true, optional = true }
 once_cell.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [features]
 default = ["std", "hashbrown", "smallvec", "estimate-heapsize"]

diff --git a/crates/prometheus-closure-metric/Cargo.toml b/crates/prometheus-closure-metric/Cargo.toml
@@ -12,4 +12,4 @@ publish = false
 anyhow.workspace = true
 prometheus.workspace = true
 protobuf.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/shared-crypto/Cargo.toml b/crates/shared-crypto/Cargo.toml
@@ -11,5 +11,5 @@ serde.workspace = true
 serde_repr.workspace = true
 fastcrypto = { workspace = true, features = ["copy_key"] }
 eyre.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 bcs.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/simulacrum/Cargo.toml b/crates/simulacrum/Cargo.toml
@@ -31,4 +31,4 @@ sui-genesis-builder.workspace = true
 sui-execution.workspace = true
 sui-swarm-config.workspace = true
 sui-transaction-checks.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/sui-adapter-transactional-tests/Cargo.toml b/crates/sui-adapter-transactional-tests/Cargo.toml
@@ -16,4 +16,4 @@ name = "tests"
 harness = false
 
 [dependencies]
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/sui-analytics-indexer/Cargo.toml b/crates/sui-analytics-indexer/Cargo.toml
@@ -34,10 +34,10 @@ fastcrypto = { workspace = true, features = ["copy_key"] }
 mysten-metrics.workspace = true
 sui-indexer.workspace = true
 sui-types.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 telemetry-subscribers.workspace = true
 sui-rest-api.workspace = true
 sui-storage.workspace = true
+workspace-hack.workspace = true
 
 [dev-dependencies]
 

diff --git a/crates/sui-archival/Cargo.toml b/crates/sui-archival/Cargo.toml
@@ -23,7 +23,7 @@ sui-types.workspace = true
 sui-storage.workspace = true
 fastcrypto = { workspace = true, features = ["copy_key"] }
 tokio = { workspace = true, features = ["full"] }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 tempfile.workspace = true

diff --git a/crates/sui-aws-orchestrator/Cargo.toml b/crates/sui-aws-orchestrator/Cargo.toml
@@ -31,7 +31,7 @@ sui-config = { path = "../sui-config" }
 sui-types = { path = "../sui-types" }
 sui-node = { path = "../sui-node" }
 sui-swarm-config =  { path = "../sui-swarm-config" }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 tempfile = "3.6.0"

diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml
@@ -45,9 +45,9 @@ fastcrypto-zkp.workspace = true
 move-core-types.workspace = true
 mysten-metrics.workspace = true
 narwhal-node.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 test-cluster.workspace = true
 sysinfo.workspace = true
+workspace-hack.workspace = true
 
 [target.'cfg(msim)'.dependencies]
 sui-framework.workspace = true

diff --git a/crates/sui-cluster-test/Cargo.toml b/crates/sui-cluster-test/Cargo.toml
@@ -38,5 +38,5 @@ sui-test-transaction-builder.workspace = true
 telemetry-subscribers.workspace = true
 
 test-cluster.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 move-core-types.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
@@ -26,7 +26,7 @@ sui-keys.workspace = true
 sui-protocol-config.workspace = true
 sui-storage.workspace = true
 sui-types.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [target.'cfg(msim)'.dependencies]
 sui-simulator.workspace = true

diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml
@@ -78,7 +78,7 @@ sui-transaction-checks.workspace = true
 sui-simulator.workspace = true
 sui-storage.workspace = true
 sui-types.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 clap.workspace = true

diff --git a/crates/sui-cost/Cargo.toml b/crates/sui-cost/Cargo.toml
@@ -7,14 +7,14 @@ publish = false
 edition = "2021"
 
 [dependencies]
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 sui-types.workspace = true
 anyhow.workspace = true
 tokio = { workspace = true, features = ["full"] }
 serde.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
 bcs.workspace = true
+workspace-hack.workspace = true
 
 [dev-dependencies]
 insta.workspace = true

diff --git a/crates/sui-e2e-tests/Cargo.toml b/crates/sui-e2e-tests/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 version = "0.1.0"
 
 [dependencies]
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 tempfile.workspace = true

diff --git a/crates/sui-enum-compat-util/Cargo.toml b/crates/sui-enum-compat-util/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2021"
 
 [dependencies]
 serde_yaml.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml
@@ -42,7 +42,7 @@ typed-store.workspace = true
 typed-store-derive.workspace = true
 shared-crypto.workspace = true
 async-recursion.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 test-cluster.workspace = true

diff --git a/crates/sui-framework-snapshot/Cargo.toml b/crates/sui-framework-snapshot/Cargo.toml
@@ -17,7 +17,7 @@ git-version.workspace = true
 sui-framework.workspace = true
 sui-protocol-config.workspace = true
 sui-types.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["full"] }
diff --git a/crates/sui-framework-tests/Cargo.toml b/crates/sui-framework-tests/Cargo.toml
@@ -25,4 +25,4 @@ move-package.workspace = true
 move-unit-test.workspace = true
 
 [dependencies]
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/sui-framework/Cargo.toml b/crates/sui-framework/Cargo.toml
@@ -17,7 +17,7 @@ sui-types.workspace = true
 
 move-binary-format.workspace = true
 move-core-types.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [build-dependencies]
 anyhow.workspace = true

diff --git a/crates/sui-genesis-builder/Cargo.toml b/crates/sui-genesis-builder/Cargo.toml
@@ -28,7 +28,7 @@ sui-framework.workspace = true
 sui-framework-snapshot.workspace = true
 sui-protocol-config.workspace = true
 sui-types.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 [target.'cfg(msim)'.dependencies]
 sui-simulator.workspace = true
 

diff --git a/crates/sui-graphql-rpc/Cargo.toml b/crates/sui-graphql-rpc/Cargo.toml
@@ -31,15 +31,14 @@ toml.workspace = true
 thiserror.workspace = true
 uuid.workspace = true
 
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
-
 # TODO: put these behind feature flag to prevent leakage
 # Used for dummy data
 bcs.workspace = true
 sui-sdk.workspace = true
 sui-json-rpc-types.workspace = true
 sui-indexer.workspace = true
 move-bytecode-utils.workspace = true
+workspace-hack.workspace = true
 
 [dev-dependencies]
 expect-test.workspace = true

diff --git a/crates/sui-indexer/Cargo.toml b/crates/sui-indexer/Cargo.toml
@@ -40,7 +40,6 @@ sui-open-rpc.workspace = true
 sui-sdk.workspace = true
 sui-types.workspace = true
 sui-protocol-config.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 telemetry-subscribers.workspace = true
 sui-rest-api.workspace = true
 
@@ -50,6 +49,7 @@ move-binary-format.workspace = true
 
 diesel_migrations.workspace = true
 cached.workspace = true
+workspace-hack.workspace = true
 
 [features]
 pg_integration = []

diff --git a/crates/sui-json-rpc-tests/Cargo.toml b/crates/sui-json-rpc-tests/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2021"
 
 [dependencies]
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 move-package.workspace = true

diff --git a/crates/sui-json-rpc-types/Cargo.toml b/crates/sui-json-rpc-types/Cargo.toml
@@ -29,7 +29,7 @@ move-bytecode-utils.workspace = true
 mysten-metrics.workspace = true
 sui-types.workspace = true
 sui-json.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 sui-types = { workspace = true, features = ["test-utils"] }
diff --git a/crates/sui-json-rpc/Cargo.toml b/crates/sui-json-rpc/Cargo.toml
@@ -46,10 +46,10 @@ sui-protocol-config.workspace = true
 sui-json-rpc-types.workspace = true
 sui-transaction-builder.workspace = true
 mysten-metrics.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 shared-crypto.workspace = true
 typed-store.workspace = true
 cached.workspace = true
+workspace-hack.workspace = true
 
 [dev-dependencies]
 mockall.workspace = true

diff --git a/crates/sui-json/Cargo.toml b/crates/sui-json/Cargo.toml
@@ -20,7 +20,7 @@ move-binary-format.workspace = true
 move-bytecode-utils.workspace = true
 move-core-types.workspace = true
 fastcrypto = { workspace = true }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 test-fuzz.workspace = true

diff --git a/crates/sui-keys/Cargo.toml b/crates/sui-keys/Cargo.toml
@@ -18,7 +18,7 @@ slip10_ed25519.workspace = true
 fastcrypto = { workspace = true, features = ["copy_key"] }
 shared-crypto.workspace = true
 sui-types.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 tempfile.workspace = true
diff --git a/crates/sui-kvstore/Cargo.toml b/crates/sui-kvstore/Cargo.toml
@@ -23,4 +23,4 @@ sui-core.workspace = true
 sui-types.workspace = true
 sui-config.workspace = true
 sui-storage.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/sui-macros/Cargo.toml b/crates/sui-macros/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 
 [dependencies]
 sui-proc-macros.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 once_cell.workspace = true
 futures.workspace = true
 tracing.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/sui-metric-checker/Cargo.toml b/crates/sui-metric-checker/Cargo.toml
@@ -22,4 +22,4 @@ strum_macros.workspace = true
 telemetry-subscribers.workspace = true
 tokio = { workspace = true, features = ["full"] }
 tracing.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
diff --git a/crates/sui-move-build/Cargo.toml b/crates/sui-move-build/Cargo.toml
@@ -26,7 +26,7 @@ move-core-types.workspace = true
 move-ir-types.workspace = true
 move-package.workspace = true
 move-symbol-pool.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [dev-dependencies]
 datatest-stable.workspace = true

diff --git a/crates/sui-network/Cargo.toml b/crates/sui-network/Cargo.toml
@@ -22,7 +22,6 @@ sui-config.workspace = true
 sui-swarm-config.workspace = true
 
 mysten-network.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 tokio = { workspace = true, features = ["full"] }
 tracing.workspace = true
 futures.workspace = true
@@ -31,6 +30,7 @@ rand.workspace = true
 anyhow.workspace = true
 prometheus.workspace = true
 mysten-metrics.workspace = true
+workspace-hack.workspace = true
 
 [build-dependencies]
 anemo-build.workspace = true

diff --git a/crates/sui-node/Cargo.toml b/crates/sui-node/Cargo.toml
@@ -48,7 +48,7 @@ mysten-network.workspace = true
 telemetry-subscribers.workspace = true
 fastcrypto.workspace = true
 fastcrypto-zkp.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true
 
 [target.'cfg(msim)'.dependencies]
 sui-simulator.workspace = true
diff --git a/crates/sui-open-rpc-macros/Cargo.toml b/crates/sui-open-rpc-macros/Cargo.toml
@@ -16,5 +16,5 @@ quote.workspace = true
 proc-macro2.workspace = true
 itertools.workspace = true
 derive-syn-parse.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 unescape.workspace = true
+workspace-hack.workspace = true
diff --git a/crates/sui-open-rpc/Cargo.toml b/crates/sui-open-rpc/Cargo.toml
@@ -10,9 +10,9 @@ edition = "2021"
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 bcs.workspace = true
 versions.workspace = true
+workspace-hack.workspace = true
 
 [dev-dependencies]
 anyhow.workspace = true

diff --git a/crates/sui-oracle/Cargo.toml b/crates/sui-oracle/Cargo.toml
@@ -28,4 +28,4 @@ sui-sdk = { path = "../sui-sdk" }
 sui-types = { path = "../sui-types" }
 mysten-metrics = { path = "../mysten-metrics" }
 telemetry-subscribers.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack.workspace = true