Don't use maybe_unwrap_block when checking for macro calls in a block expr
#132653
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
This comment has been minimized.
This comment has been minimized.
BoxyUwU
force-pushed
the
const_arg_stmt_mac_call
branch
2 times, most recently
from
368ef2b to
e1182fa
Compare
This comment has been minimized.
This comment has been minimized.
BoxyUwU
force-pushed
the
const_arg_stmt_mac_call
branch
from
e1182fa to
1d6e847
Compare
compiler-errors
approved these changes
Nov 11, 2024
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 12, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#132487 (Provide placeholder generics for traits in "no method found for type parameter" suggestions) - rust-lang#132627 (cleanup: Remove outdated comment of `thir_body`) - rust-lang#132653 (Don't use `maybe_unwrap_block` when checking for macro calls in a block expr) - rust-lang#132793 (Update mdbook to 0.4.42) - rust-lang#132847 (elem_offset / subslice_range: use addr() instead of 'as usize') - rust-lang#132869 (split up the first paragraph of doc comments for better summaries) - rust-lang#132929 (Check for null in the `alloc_zeroed` example) - rust-lang#132933 (Make sure that we suggest turbofishing the right type arg for never suggestion) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 12, 2024
Rollup merge of rust-lang#132653 - BoxyUwU:const_arg_stmt_mac_call, r=compiler-errors Don't use `maybe_unwrap_block` when checking for macro calls in a block expr Fixes rust-lang#131915 Using `maybe_unwrap_block` to determine if we are looking at a `{ mac_call!{} }` will fail sometimes as `mac_call!{}` could be a `StmtKind::MacCall` not a `StmtKind::Expr`. This caused the def collector to think that `{ mac_call!{} }` was a non-trivial const argument and create a definition for it even though it should not. r? `@compiler-errors` cc `@camelid`
# for free
to join this conversation on GitHub.
Already have an account?
# 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 #131915
Using
maybe_unwrap_blockto determine if we are looking at a{ mac_call!{} }will fail sometimes asmac_call!{}could be aStmtKind::MacCallnot aStmtKind::Expr. This caused the def collector to think that{ mac_call!{} }was a non-trivial const argument and create a definition for it even though it should not.r? @compiler-errors cc @camelid