diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-12 15:36:01 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-12 15:36:01 +0100 |
commit | 147547e7b85e80e2e30aa1a5ba4d9d0969908398 (patch) | |
tree | c39749d1b71b73b4017c2d0d848ebdc85e570c39 /crates/ra_hir_ty/src/db.rs | |
parent | 6be5ab02008b442c85c201968b97f24f13c4692e (diff) | |
parent | 208b7bd7ba687fb570feb1b89219f14c63712ce8 (diff) |
Merge #5724
5724: Rename ra_prof -> profile
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/db.rs')
-rw-r--r-- | crates/ra_hir_ty/src/db.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs index c773adc67..7a28673b1 100644 --- a/crates/ra_hir_ty/src/db.rs +++ b/crates/ra_hir_ty/src/db.rs | |||
@@ -2,13 +2,12 @@ | |||
2 | 2 | ||
3 | use std::sync::Arc; | 3 | use std::sync::Arc; |
4 | 4 | ||
5 | use arena::map::ArenaMap; | ||
5 | use hir_def::{ | 6 | use hir_def::{ |
6 | db::DefDatabase, expr::ExprId, DefWithBodyId, FunctionId, GenericDefId, ImplId, LocalFieldId, | 7 | db::DefDatabase, expr::ExprId, DefWithBodyId, FunctionId, GenericDefId, ImplId, LocalFieldId, |
7 | TypeParamId, VariantId, | 8 | TypeParamId, VariantId, |
8 | }; | 9 | }; |
9 | use ra_arena::map::ArenaMap; | ||
10 | use ra_db::{impl_intern_key, salsa, CrateId, Upcast}; | 10 | use ra_db::{impl_intern_key, salsa, CrateId, Upcast}; |
11 | use ra_prof::profile; | ||
12 | 11 | ||
13 | use crate::{ | 12 | use crate::{ |
14 | method_resolution::{InherentImpls, TraitImpls}, | 13 | method_resolution::{InherentImpls, TraitImpls}, |
@@ -123,7 +122,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> { | |||
123 | } | 122 | } |
124 | 123 | ||
125 | fn infer_wait(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> { | 124 | fn infer_wait(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> { |
126 | let _p = profile("infer:wait").detail(|| match def { | 125 | let _p = profile::span("infer:wait").detail(|| match def { |
127 | DefWithBodyId::FunctionId(it) => db.function_data(it).name.to_string(), | 126 | DefWithBodyId::FunctionId(it) => db.function_data(it).name.to_string(), |
128 | DefWithBodyId::StaticId(it) => { | 127 | DefWithBodyId::StaticId(it) => { |
129 | db.static_data(it).name.clone().unwrap_or_else(Name::missing).to_string() | 128 | db.static_data(it).name.clone().unwrap_or_else(Name::missing).to_string() |