diff options
author | Aleksey Kladov <[email protected]> | 2019-07-19 08:43:01 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-07-19 11:16:25 +0100 |
commit | e2b28f5bb8043e92b10f6a40696131007fc9dfe2 (patch) | |
tree | c14306038e386d71ddc894d63415bf8e9a94f7e8 /crates/ra_hir/src/db.rs | |
parent | 7e02aa0efff228126ffc43e81e5e127e1b9e32dd (diff) |
migrate ra_hir to the new rowan
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index da9f3e32d..358365176 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -2,7 +2,7 @@ use std::sync::Arc; | |||
2 | 2 | ||
3 | use parking_lot::Mutex; | 3 | use parking_lot::Mutex; |
4 | use ra_db::{salsa, SourceDatabase}; | 4 | use ra_db::{salsa, SourceDatabase}; |
5 | use ra_syntax::{ast, Parse, SmolStr, SyntaxNode, TreeArc}; | 5 | use ra_syntax::{ast, Parse, SmolStr, SyntaxNode}; |
6 | 6 | ||
7 | use crate::{ | 7 | use crate::{ |
8 | adt::{EnumData, StructData}, | 8 | adt::{EnumData, StructData}, |
@@ -62,11 +62,11 @@ pub trait AstDatabase: InternDatabase { | |||
62 | 62 | ||
63 | #[salsa::transparent] | 63 | #[salsa::transparent] |
64 | #[salsa::invoke(crate::source_id::AstIdMap::file_item_query)] | 64 | #[salsa::invoke(crate::source_id::AstIdMap::file_item_query)] |
65 | fn ast_id_to_node(&self, file_id: HirFileId, ast_id: ErasedFileAstId) -> TreeArc<SyntaxNode>; | 65 | fn ast_id_to_node(&self, file_id: HirFileId, ast_id: ErasedFileAstId) -> SyntaxNode; |
66 | 66 | ||
67 | #[salsa::transparent] | 67 | #[salsa::transparent] |
68 | #[salsa::invoke(crate::ids::HirFileId::parse_or_expand_query)] | 68 | #[salsa::invoke(crate::ids::HirFileId::parse_or_expand_query)] |
69 | fn parse_or_expand(&self, file_id: HirFileId) -> Option<TreeArc<SyntaxNode>>; | 69 | fn parse_or_expand(&self, file_id: HirFileId) -> Option<SyntaxNode>; |
70 | 70 | ||
71 | #[salsa::invoke(crate::ids::HirFileId::parse_macro_query)] | 71 | #[salsa::invoke(crate::ids::HirFileId::parse_macro_query)] |
72 | fn parse_macro(&self, macro_file: ids::MacroFile) -> Option<Parse<SyntaxNode>>; | 72 | fn parse_macro(&self, macro_file: ids::MacroFile) -> Option<Parse<SyntaxNode>>; |