Rust: fix canonical paths broken on StructExpr and StructPath
#19072
Conversation
After the rename done in #19059, canonical path extraction was lost on `StructExpr` and `StructPath` as the identifiers used for the type in the `emit_detached!` macro were not updated. This fixes that.
There was a problem hiding this comment.
Pull Request Overview
This PR addresses the issue where canonical path extraction for StructExpr and StructPath was broken by a previous rename.
- Updated the emit_detached! macro branch from RecordExpr to StructExpr.
- Updated the emit_detached! macro branch from RecordPat to StructPat.
Files not reviewed (1)
- rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected: Language not supported
Tip: Copilot code review supports C#, Go, Java, JavaScript, Markdown, Python, Ruby and TypeScript, with more languages coming soon. Learn more
| @@ -53,13 +53,13 @@ macro_rules! emit_detached { | |||
| (PathExpr, $self:ident, $node:ident, $label:ident) => { | |||
| $self.extract_path_canonical_destination(&$node, $label.into()); | |||
| }; | |||
| (RecordExpr, $self:ident, $node:ident, $label:ident) => { | |||
| (StructExpr, $self:ident, $node:ident, $label:ident) => { | |||
There was a problem hiding this comment.
How could this even compile before?
There was a problem hiding this comment.
That's because that is a macro invocation on an arbitrary ident, matching it literally. So both the matching here and the idents passed at the macro call sites really can be anything, as they don't then appear in the expanded code.
There was a problem hiding this comment.
(or in less words, this is a bit of a hack 😆)
There was a problem hiding this comment.
as a bit of background, this could be solved more elegantly if https://rust-lang.github.io/rfcs/1210-impl-specialization.html get finished/implemented: right now the problem is that you can't give a blanket fallback trait implementation, which would be required here to catch most cases and do nothing. If specialization was a thing, we could do a trait with a default implementation doing nothing and then specialize that implementation on the ast classes listed here, without using a magic hacky macro.
After the rename done in #19059, canonical path extraction was lost on
StructExprandStructPathas the identifiers used for the type in theemit_detached!macro were not updated. This fixes that.