Fix map_entry suggests wrongly for insert with cfg-ed out code
#15800
+49
−4
Conversation
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
rustbot
added
the
S-waiting-on-review
ada4a
reviewed
Oct 1, 2025
| } else if let Some(insertion) = then_search.as_single_insertion() { | ||
| } else if let Some(insertion) = then_search.as_single_insertion() | ||
| && let span_in_between = then_expr.span.shrink_to_lo().between(insertion.call.span) | ||
| && let span_in_between = span_in_between.with_lo(span_in_between.lo() + BytePos::from_usize(1)) |
There was a problem hiding this comment.
BytePos::from_usize(1)could be replaced withBytePos(1). In fact, this whole line could be simplified usingSpan::split_at:
Suggested change
| && let span_in_between = span_in_between.with_lo(span_in_between.lo() + BytePos::from_usize(1)) | |
| // remove the opening brace | |
| && let span_in_between = span_in_between.split_at(1).1 |
- I think the same check would be needed for the code after the
insert?
Generally, it could be better to do all these checks somewhere inside InsertSearcher? Though I'm not very familiar with visitors, so I'm not sure whether that's actually feasible.
There was a problem hiding this comment.
I think the same check would be needed for the code after the
insert?
Uh, I think it's a bit more complicated than that -- if there is cfgd-out code after the insert, then this case isn't even allow_insert_closure anymore. I think this is another argument for doing this check already in the visitor
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.
Closes #15781
changelog: [
map_entry] fix wrong suggestions for insert with cfg-ed out code