diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-03 21:34:50 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-03 21:34:50 +0000 |
commit | 4fd742d6bc23e2f61d0980e15234f09d7e715b76 (patch) | |
tree | c37d38f9313f54ea71580f6bd005f554388a57ab /crates/ra_hir_def/src/db.rs | |
parent | f9f1effd011b906903891c09f1cb6b2a42f73e95 (diff) | |
parent | 8922a44395482896fec0c0a47a7fac4612112d45 (diff) |
Merge #2163
2163: Move CrateDefMap to hir_def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/db.rs')
-rw-r--r-- | crates/ra_hir_def/src/db.rs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs index f6027013f..a42348101 100644 --- a/crates/ra_hir_def/src/db.rs +++ b/crates/ra_hir_def/src/db.rs | |||
@@ -2,13 +2,16 @@ | |||
2 | use std::sync::Arc; | 2 | use std::sync::Arc; |
3 | 3 | ||
4 | use hir_expand::{db::AstDatabase, HirFileId}; | 4 | use hir_expand::{db::AstDatabase, HirFileId}; |
5 | use ra_db::{salsa, SourceDatabase}; | 5 | use ra_db::{salsa, CrateId, SourceDatabase}; |
6 | use ra_syntax::ast; | 6 | use ra_syntax::ast; |
7 | 7 | ||
8 | use crate::{ | 8 | use crate::{ |
9 | adt::{EnumData, StructData}, | 9 | adt::{EnumData, StructData}, |
10 | nameres::raw::{ImportSourceMap, RawItems}, | 10 | nameres::{ |
11 | EnumId, StructId, | 11 | raw::{ImportSourceMap, RawItems}, |
12 | CrateDefMap, | ||
13 | }, | ||
14 | EnumId, StructId, UnionId, | ||
12 | }; | 15 | }; |
13 | 16 | ||
14 | #[salsa::query_group(InternDatabaseStorage)] | 17 | #[salsa::query_group(InternDatabaseStorage)] |
@@ -42,9 +45,15 @@ pub trait DefDatabase2: InternDatabase + AstDatabase { | |||
42 | #[salsa::invoke(RawItems::raw_items_query)] | 45 | #[salsa::invoke(RawItems::raw_items_query)] |
43 | fn raw_items(&self, file_id: HirFileId) -> Arc<RawItems>; | 46 | fn raw_items(&self, file_id: HirFileId) -> Arc<RawItems>; |
44 | 47 | ||
48 | #[salsa::invoke(CrateDefMap::crate_def_map_query)] | ||
49 | fn crate_def_map(&self, krate: CrateId) -> Arc<CrateDefMap>; | ||
50 | |||
45 | #[salsa::invoke(StructData::struct_data_query)] | 51 | #[salsa::invoke(StructData::struct_data_query)] |
46 | fn struct_data(&self, s: StructId) -> Arc<StructData>; | 52 | fn struct_data(&self, s: StructId) -> Arc<StructData>; |
47 | 53 | ||
54 | #[salsa::invoke(StructData::union_data_query)] | ||
55 | fn union_data(&self, s: UnionId) -> Arc<StructData>; | ||
56 | |||
48 | #[salsa::invoke(EnumData::enum_data_query)] | 57 | #[salsa::invoke(EnumData::enum_data_query)] |
49 | fn enum_data(&self, e: EnumId) -> Arc<EnumData>; | 58 | fn enum_data(&self, e: EnumId) -> Arc<EnumData>; |
50 | } | 59 | } |