diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-06 23:18:28 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-06 23:18:28 +0000 |
commit | 48bb1c51721b7736b6d6f2e5cb82126c91934433 (patch) | |
tree | 464e625dd0ca6a888800a89dbb188a480e17ec92 /crates/ra_hir_def/src/db.rs | |
parent | d4cea98bc342b0aa2603106a155722dcbe5534e1 (diff) | |
parent | 9abf0d9659d0d48036c4172e29fe33770134dd61 (diff) |
Merge #3504
3504: Normalize waiting queries names r=matklad a=matklad
bors r+
🤖
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs index 2338b2cbe..dcd377aae 100644 --- a/crates/ra_hir_def/src/db.rs +++ b/crates/ra_hir_def/src/db.rs | |||
@@ -47,11 +47,11 @@ pub trait DefDatabase: InternDatabase + AstDatabase { | |||
47 | #[salsa::invoke(RawItems::raw_items_query)] | 47 | #[salsa::invoke(RawItems::raw_items_query)] |
48 | fn raw_items(&self, file_id: HirFileId) -> Arc<RawItems>; | 48 | fn raw_items(&self, file_id: HirFileId) -> Arc<RawItems>; |
49 | 49 | ||
50 | #[salsa::transparent] | 50 | #[salsa::invoke(crate_def_map_wait)] |
51 | fn crate_def_map(&self, krate: CrateId) -> Arc<CrateDefMap>; | 51 | fn crate_def_map(&self, krate: CrateId) -> Arc<CrateDefMap>; |
52 | 52 | ||
53 | #[salsa::invoke(CrateDefMap::compute_crate_def_map_query)] | 53 | #[salsa::invoke(CrateDefMap::crate_def_map_query)] |
54 | fn compute_crate_def_map(&self, krate: CrateId) -> Arc<CrateDefMap>; | 54 | fn crate_def_map_query(&self, krate: CrateId) -> Arc<CrateDefMap>; |
55 | 55 | ||
56 | #[salsa::invoke(StructData::struct_data_query)] | 56 | #[salsa::invoke(StructData::struct_data_query)] |
57 | fn struct_data(&self, id: StructId) -> Arc<StructData>; | 57 | fn struct_data(&self, id: StructId) -> Arc<StructData>; |
@@ -109,7 +109,7 @@ pub trait DefDatabase: InternDatabase + AstDatabase { | |||
109 | fn documentation(&self, def: AttrDefId) -> Option<Documentation>; | 109 | fn documentation(&self, def: AttrDefId) -> Option<Documentation>; |
110 | } | 110 | } |
111 | 111 | ||
112 | fn crate_def_map(db: &impl DefDatabase, krate: CrateId) -> Arc<CrateDefMap> { | 112 | fn crate_def_map_wait(db: &impl DefDatabase, krate: CrateId) -> Arc<CrateDefMap> { |
113 | let _p = profile("wait_crate_def_map"); | 113 | let _p = profile("crate_def_map:wait"); |
114 | db.compute_crate_def_map(krate) | 114 | db.crate_def_map_query(krate) |
115 | } | 115 | } |