Fix anon const def-creation when macros are involved take 2 #130337
+178
−28
Conversation
This file contains 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
rustbot
added
S-waiting-on-review
BoxyUwU
commented
Sep 14, 2024
| self.is_const_arg_trivial_macro_expansion(&*constant.value, Some(&constant)) | ||
| { | ||
| self.pending_anon_const_info = Some(pending_anon); | ||
| return self.visit_macro_invoc(macro_invoc); |
There was a problem hiding this comment.
This change to call visit_macro_invoc instead of walk_anon_const is what fixes #130321. Everything else in this PR is changes made to track if we've already unwrapped a brace or not (and related code deduplication since it would be pretty messy otherwise)
camelid
reviewed
Sep 15, 2024
| @@ -1199,14 +1199,15 @@ impl Expr { | |||
| } | |||
| } | |||
|
|
|||
| pub fn maybe_unwrap_block(&self) -> &Expr { | |||
| /// Returns an expression with (when possible) *one* outter brace removed | |||
| pub fn maybe_unwrap_block(&self) -> (bool, &Expr) { | |||
There was a problem hiding this comment.
Wondering if it would be clearer to return Option<&Expr> (also matching the function's name)? Then it could be used as expr.maybe_unwrap_block().unwrap_or(expr) e.g. Maybe that'd be worse, but it just came to mind.
There was a problem hiding this comment.
Yeah I think this is probably just worse for every caller unfortunately because this is not the nicest name/signature combo 😅
tests/ui/const-generics/early/trivial-const-arg-macro-braced-expansion.rs
Show resolved
Hide resolved
BoxyUwU
force-pushed
the
anon_const_macro_call
branch
from
90ff601
to
248dfe7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #130321
There were two cases that #129137 did not handle correctly:
Foo<{ bar!() }>in whichbar!()expands toN, we would visit the anon const and then visit the{ bar() }expression instead of visiting the macro call. This meant that we would build a def for the anon const as{ bar!() }is not a trivial const argument asbar!()is not a path.Foo<{ bar!() }>is whichbar!()expands to{ qux!() }in whichqux!()expands toN, it should not be considered a trivial const argument as{{ N }}has two pairs of braces. If we only looked atqux's expansion it would look like a trivial const argument even though it is not. We have to track whether we have "unwrapped" a brace already when recursing into the expansions ofbar/qux/any macror? @camelid