aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/db.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-11-06 21:11:42 +0000
committerGitHub <[email protected]>2019-11-06 21:11:42 +0000
commit14e19c0df19eb4ce71bbd24114452157c65c8209 (patch)
tree3cf99a99d4e0238b60ab5b73941798b33f2eb778 /crates/ra_hir/src/db.rs
parentef988492ee8f9718fdde15cec6d96e4c4cfef3cf (diff)
parentcb3767f28a2f9e443b816b17d5d07b6a1cff90ab (diff)
Merge #2179
2179: Use HirDatabase to compute `is_deprecated` r=matklad a=martskins This PR fixes #2167 by introducing `attributes_query` and adding `fn attrs(&self, def: crate::AttrDef) -> Option<Arc<[Attr]>>;` to the `DefDatabase` trait. I'm a little concerned about the two spots in `attributes_query` where code is repeated, but I couldn't figure out a way to avoid that, so.. I welcome suggestions :smile: Co-authored-by: Martin Asquino <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r--crates/ra_hir/src/db.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 11b3f94ae..75c322c99 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -2,6 +2,7 @@
2 2
3use std::sync::Arc; 3use std::sync::Arc;
4 4
5use hir_def::attr::Attr;
5use ra_db::salsa; 6use ra_db::salsa;
6use ra_syntax::SmolStr; 7use ra_syntax::SmolStr;
7 8
@@ -75,6 +76,9 @@ pub trait DefDatabase: HirDebugDatabase + DefDatabase2 {
75 76
76 #[salsa::invoke(crate::code_model::docs::documentation_query)] 77 #[salsa::invoke(crate::code_model::docs::documentation_query)]
77 fn documentation(&self, def: crate::DocDef) -> Option<crate::Documentation>; 78 fn documentation(&self, def: crate::DocDef) -> Option<crate::Documentation>;
79
80 #[salsa::invoke(crate::code_model::attrs::attributes_query)]
81 fn attrs(&self, def: crate::AttrDef) -> Option<Arc<[Attr]>>;
78} 82}
79 83
80#[salsa::query_group(HirDatabaseStorage)] 84#[salsa::query_group(HirDatabaseStorage)]