aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/nameres/collector.rs
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-05-29 20:18:57 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-05-29 20:18:57 +0100
commit8c3cd8f121d4306732423d1c8804d54e36bd706a (patch)
treefa887bc9a274813869d41f36cb5e48a4c1bd3ef9 /crates/ra_hir/src/nameres/collector.rs
parent7e9c5e32e5f7819b340fc2adb63b2ffeeb2627cf (diff)
parent9304cb026309d68f2b5a6326e74f836bc79f88f5 (diff)
Merge #1346
1346: bump timeout for CI r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/nameres/collector.rs')
-rw-r--r--crates/ra_hir/src/nameres/collector.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs
index ba7ea0017..af8ac064c 100644
--- a/crates/ra_hir/src/nameres/collector.rs
+++ b/crates/ra_hir/src/nameres/collector.rs
@@ -112,6 +112,7 @@ where
112 // main name resolution fixed-point loop. 112 // main name resolution fixed-point loop.
113 let mut i = 0; 113 let mut i = 0;
114 loop { 114 loop {
115 self.db.check_canceled();
115 match (self.resolve_imports(), self.resolve_macros()) { 116 match (self.resolve_imports(), self.resolve_macros()) {
116 (ReachedFixedPoint::Yes, ReachedFixedPoint::Yes) => break, 117 (ReachedFixedPoint::Yes, ReachedFixedPoint::Yes) => break,
117 _ => i += 1, 118 _ => i += 1,