aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-10-30 06:29:55 +0000
committerAleksey Kladov <[email protected]>2019-10-30 08:18:38 +0000
commit56bc874f1d14922686b26afc8793b7e57a652990 (patch)
tree3092079a541e32bb9e3000514fc8c03e0acec702 /crates
parent8046f5b24a316a50e109fe484cde4c128293fa97 (diff)
move ty interning to ty
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir/src/db.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 6d34c671d..da8ae6ef4 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -49,12 +49,6 @@ pub trait InternDatabase: SourceDatabase {
49 fn intern_trait(&self, loc: ids::ItemLoc<ast::TraitDef>) -> ids::TraitId; 49 fn intern_trait(&self, loc: ids::ItemLoc<ast::TraitDef>) -> ids::TraitId;
50 #[salsa::interned] 50 #[salsa::interned]
51 fn intern_type_alias(&self, loc: ids::ItemLoc<ast::TypeAliasDef>) -> ids::TypeAliasId; 51 fn intern_type_alias(&self, loc: ids::ItemLoc<ast::TypeAliasDef>) -> ids::TypeAliasId;
52
53 // Interned IDs for Chalk integration
54 #[salsa::interned]
55 fn intern_type_ctor(&self, type_ctor: TypeCtor) -> ids::TypeCtorId;
56 #[salsa::interned]
57 fn intern_impl(&self, impl_: Impl) -> ids::GlobalImplId;
58} 52}
59 53
60// This database uses `AstDatabase` internally, 54// This database uses `AstDatabase` internally,
@@ -176,6 +170,12 @@ pub trait HirDatabase: DefDatabase + AstDatabase {
176 #[salsa::invoke(crate::ty::traits::trait_solver_query)] 170 #[salsa::invoke(crate::ty::traits::trait_solver_query)]
177 fn trait_solver(&self, krate: Crate) -> crate::ty::traits::TraitSolver; 171 fn trait_solver(&self, krate: Crate) -> crate::ty::traits::TraitSolver;
178 172
173 // Interned IDs for Chalk integration
174 #[salsa::interned]
175 fn intern_type_ctor(&self, type_ctor: TypeCtor) -> ids::TypeCtorId;
176 #[salsa::interned]
177 fn intern_impl(&self, impl_: Impl) -> ids::GlobalImplId;
178
179 #[salsa::invoke(crate::ty::traits::chalk::associated_ty_data_query)] 179 #[salsa::invoke(crate::ty::traits::chalk::associated_ty_data_query)]
180 fn associated_ty_data(&self, id: chalk_ir::TypeId) -> Arc<chalk_rust_ir::AssociatedTyDatum>; 180 fn associated_ty_data(&self, id: chalk_ir::TypeId) -> Arc<chalk_rust_ir::AssociatedTyDatum>;
181 181