Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 41db8c2

Browse files
committed
Auto merge of rust-lang#14151 - Veykril:smallvec, r=Veykril
internal: Enable smallvec's `union` feature
2 parents 9548388 + 3c0f20a commit 41db8c2

File tree

9 files changed

+10
-8
lines changed

9 files changed

+10
-8
lines changed

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,5 @@ toolchain = { path = "./crates/toolchain", version = "0.0.0" }
7474
tt = { path = "./crates/tt", version = "0.0.0" }
7575
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
7676
vfs = { path = "./crates/vfs", version = "0.0.0" }
77+
# non-local crates
78+
smallvec = { version = "1.10.0", features = ["const_new", "union", "const_generics"] }

crates/hir-def/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ itertools = "0.10.5"
2727
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
2828
once_cell = "1.17.0"
2929
rustc-hash = "1.1.0"
30-
smallvec = "1.10.0"
30+
smallvec.workspace = true
3131
tracing = "0.1.35"
3232

3333
rustc_abi = { version = "0.0.20221221", package = "hkalbasi-rustc-ap-rustc_abi", default-features = false }

crates/hir-expand/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ itertools = "0.10.5"
2121
hashbrown = { version = "0.12.1", features = [
2222
"inline-more",
2323
], default-features = false }
24-
smallvec = { version = "1.10.0", features = ["const_new"] }
24+
smallvec.workspace = true
2525

2626
# local deps
2727
stdx.workspace = true

crates/hir-ty/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cov-mark = "2.0.0-pre.1"
1616
itertools = "0.10.5"
1717
arrayvec = "0.7.2"
1818
bitflags = "1.3.2"
19-
smallvec = "1.10.0"
19+
smallvec.workspace = true
2020
ena = "0.14.0"
2121
tracing = "0.1.35"
2222
rustc-hash = "1.1.0"

crates/hir/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rustc-hash = "1.1.0"
1616
either = "1.7.0"
1717
arrayvec = "0.7.2"
1818
itertools = "0.10.5"
19-
smallvec = "1.10.0"
19+
smallvec.workspace = true
2020
once_cell = "1.17.0"
2121

2222
# local deps

crates/ide-assists/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cov-mark = "2.0.0-pre.1"
1616

1717
itertools = "0.10.5"
1818
either = "1.7.0"
19-
smallvec = "1.10.0"
19+
smallvec.workspace = true
2020

2121
# local deps
2222
stdx.workspace = true

crates/ide-completion/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cov-mark = "2.0.0-pre.1"
1616
itertools = "0.10.5"
1717

1818
once_cell = "1.17.0"
19-
smallvec = "1.10.0"
19+
smallvec.workspace = true
2020

2121

2222
# local deps

crates/ide/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pulldown-cmark-to-cmark = "10.0.4"
2222
pulldown-cmark = { version = "0.9.1", default-features = false }
2323
url = "2.3.1"
2424
dot = "0.1.4"
25-
smallvec = "1.10.0"
25+
smallvec.workspace = true
2626

2727
# local deps
2828
cfg.workspace = true

crates/mbe/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ doctest = false
1414
[dependencies]
1515
cov-mark = "2.0.0-pre.1"
1616
rustc-hash = "1.1.0"
17-
smallvec = "1.10.0"
17+
smallvec.workspace = true
1818
tracing = "0.1.35"
1919

2020
# local deps

0 commit comments

Comments
 (0)