diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index da62db58a00..11cdf9c3492 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs @@ -126,7 +126,7 @@ pub trait HirDatabase: DefDatabase { #[salsa::invoke(ExprScopes::expr_scopes_query)] fn expr_scopes(&self, def: DefWithBody) -> Arc; - #[salsa::invoke(crate::ty::infer)] + #[salsa::invoke(crate::ty::infer_query)] fn infer(&self, def: DefWithBody) -> Arc; #[salsa::invoke(crate::ty::type_for_def)] diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index 9a65bf567de..3679a2242ac 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs @@ -20,7 +20,7 @@ use crate::{Name, AdtDef, type_ref::Mutability, db::HirDatabase, Trait, GenericP use display::{HirDisplay, HirFormatter}; pub(crate) use lower::{TypableDef, type_for_def, type_for_field, callable_item_sig, generic_predicates, generic_defaults}; -pub(crate) use infer::{infer, InferenceResult, InferTy}; +pub(crate) use infer::{infer_query, InferenceResult, InferTy}; pub use lower::CallableDef; /// A type constructor or type name: this might be something like the primitive diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 1e7d97f51cc..a48272981f2 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs @@ -23,6 +23,7 @@ use ena::unify::{InPlaceUnificationTable, UnifyKey, UnifyValue, NoError}; use rustc_hash::FxHashMap; use ra_arena::map::ArenaMap; +use ra_prof::profile; use test_utils::tested_by; use crate::{ @@ -51,7 +52,8 @@ use super::{ mod unify; /// The entry point of type inference. -pub fn infer(db: &impl HirDatabase, def: DefWithBody) -> Arc { +pub fn infer_query(db: &impl HirDatabase, def: DefWithBody) -> Arc { + let _p = profile("infer_query"); db.check_canceled(); let body = def.body(db); let resolver = def.resolver(db); diff --git a/crates/ra_prof/src/lib.rs b/crates/ra_prof/src/lib.rs index e56446c9fa4..61f2226d723 100644 --- a/crates/ra_prof/src/lib.rs +++ b/crates/ra_prof/src/lib.rs @@ -198,6 +198,7 @@ fn print(lvl: usize, msgs: &[Message], out: &mut impl Write) { if l != lvl { continue; } + writeln!(out, "{} {:6}ms - {}", indent, dur.as_millis(), msg) .expect("printing profiling info to stdout");