diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-06 15:41:09 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-06 15:41:09 +0000 |
commit | 190179489d7e19043c1cd087d4d4fc9035614227 (patch) | |
tree | 637cf6dfb29d0b7d0ecee76a348e65187bdfc2ba /crates | |
parent | aa82b5915de32f582b58cd25816bc3be69aa75c7 (diff) | |
parent | 59f91f2f9ba4cb6fa86fccb8a427cb9af2ecd192 (diff) |
Merge #3496
3496: Less confusing profile names r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_hir_def/src/db.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_ty/src/db.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_ty/src/infer.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs index da273eb11..2338b2cbe 100644 --- a/crates/ra_hir_def/src/db.rs +++ b/crates/ra_hir_def/src/db.rs | |||
@@ -110,6 +110,6 @@ pub trait DefDatabase: InternDatabase + AstDatabase { | |||
110 | } | 110 | } |
111 | 111 | ||
112 | fn crate_def_map(db: &impl DefDatabase, krate: CrateId) -> Arc<CrateDefMap> { | 112 | fn crate_def_map(db: &impl DefDatabase, krate: CrateId) -> Arc<CrateDefMap> { |
113 | let _p = profile("crate_def_map"); | 113 | let _p = profile("wait_crate_def_map"); |
114 | db.compute_crate_def_map(krate) | 114 | db.compute_crate_def_map(krate) |
115 | } | 115 | } |
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index c5137a0ab..166d1c421 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs | |||
@@ -182,7 +182,7 @@ impl CrateDefMap { | |||
182 | db: &impl DefDatabase, | 182 | db: &impl DefDatabase, |
183 | krate: CrateId, | 183 | krate: CrateId, |
184 | ) -> Arc<CrateDefMap> { | 184 | ) -> Arc<CrateDefMap> { |
185 | let _p = profile("compute_crate_def_map"); | 185 | let _p = profile("crate_def_map"); |
186 | let def_map = { | 186 | let def_map = { |
187 | let crate_graph = db.crate_graph(); | 187 | let crate_graph = db.crate_graph(); |
188 | let edition = crate_graph.edition(krate); | 188 | let edition = crate_graph.edition(krate); |
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs index 85d85182f..c43619d1c 100644 --- a/crates/ra_hir_ty/src/db.rs +++ b/crates/ra_hir_ty/src/db.rs | |||
@@ -111,7 +111,7 @@ pub trait HirDatabase: DefDatabase { | |||
111 | } | 111 | } |
112 | 112 | ||
113 | fn infer(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> { | 113 | fn infer(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> { |
114 | let _p = profile("infer"); | 114 | let _p = profile("wait_infer"); |
115 | db.do_infer(def) | 115 | db.do_infer(def) |
116 | } | 116 | } |
117 | 117 | ||
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs index 39f144216..437086ff6 100644 --- a/crates/ra_hir_ty/src/infer.rs +++ b/crates/ra_hir_ty/src/infer.rs | |||
@@ -64,7 +64,7 @@ mod coerce; | |||
64 | 64 | ||
65 | /// The entry point of type inference. | 65 | /// The entry point of type inference. |
66 | pub fn do_infer_query(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> { | 66 | pub fn do_infer_query(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> { |
67 | let _p = profile("do_infer"); | 67 | let _p = profile("infer"); |
68 | let resolver = def.resolver(db); | 68 | let resolver = def.resolver(db); |
69 | let mut ctx = InferenceContext::new(db, def, resolver); | 69 | let mut ctx = InferenceContext::new(db, def, resolver); |
70 | 70 | ||