aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/lib.rs')
-rw-r--r--crates/ra_hir/src/lib.rs16
1 files changed, 2 insertions, 14 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 1219b9fba..8d3a026d5 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -22,6 +22,7 @@ mod path;
22mod arena; 22mod arena;
23pub mod source_binder; 23pub mod source_binder;
24 24
25mod ids;
25mod macros; 26mod macros;
26mod name; 27mod name;
27mod krate; 28mod krate;
@@ -46,6 +47,7 @@ pub use self::{
46 path::{Path, PathKind}, 47 path::{Path, PathKind},
47 name::Name, 48 name::Name,
48 krate::Crate, 49 krate::Crate,
50 ids::MFileId,
49 macros::{MacroDef, MacroInput, MacroExpansion, MacroCallId, MacroCallLoc}, 51 macros::{MacroDef, MacroInput, MacroExpansion, MacroCallId, MacroCallLoc},
50 module::{Module, ModuleId, Problem, nameres::{ItemMap, PerNs, Namespace}, ModuleScope, Resolution}, 52 module::{Module, ModuleId, Problem, nameres::{ItemMap, PerNs, Namespace}, ModuleScope, Resolution},
51 function::{Function, FnScopes}, 53 function::{Function, FnScopes},
@@ -55,20 +57,6 @@ pub use self::{
55 57
56pub use self::function::FnSignatureInfo; 58pub use self::function::FnSignatureInfo;
57 59
58/// An `MFileId` is like a `FileId`, but it can also refer to code generated by
59/// macros.
60#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
61pub enum MFileId {
62 File(FileId),
63 Macro(MacroCallId),
64}
65
66impl From<FileId> for MFileId {
67 fn from(file_id: FileId) -> MFileId {
68 MFileId::File(file_id)
69 }
70}
71
72/// Def's are a core concept of hir. A `Def` is an Item (function, module, etc) 60/// Def's are a core concept of hir. A `Def` is an Item (function, module, etc)
73/// in a specific module. 61/// in a specific module.
74#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 62#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]