Merge #467

467: move function to code_model_api r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 3 insertions, 10 deletions

diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 197d8c4fd..eb19d8be1 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -26,7 +26,6 @@ mod macros;
 mod name;
 mod module_tree;
 mod nameres;
-mod function;
 mod adt;
 mod type_ref;
 mod ty;
@@ -48,21 +47,15 @@ pub use self::{
     ids::{HirFileId, DefId, DefLoc, MacroCallId, MacroCallLoc},
     macros::{MacroDef, MacroInput, MacroExpansion},
     nameres::{ItemMap, PerNs, Namespace, Resolution},
-    function::{Function, FnSignature, FnScopes, ScopesWithSyntaxMapping},
     ty::Ty,
     impl_block::{ImplBlock, ImplItem},
+    code_model_impl::function::{FnScopes, ScopesWithSyntaxMapping},
 };
 
 pub use self::code_model_api::{
     Crate, CrateDependency,
+    Def,
     Module, ModuleSource, Problem,
     Struct, Enum, VariantData, StructField,
+    Function, FnSignature,
 };
-
-pub enum Def {
-    Module(Module),
-    Function(Function),
-    Struct(Struct),
-    Enum(Enum),
-    Item,
-}