aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/ids.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/ids.rs')
-rw-r--r--crates/ra_hir/src/ids.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index c75ef4ae7..0805fd3db 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -1,5 +1,5 @@
1use ra_db::{SourceRootId, LocationIntener, Cancelable, FileId}; 1use ra_db::{SourceRootId, LocationIntener, Cancelable, FileId};
2use ra_syntax::{TreePtr, SyntaxKind, SyntaxNode, SourceFile, AstNode, ast}; 2use ra_syntax::{TreeArc, SyntaxKind, SyntaxNode, SourceFile, AstNode, ast};
3use ra_arena::{Arena, RawId, impl_arena_id}; 3use ra_arena::{Arena, RawId, impl_arena_id};
4 4
5use crate::{ 5use crate::{
@@ -61,7 +61,7 @@ impl HirFileId {
61 pub(crate) fn hir_source_file( 61 pub(crate) fn hir_source_file(
62 db: &impl HirDatabase, 62 db: &impl HirDatabase,
63 file_id: HirFileId, 63 file_id: HirFileId,
64 ) -> TreePtr<SourceFile> { 64 ) -> TreeArc<SourceFile> {
65 match file_id.0 { 65 match file_id.0 {
66 HirFileIdRepr::File(file_id) => db.source_file(file_id), 66 HirFileIdRepr::File(file_id) => db.source_file(file_id),
67 HirFileIdRepr::Macro(m) => { 67 HirFileIdRepr::Macro(m) => {
@@ -179,7 +179,7 @@ impl DefId {
179 Ok(res) 179 Ok(res)
180 } 180 }
181 181
182 pub(crate) fn source(self, db: &impl HirDatabase) -> (HirFileId, TreePtr<SyntaxNode>) { 182 pub(crate) fn source(self, db: &impl HirDatabase) -> (HirFileId, TreeArc<SyntaxNode>) {
183 let loc = self.loc(db); 183 let loc = self.loc(db);
184 let syntax = db.file_item(loc.source_item_id); 184 let syntax = db.file_item(loc.source_item_id);
185 (loc.source_item_id.file_id, syntax) 185 (loc.source_item_id.file_id, syntax)
@@ -244,7 +244,7 @@ pub struct SourceItemId {
244#[derive(Debug, PartialEq, Eq)] 244#[derive(Debug, PartialEq, Eq)]
245pub struct SourceFileItems { 245pub struct SourceFileItems {
246 file_id: HirFileId, 246 file_id: HirFileId,
247 arena: Arena<SourceFileItemId, TreePtr<SyntaxNode>>, 247 arena: Arena<SourceFileItemId, TreeArc<SyntaxNode>>,
248} 248}
249 249
250impl SourceFileItems { 250impl SourceFileItems {
@@ -273,7 +273,7 @@ impl SourceFileItems {
273 }) 273 })
274 } 274 }
275 275
276 fn alloc(&mut self, item: TreePtr<SyntaxNode>) -> SourceFileItemId { 276 fn alloc(&mut self, item: TreeArc<SyntaxNode>) -> SourceFileItemId {
277 self.arena.alloc(item) 277 self.arena.alloc(item)
278 } 278 }
279 pub(crate) fn id_of(&self, file_id: HirFileId, item: &SyntaxNode) -> SourceFileItemId { 279 pub(crate) fn id_of(&self, file_id: HirFileId, item: &SyntaxNode) -> SourceFileItemId {