aboutsummaryrefslogtreecommitdiff
path: root/crates/hir
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-03-25 19:09:13 +0000
committerGitHub <[email protected]>2021-03-25 19:09:13 +0000
commit4cb3ecce3ff2573c8473733b2538b32cd899b686 (patch)
treeb4c30f7eacbe0dd03bebafc534c7a8bdbfee7aa6 /crates/hir
parent59fdd7c84c5fdc16573f3cca4081d6735eaa9208 (diff)
parentbc5c86543b1bf384555471415dee770888a1781d (diff)
Merge #8200
8200: Use arrayvec 0.6 r=kjeremy a=lnicola Closes #8198 changelog skip Co-authored-by: LaurenČ›iu Nicola <[email protected]>
Diffstat (limited to 'crates/hir')
-rw-r--r--crates/hir/Cargo.toml2
-rw-r--r--crates/hir/src/lib.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml
index 55e9c3f0c..2ef5bcbc9 100644
--- a/crates/hir/Cargo.toml
+++ b/crates/hir/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
13log = "0.4.8" 13log = "0.4.8"
14rustc-hash = "1.1.0" 14rustc-hash = "1.1.0"
15either = "1.5.3" 15either = "1.5.3"
16arrayvec = "0.5.1" 16arrayvec = "0.6"
17itertools = "0.10.0" 17itertools = "0.10.0"
18smallvec = "1.4.0" 18smallvec = "1.4.0"
19 19
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 6fa676c4d..05a60e158 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -2238,7 +2238,7 @@ pub enum ScopeDef {
2238} 2238}
2239 2239
2240impl ScopeDef { 2240impl ScopeDef {
2241 pub fn all_items(def: PerNs) -> ArrayVec<[Self; 3]> { 2241 pub fn all_items(def: PerNs) -> ArrayVec<Self, 3> {
2242 let mut items = ArrayVec::new(); 2242 let mut items = ArrayVec::new();
2243 2243
2244 match (def.take_types(), def.take_values()) { 2244 match (def.take_types(), def.take_values()) {