aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/db.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r--crates/ra_hir/src/db.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 31b21ca84..17cb63868 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -13,7 +13,7 @@ use crate::{
13 CallableDef, FnSig, GenericPredicate, InferenceResult, Substs, Ty, TyDefId, TypeCtor, 13 CallableDef, FnSig, GenericPredicate, InferenceResult, Substs, Ty, TyDefId, TypeCtor,
14 ValueTyDefId, 14 ValueTyDefId,
15 }, 15 },
16 Crate, DefWithBody, ImplBlock, 16 DefWithBody, ImplBlock,
17}; 17};
18 18
19pub use hir_def::db::{ 19pub use hir_def::db::{
@@ -71,7 +71,7 @@ pub trait HirDatabase: DefDatabase {
71 /// Mutex and the query does an untracked read internally, to make sure the 71 /// Mutex and the query does an untracked read internally, to make sure the
72 /// cached state is thrown away when input facts change. 72 /// cached state is thrown away when input facts change.
73 #[salsa::invoke(crate::ty::traits::trait_solver_query)] 73 #[salsa::invoke(crate::ty::traits::trait_solver_query)]
74 fn trait_solver(&self, krate: Crate) -> crate::ty::traits::TraitSolver; 74 fn trait_solver(&self, krate: CrateId) -> crate::ty::traits::TraitSolver;
75 75
76 // Interned IDs for Chalk integration 76 // Interned IDs for Chalk integration
77 #[salsa::interned] 77 #[salsa::interned]
@@ -93,35 +93,35 @@ pub trait HirDatabase: DefDatabase {
93 #[salsa::invoke(crate::ty::traits::chalk::trait_datum_query)] 93 #[salsa::invoke(crate::ty::traits::chalk::trait_datum_query)]
94 fn trait_datum( 94 fn trait_datum(
95 &self, 95 &self,
96 krate: Crate, 96 krate: CrateId,
97 trait_id: chalk_ir::TraitId, 97 trait_id: chalk_ir::TraitId,
98 ) -> Arc<chalk_rust_ir::TraitDatum<chalk_ir::family::ChalkIr>>; 98 ) -> Arc<chalk_rust_ir::TraitDatum<chalk_ir::family::ChalkIr>>;
99 99
100 #[salsa::invoke(crate::ty::traits::chalk::struct_datum_query)] 100 #[salsa::invoke(crate::ty::traits::chalk::struct_datum_query)]
101 fn struct_datum( 101 fn struct_datum(
102 &self, 102 &self,
103 krate: Crate, 103 krate: CrateId,
104 struct_id: chalk_ir::StructId, 104 struct_id: chalk_ir::StructId,
105 ) -> Arc<chalk_rust_ir::StructDatum<chalk_ir::family::ChalkIr>>; 105 ) -> Arc<chalk_rust_ir::StructDatum<chalk_ir::family::ChalkIr>>;
106 106
107 #[salsa::invoke(crate::ty::traits::chalk::impl_datum_query)] 107 #[salsa::invoke(crate::ty::traits::chalk::impl_datum_query)]
108 fn impl_datum( 108 fn impl_datum(
109 &self, 109 &self,
110 krate: Crate, 110 krate: CrateId,
111 impl_id: chalk_ir::ImplId, 111 impl_id: chalk_ir::ImplId,
112 ) -> Arc<chalk_rust_ir::ImplDatum<chalk_ir::family::ChalkIr>>; 112 ) -> Arc<chalk_rust_ir::ImplDatum<chalk_ir::family::ChalkIr>>;
113 113
114 #[salsa::invoke(crate::ty::traits::chalk::associated_ty_value_query)] 114 #[salsa::invoke(crate::ty::traits::chalk::associated_ty_value_query)]
115 fn associated_ty_value( 115 fn associated_ty_value(
116 &self, 116 &self,
117 krate: Crate, 117 krate: CrateId,
118 id: chalk_rust_ir::AssociatedTyValueId, 118 id: chalk_rust_ir::AssociatedTyValueId,
119 ) -> Arc<chalk_rust_ir::AssociatedTyValue<chalk_ir::family::ChalkIr>>; 119 ) -> Arc<chalk_rust_ir::AssociatedTyValue<chalk_ir::family::ChalkIr>>;
120 120
121 #[salsa::invoke(crate::ty::traits::trait_solve_query)] 121 #[salsa::invoke(crate::ty::traits::trait_solve_query)]
122 fn trait_solve( 122 fn trait_solve(
123 &self, 123 &self,
124 krate: Crate, 124 krate: CrateId,
125 goal: crate::ty::Canonical<crate::ty::InEnvironment<crate::ty::Obligation>>, 125 goal: crate::ty::Canonical<crate::ty::InEnvironment<crate::ty::Obligation>>,
126 ) -> Option<crate::ty::traits::Solution>; 126 ) -> Option<crate::ty::traits::Solution>;
127} 127}