aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_ty/src/infer.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-08-12 15:36:01 +0100
committerGitHub <[email protected]>2020-08-12 15:36:01 +0100
commit147547e7b85e80e2e30aa1a5ba4d9d0969908398 (patch)
treec39749d1b71b73b4017c2d0d848ebdc85e570c39 /crates/ra_hir_ty/src/infer.rs
parent6be5ab02008b442c85c201968b97f24f13c4692e (diff)
parent208b7bd7ba687fb570feb1b89219f14c63712ce8 (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/infer.rs')
-rw-r--r--crates/ra_hir_ty/src/infer.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs
index 3d12039a6..784ae1c3c 100644
--- a/crates/ra_hir_ty/src/infer.rs
+++ b/crates/ra_hir_ty/src/infer.rs
@@ -18,6 +18,7 @@ use std::mem;
18use std::ops::Index; 18use std::ops::Index;
19use std::sync::Arc; 19use std::sync::Arc;
20 20
21use arena::map::ArenaMap;
21use hir_def::{ 22use hir_def::{
22 body::Body, 23 body::Body,
23 data::{ConstData, FunctionData, StaticData}, 24 data::{ConstData, FunctionData, StaticData},
@@ -30,8 +31,6 @@ use hir_def::{
30 TypeAliasId, VariantId, 31 TypeAliasId, VariantId,
31}; 32};
32use hir_expand::{diagnostics::DiagnosticSink, name::name}; 33use hir_expand::{diagnostics::DiagnosticSink, name::name};
33use ra_arena::map::ArenaMap;
34use ra_prof::profile;
35use ra_syntax::SmolStr; 34use ra_syntax::SmolStr;
36use rustc_hash::FxHashMap; 35use rustc_hash::FxHashMap;
37use stdx::impl_from; 36use stdx::impl_from;
@@ -64,7 +63,7 @@ mod coerce;
64 63
65/// The entry point of type inference. 64/// The entry point of type inference.
66pub(crate) fn infer_query(db: &dyn HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> { 65pub(crate) fn infer_query(db: &dyn HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> {
67 let _p = profile("infer_query"); 66 let _p = profile::span("infer_query");
68 let resolver = def.resolver(db.upcast()); 67 let resolver = def.resolver(db.upcast());
69 let mut ctx = InferenceContext::new(db, def, resolver); 68 let mut ctx = InferenceContext::new(db, def, resolver);
70 69