From 3c0f20a7bd51be4ef4edadff3e72f63b10b986eb Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Tue, 14 Feb 2023 17:01:01 +0100
Subject: [PATCH] internal: Enable smallvec's `union` feature

---
 Cargo.toml                       | 2 ++
 crates/hir-def/Cargo.toml        | 2 +-
 crates/hir-expand/Cargo.toml     | 2 +-
 crates/hir-ty/Cargo.toml         | 2 +-
 crates/hir/Cargo.toml            | 2 +-
 crates/ide-assists/Cargo.toml    | 2 +-
 crates/ide-completion/Cargo.toml | 2 +-
 crates/ide/Cargo.toml            | 2 +-
 crates/mbe/Cargo.toml            | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ef81105505b..333f03ce2ff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -74,3 +74,5 @@ toolchain = { path = "./crates/toolchain", version = "0.0.0" }
 tt = { path = "./crates/tt", version = "0.0.0" }
 vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
+# non-local crates
+smallvec = { version = "1.10.0", features = ["const_new", "union", "const_generics"] }
diff --git a/crates/hir-def/Cargo.toml b/crates/hir-def/Cargo.toml
index 1daf0428c24..31d4018d2b6 100644
--- a/crates/hir-def/Cargo.toml
+++ b/crates/hir-def/Cargo.toml
@@ -27,7 +27,7 @@ itertools = "0.10.5"
 la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
 once_cell = "1.17.0"
 rustc-hash = "1.1.0"
-smallvec = "1.10.0"
+smallvec.workspace = true
 tracing = "0.1.35"
 
 rustc_abi = { version = "0.0.20221221", package = "hkalbasi-rustc-ap-rustc_abi", default-features = false }
diff --git a/crates/hir-expand/Cargo.toml b/crates/hir-expand/Cargo.toml
index 525cdc32b87..5c684be03cf 100644
--- a/crates/hir-expand/Cargo.toml
+++ b/crates/hir-expand/Cargo.toml
@@ -21,7 +21,7 @@ itertools = "0.10.5"
 hashbrown = { version = "0.12.1", features = [
     "inline-more",
 ], default-features = false }
-smallvec = { version = "1.10.0", features = ["const_new"] }
+smallvec.workspace = true
 
 # local deps
 stdx.workspace = true
diff --git a/crates/hir-ty/Cargo.toml b/crates/hir-ty/Cargo.toml
index 490bbe1e724..a8b8d5222e4 100644
--- a/crates/hir-ty/Cargo.toml
+++ b/crates/hir-ty/Cargo.toml
@@ -16,7 +16,7 @@ cov-mark = "2.0.0-pre.1"
 itertools = "0.10.5"
 arrayvec = "0.7.2"
 bitflags = "1.3.2"
-smallvec = "1.10.0"
+smallvec.workspace = true
 ena = "0.14.0"
 tracing = "0.1.35"
 rustc-hash = "1.1.0"
diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml
index 32cde8a7732..ef40a8902d7 100644
--- a/crates/hir/Cargo.toml
+++ b/crates/hir/Cargo.toml
@@ -16,7 +16,7 @@ rustc-hash = "1.1.0"
 either = "1.7.0"
 arrayvec = "0.7.2"
 itertools = "0.10.5"
-smallvec = "1.10.0"
+smallvec.workspace = true
 once_cell = "1.17.0"
 
 # local deps
diff --git a/crates/ide-assists/Cargo.toml b/crates/ide-assists/Cargo.toml
index 3954abfdb7c..447e38f91f4 100644
--- a/crates/ide-assists/Cargo.toml
+++ b/crates/ide-assists/Cargo.toml
@@ -16,7 +16,7 @@ cov-mark = "2.0.0-pre.1"
 
 itertools = "0.10.5"
 either = "1.7.0"
-smallvec = "1.10.0"
+smallvec.workspace = true
 
 # local deps
 stdx.workspace = true
diff --git a/crates/ide-completion/Cargo.toml b/crates/ide-completion/Cargo.toml
index 34ef092cfc4..092fb303668 100644
--- a/crates/ide-completion/Cargo.toml
+++ b/crates/ide-completion/Cargo.toml
@@ -16,7 +16,7 @@ cov-mark = "2.0.0-pre.1"
 itertools = "0.10.5"
 
 once_cell = "1.17.0"
-smallvec = "1.10.0"
+smallvec.workspace = true
 
 
 # local deps
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index 414c08ff7e0..30e514e4136 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -22,7 +22,7 @@ pulldown-cmark-to-cmark = "10.0.4"
 pulldown-cmark = { version = "0.9.1", default-features = false }
 url = "2.3.1"
 dot = "0.1.4"
-smallvec = "1.10.0"
+smallvec.workspace = true
 
 # local deps
 cfg.workspace = true
diff --git a/crates/mbe/Cargo.toml b/crates/mbe/Cargo.toml
index 280ffc219ba..82105522ebd 100644
--- a/crates/mbe/Cargo.toml
+++ b/crates/mbe/Cargo.toml
@@ -14,7 +14,7 @@ doctest = false
 [dependencies]
 cov-mark = "2.0.0-pre.1"
 rustc-hash = "1.1.0"
-smallvec = "1.10.0"
+smallvec.workspace = true
 tracing = "0.1.35"
 
 # local deps