aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/nameres.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-01-25 09:41:23 +0000
committerAleksey Kladov <[email protected]>2019-01-25 09:50:46 +0000
commit87288d802c3cad7ec50c508276b89a8c454f336c (patch)
treeb9dcccf99c868b6b2abf75e08fc56f42869b9ce5 /crates/ra_hir/src/nameres.rs
parentc4a351b736632f0c01d9c51ce1cd3b4b4c6194d9 (diff)
pack enum variants into arena
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r--crates/ra_hir/src/nameres.rs9
1 files changed, 2 insertions, 7 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 639726b5e..028c1882f 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -397,13 +397,8 @@ impl ItemMap {
397 ModuleDef::Enum(e) => { 397 ModuleDef::Enum(e) => {
398 // enum variant 398 // enum variant
399 tested_by!(item_map_enum_importing); 399 tested_by!(item_map_enum_importing);
400 let matching_variant = e 400 match e.variant(db, &segment.name) {
401 .variants(db) 401 Some(variant) => PerNs::both(variant.into(), (*e).into()),
402 .into_iter()
403 .find(|(n, _variant)| n == &segment.name);
404
405 match matching_variant {
406 Some((_n, variant)) => PerNs::both(variant.into(), (*e).into()),
407 None => PerNs::none(), 402 None => PerNs::none(),
408 } 403 }
409 } 404 }