diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-12 16:49:39 +0100 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-12 16:49:39 +0100 |
| commit | a3a03b65dca9dc174bd58cd3d877ede18fc58637 (patch) | |
| tree | 464e2eaab5133f137e9d5c36fb34f6f6876c0432 /crates/ra_hir/src/nameres.rs | |
| parent | c452d2842c2ac7156178a05fe477e8832253a2c4 (diff) | |
| parent | b8cae2cf8f7d2a0162d614e25ef95d7e4a5d3677 (diff) | |
Merge #1398
1398: check for cancellation when executing queries r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
| -rw-r--r-- | crates/ra_hir/src/nameres.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index d84134877..3532faf01 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
| @@ -234,7 +234,6 @@ impl CrateDefMap { | |||
| 234 | db: &(impl DefDatabase + AstDatabase), | 234 | db: &(impl DefDatabase + AstDatabase), |
| 235 | krate: Crate, | 235 | krate: Crate, |
| 236 | ) -> Arc<CrateDefMap> { | 236 | ) -> Arc<CrateDefMap> { |
| 237 | db.check_canceled(); | ||
| 238 | let _p = profile("crate_def_map_query"); | 237 | let _p = profile("crate_def_map_query"); |
| 239 | let def_map = { | 238 | let def_map = { |
| 240 | let edition = krate.edition(db); | 239 | let edition = krate.edition(db); |