Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Nicer display of closures in Chalk logs

Browse source
This commit is contained in:
Florian Diebold 2020-04-10 22:05:31 +02:00
parent c388130f5f
commit 7886513f89
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
crates/ra_hir_ty/src/traits/chalk/tls.rs
View file

@ -5,7 +5,7 @@ use chalk_ir::{AliasTy, Goal, Goals, Lifetime, Parameter, ProgramClauseImplicati
use super::{from_chalk, Interner}; use super::{from_chalk, Interner};
use crate::{db::HirDatabase, CallableDef, TypeCtor}; use crate::{db::HirDatabase, CallableDef, TypeCtor};
use hir_def::{AdtId, AssocContainerId, Lookup, TypeAliasId}; use hir_def::{AdtId, AssocContainerId, DefWithBodyId, Lookup, TypeAliasId};
pub use unsafe_tls::{set_current_program, with_current_program}; pub use unsafe_tls::{set_current_program, with_current_program};
@ -69,7 +69,27 @@ impl DebugContext<'_> {
write!(f, "{}::{}", trait_name, name)?; write!(f, "{}::{}", trait_name, name)?;
} }
TypeCtor::Closure { def, expr } => { TypeCtor::Closure { def, expr } => {
write!(f, "{{closure {:?} in {:?}}}", expr.into_raw(), def)?; write!(f, "{{closure {:?} in ", expr.into_raw())?;
match def {
DefWithBodyId::FunctionId(func) => {
write!(f, "fn {}", self.0.function_data(func).name)?
}
DefWithBodyId::StaticId(s) => {
if let Some(name) = self.0.static_data(s).name.as_ref() {
write!(f, "body of static {}", name)?;
} else {
write!(f, "body of unnamed static {:?}", s)?;
}
}
DefWithBodyId::ConstId(c) => {
if let Some(name) = self.0.const_data(c).name.as_ref() {
write!(f, "body of const {}", name)?;
} else {
write!(f, "body of unnamed const {:?}", c)?;
}
}
};
write!(f, "}}")?;
} }
} }
Ok(()) Ok(())