Replace span_look_ahead with span_followed_by#154745
Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom Apr 8, 2026
Merged
Replace span_look_ahead with span_followed_by#154745rust-bors[bot] merged 1 commit intorust-lang:mainfrom
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Conversation
Collaborator
|
Some changes occurred in match checking cc @Nadrieril |
rustbot
added
S-waiting-on-review
Collaborator
|
r? @nnethercote rustbot has assigned @nnethercote. Use Why was this reviewer chosen?The reviewer was selected based on:
|
chenyukang
commented
Apr 3, 2026
| // In case this could be a struct literal that needs to be surrounded | ||
| // by parentheses, find the appropriate span. | ||
| let close_brace_span = sm.span_look_ahead(followed_brace_span, "}", Some(50)); | ||
| let close_brace_span = |
Member
Author
There was a problem hiding this comment.
we can not use span_look_ahead here, because we only want to make sure there is a } in 50 range.
otherwise we can not handle the scenario like U { /* keep comment here */ }, since there are some non whitespace chars inside { }.
https://github.com/rust-lang/rust/pull/154745/changes#diff-68dd28577bfdbdba4a4c4ee9d20797f2f0e3939d926d4bdcbe13b1117a2dbe32R35-R38 is the test case for this.
Kivooeo
approved these changes
Apr 3, 2026
nnethercote
reviewed
Apr 6, 2026
| let close_brace_span = | ||
| sm.span_to_next_source(open_brace_span).ok().and_then(|next_source| { | ||
| let offset = next_source.find('}')?; | ||
| if next_source[..offset].chars().count() >= 50 { |
Contributor
There was a problem hiding this comment.
Please add a comment explaining what this >= 50 check is doing, and why 50 was chosen.
Member
Author
There was a problem hiding this comment.
50 was a heuristic number trying to find pattern { ... } nearby.
I just reconsider it, seems it's better to have a simple check for the nest braces and also remove this magic number here (https://github.com/rust-lang/rust/compare/6fce979d7e01d25123417481b3c20dd389c63d88..b7e05132e8d10fb19e6a91afd937d7bc0e8d433b).
Anyway, we are on the error handling path, performance is not the highest priority.
nnethercote
added
S-waiting-on-author
chenyukang
force-pushed
the
yukang-fix-span-api
branch
from
6fce979 to
b7e0513
Compare
This comment has been minimized.
This comment has been minimized.
chenyukang
force-pushed
the
yukang-fix-span-api
branch
from
b7e0513 to
ef9b7c2
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
nnethercote
approved these changes
Apr 8, 2026
Contributor
|
Looks good, thanks. @bors r+ rollup |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Apr 8, 2026
…nnethercote Replace span_look_ahead with span_followed_by While reviewing that PR rust-lang#154703 (comment), I found that magic number 100, let's remove it, and seems `span_followed_by` is a better name.
This was referenced Apr 8, 2026
rust-bors Bot
pushed a commit
that referenced
this pull request
Apr 8, 2026
…uwer Rollup of 15 pull requests Successful merges: - #153995 (Use convergent attribute to funcs for GPU targets) - #154184 (stabilize s390x vector registers) - #151898 (constify DoubleEndedIterator) - #154235 (remove unnecessary variables and delimiter check) - #154473 (move borrow checker tests) - #154745 (Replace span_look_ahead with span_followed_by) - #154778 (make field representing types invariant over the base type) - #154867 (Fix private fields diagnostics and improve error messages) - #154879 (Don't store `pattern_ty` in `TestableCase`) - #154910 (Suppress `unreachable_code` lint in `derive(PartialEq, Clone)`) - #154923 (Fix ICE in next-solver dyn-compatibility check) - #154934 (Add getters for `rustc_pattern_analysis::constructor::Slice` fields) - #154938 (match exhaustiveness: Show the guard exhaustivity note only when it's the guards alone that cause non-exhaustiveness) - #154961 (Use derived impl for `GappedRange` subdiagnostic) - #154980 (rustc-dev-guide subtree update)
rust-timer
added a commit
that referenced
this pull request
Apr 8, 2026
Rollup merge of #154745 - chenyukang:yukang-fix-span-api, r=nnethercote Replace span_look_ahead with span_followed_by While reviewing that PR #154703 (comment), I found that magic number 100, let's remove it, and seems `span_followed_by` is a better name.
github-actions Bot
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
Apr 13, 2026
…uwer Rollup of 15 pull requests Successful merges: - rust-lang/rust#153995 (Use convergent attribute to funcs for GPU targets) - rust-lang/rust#154184 (stabilize s390x vector registers) - rust-lang/rust#151898 (constify DoubleEndedIterator) - rust-lang/rust#154235 (remove unnecessary variables and delimiter check) - rust-lang/rust#154473 (move borrow checker tests) - rust-lang/rust#154745 (Replace span_look_ahead with span_followed_by) - rust-lang/rust#154778 (make field representing types invariant over the base type) - rust-lang/rust#154867 (Fix private fields diagnostics and improve error messages) - rust-lang/rust#154879 (Don't store `pattern_ty` in `TestableCase`) - rust-lang/rust#154910 (Suppress `unreachable_code` lint in `derive(PartialEq, Clone)`) - rust-lang/rust#154923 (Fix ICE in next-solver dyn-compatibility check) - rust-lang/rust#154934 (Add getters for `rustc_pattern_analysis::constructor::Slice` fields) - rust-lang/rust#154938 (match exhaustiveness: Show the guard exhaustivity note only when it's the guards alone that cause non-exhaustiveness) - rust-lang/rust#154961 (Use derived impl for `GappedRange` subdiagnostic) - rust-lang/rust#154980 (rustc-dev-guide subtree update)
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
5 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.
While reviewing that PR #154703 (comment), I found that magic number 100, let's remove it, and seems
span_followed_byis a better name.