From ee2ef5bdd02ac75eff284e84dc9a8dcdf3d6e2c6 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 26 Sep 2022 19:27:35 -0500
Subject: [PATCH] Tidy up some more deps with workspace dependencies (#4965)

I missed these in #4905 and noticed just now but wanted to handle them
to ensure we uniformly handle deps in the workspace.
---
 cranelift/bforest/Cargo.toml  | 2 +-
 cranelift/egraph/Cargo.toml   | 8 ++++----
 cranelift/preopt/Cargo.toml   | 2 +-
 cranelift/umbrella/Cargo.toml | 4 ++--
 cranelift/wasm/Cargo.toml     | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cranelift/bforest/Cargo.toml b/cranelift/bforest/Cargo.toml
index b989ccec1265..a29f78097d20 100644
--- a/cranelift/bforest/Cargo.toml
+++ b/cranelift/bforest/Cargo.toml
@@ -12,7 +12,7 @@ keywords = ["btree", "forest", "set", "map"]
 edition.workspace = true
 
 [dependencies]
-cranelift-entity = { path = "../entity", version = "0.89.0", default-features = false }
+cranelift-entity = { workspace = true }
 
 [badges]
 maintenance = { status = "experimental" }
diff --git a/cranelift/egraph/Cargo.toml b/cranelift/egraph/Cargo.toml
index 51683c4ae8ca..3a8244094b3f 100644
--- a/cranelift/egraph/Cargo.toml
+++ b/cranelift/egraph/Cargo.toml
@@ -9,9 +9,9 @@ repository = "https://github.com/bytecodealliance/wasmtime"
 edition = "2021"
 
 [dependencies]
-cranelift-entity = { path = "../entity", version = "0.89.0" }
-log = { version = "0.4.6", default-features = false }
-smallvec = { version = "1.6.1", features = ["union"] }
+cranelift-entity = { workspace = true }
+log = { workspace = true }
+smallvec = { workspace = true }
 indexmap = { version = "1.9.1" }
 hashbrown = { version = "0.12.2", features = ["raw"] }
 fxhash = "0.2.1"
@@ -21,4 +21,4 @@ default = []
 
 # Enable detailed trace-level debug logging. Excluded by default to
 # omit the dynamic overhead of checking the logging level.
-trace-log = []
\ No newline at end of file
+trace-log = []
diff --git a/cranelift/preopt/Cargo.toml b/cranelift/preopt/Cargo.toml
index a80277da3c9c..3bbd81fa2d32 100644
--- a/cranelift/preopt/Cargo.toml
+++ b/cranelift/preopt/Cargo.toml
@@ -12,7 +12,7 @@ keywords = ["optimize", "compile", "compiler", "jit"]
 edition.workspace = true
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.89.0", default-features = false }
+cranelift-codegen = { workspace = true }
 # This is commented out because it doesn't build on Rust 1.25.0, which
 # cranelift currently supports.
 # rustc_apfloat = { version = "0.1.2", default-features = false }
diff --git a/cranelift/umbrella/Cargo.toml b/cranelift/umbrella/Cargo.toml
index 0ee2ee2b3c34..f7a01d87859c 100644
--- a/cranelift/umbrella/Cargo.toml
+++ b/cranelift/umbrella/Cargo.toml
@@ -12,8 +12,8 @@ keywords = ["compile", "compiler", "jit"]
 edition.workspace = true
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.89.0", default-features = false }
-cranelift-frontend = { path = "../frontend", version = "0.89.0", default-features = false }
+cranelift-codegen = { workspace = true }
+cranelift-frontend = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml
index ee3125ac8a45..1a2995df65b4 100644
--- a/cranelift/wasm/Cargo.toml
+++ b/cranelift/wasm/Cargo.toml
@@ -21,7 +21,7 @@ hashbrown = { workspace = true, optional = true }
 itertools = "0.10.0"
 log = { workspace = true }
 serde = { version = "1.0.94", features = ["derive"], optional = true }
-smallvec = { version = "1.6.1", features = ["union"] }
+smallvec = { workspace = true }
 
 [dev-dependencies]
 wat = { workspace = true }