Don't return dummy MacroData in get_macro#156151
Open
mejrs wants to merge 1 commit intorust-lang:mainfrom
Open
Don't return dummy MacroData in get_macro#156151mejrs wants to merge 1 commit intorust-lang:mainfrom
get_macro#156151mejrs wants to merge 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
r? @JohnTitor rustbot has assigned @JohnTitor. Use Why was this reviewer chosen?The reviewer was selected based on:
|
JohnTitor
reviewed
May 5, 2026
Member
|
r? petrochenkov for further review |
petrochenkov
reviewed
May 5, 2026
| @@ -204,7 +204,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { | |||
| pub(crate) fn get_macro(&self, res: Res) -> Option<&'ra MacroData> { | |||
Contributor
There was a problem hiding this comment.
Suggested change
| pub(crate) fn get_macro(&self, res: Res) -> Option<&'ra MacroData> { | |
| pub(crate) fn get_macro(&self, res: Res) -> Option<&'ra Arc<SyntaxExtension>> { |
Looks like the MacroData parts are never actually used.
| pub(crate) fn get_macro(&self, res: Res) -> Option<&'ra MacroData> { | ||
| match res { | ||
| Res::Def(DefKind::Macro(..), def_id) => Some(self.get_macro_by_def_id(def_id)), | ||
| Res::NonMacroAttr(_) => Some(self.non_macro_attr), |
Contributor
There was a problem hiding this comment.
I think this is incorrect in the check_reserved_macro_name case as well, not just in resolve_macro_or_delegation_path.
Something like use ignore as cfg; will now be accepted.
I'd rather not make this change in general, it seems error-prone.
petrochenkov
added
S-waiting-on-author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I was experimenting with tool attributes and ast manipulation, and wasted some time figuring out that this was happening. AFAIK all users of
get_macroare expecting an actual macro (and none were reading the dummy MacroData) so there should be no change in behavior.