diff options
author | Aleksey Kladov <[email protected]> | 2019-01-01 20:21:16 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-01 21:09:54 +0000 |
commit | 37ed2f35badfb41cd6c50ef04d6fd6a6ce67e0d1 (patch) | |
tree | 8c20a12837045e81f2cec18535a6883f6619939e /crates/ra_hir/src/lib.rs | |
parent | 9c65e618498596a5dc75efe0814a5542c54d54d8 (diff) |
rename MFileId -> HirFileId
Diffstat (limited to 'crates/ra_hir/src/lib.rs')
-rw-r--r-- | crates/ra_hir/src/lib.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 8d3a026d5..c1386601d 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -47,7 +47,7 @@ pub use self::{ | |||
47 | path::{Path, PathKind}, | 47 | path::{Path, PathKind}, |
48 | name::Name, | 48 | name::Name, |
49 | krate::Crate, | 49 | krate::Crate, |
50 | ids::MFileId, | 50 | ids::HirFileId, |
51 | macros::{MacroDef, MacroInput, MacroExpansion, MacroCallId, MacroCallLoc}, | 51 | macros::{MacroDef, MacroInput, MacroExpansion, MacroCallId, MacroCallLoc}, |
52 | module::{Module, ModuleId, Problem, nameres::{ItemMap, PerNs, Namespace}, ModuleScope, Resolution}, | 52 | module::{Module, ModuleId, Problem, nameres::{ItemMap, PerNs, Namespace}, ModuleScope, Resolution}, |
53 | function::{Function, FnScopes}, | 53 | function::{Function, FnScopes}, |
@@ -158,7 +158,7 @@ pub(crate) type SourceFileItemId = Id<SyntaxNode>; | |||
158 | 158 | ||
159 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 159 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
160 | pub struct SourceItemId { | 160 | pub struct SourceItemId { |
161 | mfile_id: MFileId, | 161 | file_id: HirFileId, |
162 | /// None for the whole file. | 162 | /// None for the whole file. |
163 | item_id: Option<SourceFileItemId>, | 163 | item_id: Option<SourceFileItemId>, |
164 | } | 164 | } |
@@ -166,14 +166,14 @@ pub struct SourceItemId { | |||
166 | /// Maps item's `SyntaxNode`s to `SourceFileItemId` and back. | 166 | /// Maps item's `SyntaxNode`s to `SourceFileItemId` and back. |
167 | #[derive(Debug, PartialEq, Eq)] | 167 | #[derive(Debug, PartialEq, Eq)] |
168 | pub struct SourceFileItems { | 168 | pub struct SourceFileItems { |
169 | mfile_id: MFileId, | 169 | file_id: HirFileId, |
170 | arena: Arena<SyntaxNode>, | 170 | arena: Arena<SyntaxNode>, |
171 | } | 171 | } |
172 | 172 | ||
173 | impl SourceFileItems { | 173 | impl SourceFileItems { |
174 | fn new(mfile_id: MFileId, source_file: SourceFile) -> SourceFileItems { | 174 | fn new(file_id: HirFileId, source_file: SourceFile) -> SourceFileItems { |
175 | let mut res = SourceFileItems { | 175 | let mut res = SourceFileItems { |
176 | mfile_id, | 176 | file_id, |
177 | arena: Arena::default(), | 177 | arena: Arena::default(), |
178 | }; | 178 | }; |
179 | res.init(source_file); | 179 | res.init(source_file); |
@@ -193,11 +193,11 @@ impl SourceFileItems { | |||
193 | fn alloc(&mut self, item: SyntaxNode) -> SourceFileItemId { | 193 | fn alloc(&mut self, item: SyntaxNode) -> SourceFileItemId { |
194 | self.arena.alloc(item) | 194 | self.arena.alloc(item) |
195 | } | 195 | } |
196 | pub fn id_of(&self, mfile_id: MFileId, item: SyntaxNodeRef) -> SourceFileItemId { | 196 | pub fn id_of(&self, file_id: HirFileId, item: SyntaxNodeRef) -> SourceFileItemId { |
197 | assert_eq!( | 197 | assert_eq!( |
198 | self.mfile_id, mfile_id, | 198 | self.file_id, file_id, |
199 | "SourceFileItems: wrong file, expected {:?}, got {:?}", | 199 | "SourceFileItems: wrong file, expected {:?}, got {:?}", |
200 | self.mfile_id, mfile_id | 200 | self.file_id, file_id |
201 | ); | 201 | ); |
202 | self.id_of_unchecked(item) | 202 | self.id_of_unchecked(item) |
203 | } | 203 | } |