fix: Resolve $crate in derive paths
#14610
Conversation
rustbot
added
the
S-waiting-on-review
lowr
force-pushed
the
fix/hygiene-for-meta-item
branch
from
d6f184a to
cf72b62
Compare
| @@ -1223,8 +1225,9 @@ impl DefCollector<'_> { | |||
| } | |||
| }; | |||
| let ast_id = ast_id.with_value(ast_adt_id); | |||
| let hygiene = Hygiene::new(self.db.upcast(), file_id); | |||
There was a problem hiding this comment.
(Haven't checked) I feel like we should have a hygiene lying around here somewhere already no? (Building hygiene isn't the cheapest from what I remember)
There was a problem hiding this comment.
All paths but those in attributes seem to be lowered during ItemTree construction, which is decoupled from DefCollector, so there's no Hygiene around here. Moreover, a single DefCollector operates on possibly multiple HirFileIds, so we can't just cache Hygiene in it.
One thing we could try is having something like HashMap<HirFileId, Hygiene> in DefCollector and building Hygiene on demand. How does that sound?
There was a problem hiding this comment.
Ye I think adding that to reuse hygienes sounds good for now
|
@bors r+ |
Veykril
changed the title
$crate in derive paths$crate in derive paths
|
☀️ Test successful - checks-actions |
Paths in derive meta item list may contain any kind of paths, including those that start with
$crategenerated by macros. We need to take hygiene into account when we lower paths in the list.This issue was identified while investigating #14607, though this patch doesn't fix the broken trait resolution.