aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-06-04 15:51:39 +0100
committerGitHub <[email protected]>2021-06-04 15:51:39 +0100
commit92d91050c4aa48732e7af3bf979aa7ed5aed924d (patch)
treeded874dd18ff8a5fba7e62d99e26d246e32d97cf /crates
parentdceec3eb80f3f2d064536ef8272522f65ec1a76c (diff)
parent20de86d0146a442ae7fd44e1638eaf32ab99f2f1 (diff)
Merge #9137
9137: fix: fix incorrect "unresolved import" error when using derive helpers r=jonas-schievink a=jonas-schievink Fixes https://github.com/rust-analyzer/rust-analyzer/issues/9133 cursed bug bors r+ Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/hir_def/src/nameres/collector.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index b2ce739bd..d0b1db5d1 100644
--- a/crates/hir_def/src/nameres/collector.rs
+++ b/crates/hir_def/src/nameres/collector.rs
@@ -1062,6 +1062,7 @@ impl DefCollector<'_> {
1062 .collect(&[*mod_item]); 1062 .collect(&[*mod_item]);
1063 1063
1064 // Remove the original directive since we resolved it. 1064 // Remove the original directive since we resolved it.
1065 res = ReachedFixedPoint::No;
1065 return false; 1066 return false;
1066 } 1067 }
1067 } 1068 }