Merge #9137

bors[bot] · jonas-schievink · web-flow · commit 92d91050c4aa · 2021-06-04T14:51:39.000Z
9137: fix: fix incorrect "unresolved import" error when using derive helpers r=jonas-schievink a=jonas-schievink Fixes #9133 cursed bug bors r+ Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
@@ -1062,6 +1062,7 @@ impl DefCollector<'_> {
                                 .collect(&[*mod_item]);
 
                                 // Remove the original directive since we resolved it.
+                                res = ReachedFixedPoint::No;
                                 return false;
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -1062,6 +1062,7 @@ impl DefCollector<'_> {`
`1062`	`1062`	`.collect(&[*mod_item]);`
`1063`	`1063`
`1064`	`1064`	`// Remove the original directive since we resolved it.`
	`1065`	`+ res = ReachedFixedPoint::No;`
`1065`	`1066`	`return false;`
`1066`	`1067`	`}`
`1067`	`1068`	`}`