diff options
-rw-r--r-- | crates/ra_hir/src/db.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/source_id.rs | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/grammar.ron | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 3ac3c79a3..8af0a3176 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -60,7 +60,7 @@ pub trait DefDatabase: SourceDatabase { | |||
60 | #[salsa::invoke(crate::source_id::AstIdMap::ast_id_map_query)] | 60 | #[salsa::invoke(crate::source_id::AstIdMap::ast_id_map_query)] |
61 | fn ast_id_map(&self, file_id: HirFileId) -> Arc<AstIdMap>; | 61 | fn ast_id_map(&self, file_id: HirFileId) -> Arc<AstIdMap>; |
62 | 62 | ||
63 | #[salsa::invoke(crate::source_id::AstIdMap::ast_id_to_node_query)] | 63 | #[salsa::invoke(crate::source_id::AstIdMap::file_item_query)] |
64 | fn ast_id_to_node(&self, file_id: HirFileId, ast_id: ErasedFileAstId) -> TreeArc<SyntaxNode>; | 64 | fn ast_id_to_node(&self, file_id: HirFileId, ast_id: ErasedFileAstId) -> TreeArc<SyntaxNode>; |
65 | 65 | ||
66 | #[salsa::invoke(RawItems::raw_items_query)] | 66 | #[salsa::invoke(RawItems::raw_items_query)] |
diff --git a/crates/ra_hir/src/source_id.rs b/crates/ra_hir/src/source_id.rs index a2bc9a799..0a8fb6d32 100644 --- a/crates/ra_hir/src/source_id.rs +++ b/crates/ra_hir/src/source_id.rs | |||
@@ -92,7 +92,7 @@ impl AstIdMap { | |||
92 | Arc::new(AstIdMap::from_source_file(&source_file)) | 92 | Arc::new(AstIdMap::from_source_file(&source_file)) |
93 | } | 93 | } |
94 | 94 | ||
95 | pub(crate) fn ast_id_to_node_query( | 95 | pub(crate) fn file_item_query( |
96 | db: &impl DefDatabase, | 96 | db: &impl DefDatabase, |
97 | file_id: HirFileId, | 97 | file_id: HirFileId, |
98 | ast_id: ErasedFileAstId, | 98 | ast_id: ErasedFileAstId, |
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index cae5d8774..011ef0616 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
@@ -674,7 +674,7 @@ Grammar( | |||
674 | "LifetimeArg": (), | 674 | "LifetimeArg": (), |
675 | 675 | ||
676 | "MacroItems": ( | 676 | "MacroItems": ( |
677 | traits: [ "ModuleItemOwner", "FnDefOwner" ], | 677 | traits: [ "ModuleItemOwner", "FnDefOwner" ], |
678 | ), | 678 | ), |
679 | 679 | ||
680 | "MacroStmts" : ( | 680 | "MacroStmts" : ( |