From 2ee2fba752c0f03ab8d1b7009bc56cc785738413 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 25 Jan 2019 11:35:38 +0300
Subject: switch to positional enum variants

---
 crates/ra_hir/src/code_model_api.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'crates/ra_hir/src/code_model_api.rs')

diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs
index a469ad477..4fc47aba5 100644
--- a/crates/ra_hir/src/code_model_api.rs
+++ b/crates/ra_hir/src/code_model_api.rs
@@ -15,7 +15,7 @@ use crate::{
     generics::GenericParams,
     docs::{Documentation, Docs, docs_from_ast},
     module_tree::ModuleId,
-    ids::{FunctionId, StructId, EnumId, EnumVariantId, AstItemDef, ConstId, StaticId, TraitId, TypeId},
+    ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeId},
 };
 
 /// hir::Crate describes a single crate. It's the main interface with which
@@ -269,18 +269,19 @@ impl Docs for Enum {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct EnumVariant {
-    pub(crate) id: EnumVariantId,
+    pub(crate) parent: Enum,
+    pub(crate) idx: u32,
 }
 
 impl EnumVariant {
     pub fn source(&self, db: &impl HirDatabase) -> (HirFileId, TreeArc<ast::EnumVariant>) {
-        self.id.source(db)
+        self.source_impl(db)
     }
     pub fn module(&self, db: &impl HirDatabase) -> Module {
-        self.id.module(db)
+        self.parent.module(db)
     }
-    pub fn parent_enum(&self, db: &impl HirDatabase) -> Enum {
-        db.enum_variant_data(*self).parent_enum.clone()
+    pub fn parent_enum(&self, _db: &impl HirDatabase) -> Enum {
+        self.parent
     }
 
     pub fn name(&self, db: &impl HirDatabase) -> Option<Name> {
-- 
cgit v1.2.3