From ff9c5bef7b198cde4358610c565cd0b6dc466de5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 25 Jan 2019 01:32:47 +0300 Subject: ModuleDef is Def-free --- crates/ra_hir/src/code_model_api.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 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 e2979617d..6739627b4 100644 --- a/crates/ra_hir/src/code_model_api.rs +++ b/crates/ra_hir/src/code_model_api.rs @@ -5,7 +5,7 @@ use ra_db::{CrateId, FileId}; use ra_syntax::{ast::self, TreeArc, SyntaxNode}; use crate::{ - Name, DefId, Path, PerNs, ScopesWithSyntaxMapping, Ty, HirFileId, + Name, Path, PerNs, ScopesWithSyntaxMapping, Ty, HirFileId, type_ref::TypeRef, nameres::{ModuleScope, lower::ImportId}, db::HirDatabase, @@ -62,13 +62,12 @@ pub enum ModuleDef { Function(Function), Struct(Struct), Enum(Enum), + // Can't be directly declared, but can be imported. EnumVariant(EnumVariant), Const(Const), Static(Static), Trait(Trait), Type(Type), - // Can't be directly declared, but can be imported. - Def(DefId), } impl_froms!( ModuleDef: Module, @@ -82,12 +81,6 @@ impl_froms!( Type ); -impl From for ModuleDef { - fn from(it: DefId) -> ModuleDef { - ModuleDef::Def(it) - } -} - pub enum ModuleSource { SourceFile(TreeArc), Module(TreeArc), -- cgit v1.2.3