diff options
author | Florian Diebold <[email protected]> | 2019-04-20 11:34:36 +0100 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-05-04 17:18:30 +0100 |
commit | b9c0c2abb79769852119dc9a595e63ee74eeba03 (patch) | |
tree | 39bf8f14438771f20337eaf57c421aebe3e7dfdb /crates/ra_hir/src/db.rs | |
parent | 6269791d3626b9a9e5ea6a11c15e14470c0809a0 (diff) |
Chalk integration
- add proper canonicalization logic
- add conversions from/to Chalk IR
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 398e00c42..b2c4fccf2 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | use std::sync::Arc; | 1 | use std::sync::{Arc, Mutex}; |
2 | 2 | ||
3 | use ra_syntax::{SyntaxNode, TreeArc, SourceFile, SmolStr, ast}; | 3 | use ra_syntax::{SyntaxNode, TreeArc, SourceFile, SmolStr, ast}; |
4 | use ra_db::{SourceDatabase, salsa}; | 4 | use ra_db::{SourceDatabase, salsa}; |
@@ -8,16 +8,16 @@ use crate::{ | |||
8 | Function, FnSignature, ExprScopes, TypeAlias, | 8 | Function, FnSignature, ExprScopes, TypeAlias, |
9 | Struct, Enum, StructField, | 9 | Struct, Enum, StructField, |
10 | Const, ConstSignature, Static, | 10 | Const, ConstSignature, Static, |
11 | DefWithBody, | 11 | DefWithBody, Trait, |
12 | ids, | ||
12 | nameres::{Namespace, ImportSourceMap, RawItems, CrateDefMap}, | 13 | nameres::{Namespace, ImportSourceMap, RawItems, CrateDefMap}, |
13 | ty::{InferenceResult, Ty, method_resolution::CrateImplBlocks, TypableDef, CallableDef, FnSig}, | 14 | ty::{InferenceResult, Ty, method_resolution::CrateImplBlocks, TypableDef, CallableDef, FnSig, TypeCtor}, |
14 | adt::{StructData, EnumData}, | 15 | adt::{StructData, EnumData}, |
15 | impl_block::{ModuleImplBlocks, ImplSourceMap}, | 16 | impl_block::{ModuleImplBlocks, ImplSourceMap, ImplBlock}, |
16 | generics::{GenericParams, GenericDef}, | 17 | generics::{GenericParams, GenericDef}, |
17 | type_ref::TypeRef, | 18 | type_ref::TypeRef, |
18 | traits::TraitData, Trait, ty::TraitRef, | 19 | traits::TraitData, |
19 | lang_item::{LangItems, LangItemTarget}, | 20 | lang_item::{LangItems, LangItemTarget}, |
20 | ids | ||
21 | }; | 21 | }; |
22 | 22 | ||
23 | #[salsa::query_group(DefDatabaseStorage)] | 23 | #[salsa::query_group(DefDatabaseStorage)] |
@@ -39,6 +39,12 @@ pub trait DefDatabase: SourceDatabase { | |||
39 | #[salsa::interned] | 39 | #[salsa::interned] |
40 | fn intern_type_alias(&self, loc: ids::ItemLoc<ast::TypeAliasDef>) -> ids::TypeAliasId; | 40 | fn intern_type_alias(&self, loc: ids::ItemLoc<ast::TypeAliasDef>) -> ids::TypeAliasId; |
41 | 41 | ||
42 | // Interned IDs for Chalk integration | ||
43 | #[salsa::interned] | ||
44 | fn intern_type_ctor(&self, type_ctor: TypeCtor) -> ids::TypeCtorId; | ||
45 | #[salsa::interned] | ||
46 | fn intern_impl_block(&self, impl_block: ImplBlock) -> ids::GlobalImplId; | ||
47 | |||
42 | #[salsa::invoke(crate::ids::macro_def_query)] | 48 | #[salsa::invoke(crate::ids::macro_def_query)] |
43 | fn macro_def(&self, macro_id: MacroDefId) -> Option<Arc<mbe::MacroRules>>; | 49 | fn macro_def(&self, macro_id: MacroDefId) -> Option<Arc<mbe::MacroRules>>; |
44 | 50 | ||
@@ -144,8 +150,12 @@ pub trait HirDatabase: DefDatabase { | |||
144 | #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] | 150 | #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] |
145 | fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>; | 151 | fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>; |
146 | 152 | ||
147 | #[salsa::invoke(crate::ty::traits::implements)] | 153 | #[salsa::invoke(crate::ty::traits::impls_for_trait)] |
148 | fn implements(&self, trait_ref: TraitRef) -> Option<crate::ty::traits::Solution>; | 154 | fn impls_for_trait(&self, krate: Crate, trait_: Trait) -> Arc<[ImplBlock]>; |
155 | |||
156 | #[salsa::invoke(crate::ty::traits::solver)] | ||
157 | #[salsa::volatile] | ||
158 | fn chalk_solver(&self, krate: Crate) -> Arc<Mutex<chalk_solve::Solver>>; | ||
149 | } | 159 | } |
150 | 160 | ||
151 | #[test] | 161 | #[test] |