diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-14 18:02:55 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-14 18:02:55 +0100 |
commit | c2594daf2974dbd4ce3d9b7ec72481764abaceb5 (patch) | |
tree | 82099976fd1c06484a4a8662890465846f282772 /crates | |
parent | f7abd16a8c896657ab6170e4f09839e92da006c0 (diff) | |
parent | de282ddd869f78fc8324f2333204b10e93939d83 (diff) |
Merge #5347
5347: Chalk writer integration r=flodiebold a=detrumi
~~This adds a `rust-analyzer dump-chalk` command, similar to analysis-stats, which writes out the whole chalk progam (see [chalk#365](https://github.com/rust-lang/chalk/issues/365) for more info about the .chalk writer)~~
Write out chalk programs in debug output if chalk debugging is active (using `CHALK_DEBUG`).
Example output:
```
[DEBUG ra_hir_ty::traits] solve(UCanonical { canonical: Canonical { value: InEnvironment { environment: Env([]), goal: Implemented(SeparatorTraitRef(?)) }, binders: [] }, universes: 1 }) => None
[INFO ra_hir_ty::traits] trait_solve_query(Implements(fn min<?0.0>(?0.0, ?0.0) -> ?0.0: Deref))
[DEBUG ra_hir_ty::traits] solve goal: UCanonical { canonical: Canonical { value: InEnvironment { environment: Env([]), goal: Implemented(SeparatorTraitRef(?)) }, binders: [U0 with kind type] }, universes: 1 }
[DEBUG ra_hir_ty::traits::chalk] impls_for_trait Deref
[DEBUG ra_hir_ty::traits::chalk] impls_for_trait returned 0 impls
[DEBUG ra_hir_ty::traits::chalk] trait_datum Ord
[DEBUG ra_hir_ty::traits::chalk] trait Ord = Name(Text("Ord"))
[DEBUG ra_hir_ty::traits] chalk program:
#[upstream]
#[non_enumerable]
#[object_safe]
trait Ord {}
#[upstream]
#[non_enumerable]
#[object_safe]
#[lang(sized)]
trait Sized {}
fn fn_0<_1_0>(arg_0: _1_0, arg_1: _1_0) -> _1_0
where
_1_0: Ord;
#[upstream]
#[non_enumerable]
#[object_safe]
trait Deref {
type Assoc_1829: Sized;
}
[DEBUG ra_hir_ty::traits] solve(UCanonical { canonical: Canonical { value: InEnvironment { environment: Env([]), goal: Implemented(SeparatorTraitRef(?)) }, binders: [U0 with kind type] }, universes: 1 }) => None
[INFO ra_hir_ty::traits] trait_solve_query(Implements(?0.0: Ord))
```
Co-authored-by: Wilco Kusee <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r-- | crates/hir_ty/src/traits.rs | 21 | ||||
-rw-r--r-- | crates/hir_ty/src/traits/chalk.rs | 23 |
2 files changed, 30 insertions, 14 deletions
diff --git a/crates/hir_ty/src/traits.rs b/crates/hir_ty/src/traits.rs index 255323717..1c3abb18f 100644 --- a/crates/hir_ty/src/traits.rs +++ b/crates/hir_ty/src/traits.rs | |||
@@ -3,7 +3,7 @@ use std::sync::Arc; | |||
3 | 3 | ||
4 | use base_db::CrateId; | 4 | use base_db::CrateId; |
5 | use chalk_ir::cast::Cast; | 5 | use chalk_ir::cast::Cast; |
6 | use chalk_solve::Solver; | 6 | use chalk_solve::{logging_db::LoggingRustIrDatabase, Solver}; |
7 | use hir_def::{lang_item::LangItemTarget, TraitId}; | 7 | use hir_def::{lang_item::LangItemTarget, TraitId}; |
8 | 8 | ||
9 | use crate::{db::HirDatabase, DebruijnIndex, Substs}; | 9 | use crate::{db::HirDatabase, DebruijnIndex, Substs}; |
@@ -166,16 +166,25 @@ fn solve( | |||
166 | } | 166 | } |
167 | remaining > 0 | 167 | remaining > 0 |
168 | }; | 168 | }; |
169 | |||
169 | let mut solve = || { | 170 | let mut solve = || { |
170 | let solution = solver.solve_limited(&context, goal, should_continue); | 171 | if is_chalk_print() { |
171 | log::debug!("solve({:?}) => {:?}", goal, solution); | 172 | let logging_db = LoggingRustIrDatabase::new(context); |
172 | solution | 173 | let solution = solver.solve_limited(&logging_db, goal, should_continue); |
174 | log::debug!("chalk program:\n{}", logging_db); | ||
175 | solution | ||
176 | } else { | ||
177 | solver.solve_limited(&context, goal, should_continue) | ||
178 | } | ||
173 | }; | 179 | }; |
180 | |||
174 | // don't set the TLS for Chalk unless Chalk debugging is active, to make | 181 | // don't set the TLS for Chalk unless Chalk debugging is active, to make |
175 | // extra sure we only use it for debugging | 182 | // extra sure we only use it for debugging |
176 | let solution = | 183 | let solution = |
177 | if is_chalk_debug() { chalk::tls::set_current_program(db, solve) } else { solve() }; | 184 | if is_chalk_debug() { chalk::tls::set_current_program(db, solve) } else { solve() }; |
178 | 185 | ||
186 | log::debug!("solve({:?}) => {:?}", goal, solution); | ||
187 | |||
179 | solution | 188 | solution |
180 | } | 189 | } |
181 | 190 | ||
@@ -183,6 +192,10 @@ fn is_chalk_debug() -> bool { | |||
183 | std::env::var("CHALK_DEBUG").is_ok() | 192 | std::env::var("CHALK_DEBUG").is_ok() |
184 | } | 193 | } |
185 | 194 | ||
195 | fn is_chalk_print() -> bool { | ||
196 | std::env::var("CHALK_PRINT").is_ok() | ||
197 | } | ||
198 | |||
186 | fn solution_from_chalk( | 199 | fn solution_from_chalk( |
187 | db: &dyn HirDatabase, | 200 | db: &dyn HirDatabase, |
188 | solution: chalk_solve::Solution<Interner>, | 201 | solution: chalk_solve::Solution<Interner>, |
diff --git a/crates/hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs index b33653417..17c83b6a4 100644 --- a/crates/hir_ty/src/traits/chalk.rs +++ b/crates/hir_ty/src/traits/chalk.rs | |||
@@ -240,20 +240,23 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> { | |||
240 | Substs::empty().to_chalk(self.db) | 240 | Substs::empty().to_chalk(self.db) |
241 | } | 241 | } |
242 | 242 | ||
243 | fn trait_name(&self, _trait_id: chalk_ir::TraitId<Interner>) -> String { | 243 | fn trait_name(&self, trait_id: chalk_ir::TraitId<Interner>) -> String { |
244 | unimplemented!() | 244 | let id = from_chalk(self.db, trait_id); |
245 | self.db.trait_data(id).name.to_string() | ||
245 | } | 246 | } |
246 | fn adt_name(&self, _struct_id: chalk_ir::AdtId<Interner>) -> String { | 247 | // FIXME: lookup names |
247 | unimplemented!() | 248 | fn adt_name(&self, struct_id: chalk_ir::AdtId<Interner>) -> String { |
249 | let datum = self.db.struct_datum(self.krate, struct_id); | ||
250 | format!("{:?}", datum.name(&Interner)) | ||
248 | } | 251 | } |
249 | fn assoc_type_name(&self, _assoc_ty_id: chalk_ir::AssocTypeId<Interner>) -> String { | 252 | fn assoc_type_name(&self, assoc_ty_id: chalk_ir::AssocTypeId<Interner>) -> String { |
250 | unimplemented!() | 253 | format!("Assoc_{}", assoc_ty_id.0) |
251 | } | 254 | } |
252 | fn opaque_type_name(&self, _opaque_ty_id: chalk_ir::OpaqueTyId<Interner>) -> String { | 255 | fn opaque_type_name(&self, opaque_ty_id: chalk_ir::OpaqueTyId<Interner>) -> String { |
253 | unimplemented!() | 256 | format!("Opaque_{}", opaque_ty_id.0) |
254 | } | 257 | } |
255 | fn fn_def_name(&self, _fn_def_id: chalk_ir::FnDefId<Interner>) -> String { | 258 | fn fn_def_name(&self, fn_def_id: chalk_ir::FnDefId<Interner>) -> String { |
256 | unimplemented!() | 259 | format!("fn_{}", fn_def_id.0) |
257 | } | 260 | } |
258 | } | 261 | } |
259 | 262 | ||