diff options
author | Marco Groppo <[email protected]> | 2019-04-18 19:34:10 +0100 |
---|---|---|
committer | Marco Groppo <[email protected]> | 2019-04-19 23:29:16 +0100 |
commit | 8ac3d1f9aa892fc891b69c7d8d00d39b9371d246 (patch) | |
tree | cdd2d8235d66022f13d221151d4bd0210075767f /crates/ra_hir/src/db.rs | |
parent | 8ebb20edce85b74eab0ed78ba5c4969ec733ad12 (diff) |
lang_item_lookup is now a salsa query.
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index b27efcbe3..8af0a3176 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | use std::sync::Arc; | 1 | use std::sync::Arc; |
2 | 2 | ||
3 | use ra_syntax::{SyntaxNode, TreeArc, SourceFile, ast}; | 3 | use ra_syntax::{SyntaxNode, TreeArc, SourceFile, SmolStr, ast}; |
4 | use ra_db::{SourceDatabase, salsa}; | 4 | use ra_db::{SourceDatabase, salsa}; |
5 | 5 | ||
6 | use crate::{ | 6 | use crate::{ |
@@ -16,7 +16,7 @@ use crate::{ | |||
16 | generics::{GenericParams, GenericDef}, | 16 | generics::{GenericParams, GenericDef}, |
17 | type_ref::TypeRef, | 17 | type_ref::TypeRef, |
18 | traits::TraitData, Trait, ty::TraitRef, | 18 | traits::TraitData, Trait, ty::TraitRef, |
19 | lang_item::LangItems, | 19 | lang_item::{LangItems, LangItemTarget}, |
20 | ids | 20 | ids |
21 | }; | 21 | }; |
22 | 22 | ||
@@ -104,6 +104,9 @@ pub trait DefDatabase: SourceDatabase { | |||
104 | 104 | ||
105 | #[salsa::invoke(crate::lang_item::LangItems::lang_items_query)] | 105 | #[salsa::invoke(crate::lang_item::LangItems::lang_items_query)] |
106 | fn lang_items(&self, krate: Crate) -> Arc<LangItems>; | 106 | fn lang_items(&self, krate: Crate) -> Arc<LangItems>; |
107 | |||
108 | #[salsa::invoke(crate::lang_item::LangItems::lang_item_query)] | ||
109 | fn lang_item(&self, start_crate: Crate, item: SmolStr) -> Option<LangItemTarget>; | ||
107 | } | 110 | } |
108 | 111 | ||
109 | #[salsa::query_group(HirDatabaseStorage)] | 112 | #[salsa::query_group(HirDatabaseStorage)] |