Fix overlapping spans in removing extra arguments #108239
Merged
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
|
r? @jackh726 (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
lukas-code
reviewed
Feb 19, 2023
clubby789
force-pushed
the
overlapping-spans
branch
from
2088382
to
45a313a
Compare
This was referenced Feb 19, 2023
|
I've added a new commit which merges contiguous |
This comment has been minimized.
This comment has been minimized.
Hm, I'm not sure if I have a strong opinion about it, though I think that change somewhat obscures the declared purpose of the PR in the title. |
|
Given #108244 seems to fix this without regressing other stuff I'll just revert back to the first commit |
clubby789
force-pushed
the
overlapping-spans
branch
2 times, most recently
from
45a313a
to
3779c59
Compare
This comment has been minimized.
This comment has been minimized.
clubby789
force-pushed
the
overlapping-spans
branch
from
3779c59
to
93594bf
Compare
This comment has been minimized.
This comment has been minimized.
clubby789
force-pushed
the
overlapping-spans
branch
from
93594bf
to
0b9a3e2
Compare
|
This code is kinda a mess (not your fault, pre-existing), but whatever. It could probably use some refactoring, but I won't let that block this PR landing. @bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Feb 22, 2023
…piler-errors Fix overlapping spans in removing extra arguments Fixes rust-lang#108225 Each span is already extended to include the previous comma, so extending to the *next* comma is unecessary and causes an ICE with assertions on. `@rustbot` label +A-diagnostics
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 22, 2023
…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#108110 (Move some `InferCtxt` methods to `EvalCtxt` in new solver) - rust-lang#108168 (Fix ICE on type alias in recursion) - rust-lang#108230 (Convert a hard-warning about named static lifetimes into lint "unused_lifetimes") - rust-lang#108239 (Fix overlapping spans in removing extra arguments) - rust-lang#108246 (Add an InstCombine for redundant casts) - rust-lang#108264 (no-fail-fast support for tool testsuites) - rust-lang#108310 (rustdoc: Fix duplicated attributes for first reexport) - rust-lang#108318 (Remove unused FileDesc::get_cloexec) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 1, 2023
…, r=compiler-errors Use span of semicolon for eager recovery in expression Instead of the span of the token after the semicolon. This will hopefully cause fewer errors from overlapping spans. fixes rust-lang#108242 based on rust-lang#108239
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 1, 2023
…, r=compiler-errors Use span of semicolon for eager recovery in expression Instead of the span of the token after the semicolon. This will hopefully cause fewer errors from overlapping spans. fixes rust-lang#108242 based on rust-lang#108239
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 #108225
Each span is already extended to include the previous comma, so extending to the next comma is unecessary and causes an ICE with assertions on.
@rustbot label +A-diagnostics