diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 12:46:18 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 12:46:18 +0000 |
| commit | 443ff27724855ffbfccad3513bb82d59e1a4f8ae (patch) | |
| tree | 684cec39e4dd7856c4738a4635ac5bce814efcd0 /crates/ra_hir/src/nameres.rs | |
| parent | c7f072372edc7a94544c993d03928aab2ac92dab (diff) | |
| parent | fedd320cf284ec5d489e62bf809277cedd9f60ac (diff) | |
Merge #548
548: check_canceled does not return Result 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index 6bf949654..edb3b1e64 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
| @@ -327,7 +327,7 @@ where | |||
| 327 | loop { | 327 | loop { |
| 328 | let processed_imports_count = self.processed_imports.len(); | 328 | let processed_imports_count = self.processed_imports.len(); |
| 329 | for &module_id in self.input.keys() { | 329 | for &module_id in self.input.keys() { |
| 330 | self.db.check_canceled()?; | 330 | self.db.check_canceled(); |
| 331 | self.resolve_imports(module_id)?; | 331 | self.resolve_imports(module_id)?; |
| 332 | } | 332 | } |
| 333 | if processed_imports_count == self.processed_imports.len() { | 333 | if processed_imports_count == self.processed_imports.len() { |