diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-05 18:49:29 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-05 18:49:29 +0000 |
commit | 3d662e320b97fdc50d8cc1721983661900da22d3 (patch) | |
tree | 40ba3a2db155d0e236ce481ff9f8df17b3031ba7 | |
parent | 069efbbb525ded23a0cd035ef77e55df1efdc33d (diff) | |
parent | d3ca22876c8e380ba3dfa77a2c8f8b5faf27e21c (diff) |
Merge #7883
7883: Make two calls virtual r=matklad a=lnicola
Co-authored-by: Laurențiu Nicola <[email protected]>
-rw-r--r-- | crates/hir_def/src/db.rs | 2 | ||||
-rw-r--r-- | crates/hir_ty/src/db.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_def/src/db.rs b/crates/hir_def/src/db.rs index 6c01f1ed0..cca5a086b 100644 --- a/crates/hir_def/src/db.rs +++ b/crates/hir_def/src/db.rs | |||
@@ -133,7 +133,7 @@ pub trait DefDatabase: InternDatabase + AstDatabase + Upcast<dyn AstDatabase> { | |||
133 | fn import_map(&self, krate: CrateId) -> Arc<ImportMap>; | 133 | fn import_map(&self, krate: CrateId) -> Arc<ImportMap>; |
134 | } | 134 | } |
135 | 135 | ||
136 | fn crate_def_map_wait(db: &impl DefDatabase, krate: CrateId) -> Arc<DefMap> { | 136 | fn crate_def_map_wait(db: &dyn DefDatabase, krate: CrateId) -> Arc<DefMap> { |
137 | let _p = profile::span("crate_def_map:wait"); | 137 | let _p = profile::span("crate_def_map:wait"); |
138 | db.crate_def_map_query(krate) | 138 | db.crate_def_map_query(krate) |
139 | } | 139 | } |
diff --git a/crates/hir_ty/src/db.rs b/crates/hir_ty/src/db.rs index b3af82444..06714409f 100644 --- a/crates/hir_ty/src/db.rs +++ b/crates/hir_ty/src/db.rs | |||
@@ -130,7 +130,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> { | |||
130 | ) -> chalk_ir::ProgramClauses<chalk::Interner>; | 130 | ) -> chalk_ir::ProgramClauses<chalk::Interner>; |
131 | } | 131 | } |
132 | 132 | ||
133 | fn infer_wait(db: &impl HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> { | 133 | fn infer_wait(db: &dyn HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> { |
134 | let _p = profile::span("infer:wait").detail(|| match def { | 134 | let _p = profile::span("infer:wait").detail(|| match def { |
135 | DefWithBodyId::FunctionId(it) => db.function_data(it).name.to_string(), | 135 | DefWithBodyId::FunctionId(it) => db.function_data(it).name.to_string(), |
136 | DefWithBodyId::StaticId(it) => { | 136 | DefWithBodyId::StaticId(it) => { |