Fix assertion failure for some Expect diagnostics.
#126719
Merged
+33
−10
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
In rust-lang#120699 I moved some code dealing with `has_future_breakage` earlier in `emit_diagnostic`. Issue rust-lang#126521 identified a case where that reordering was invalid (leading to an assertion failure) for some `Expect` diagnostics. This commit partially undoes the change, by moving the handling of unstable `Expect` diagnostics earlier again. This makes `emit_diagnostic` a bit uglier, but is necessary to fix the problem. Fixes rust-lang#126521.
rustbot
added
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 20, 2024
Fix assertion failure for some `Expect` diagnostics. In rust-lang#120699 I moved some code dealing with `has_future_breakage` earlier in `emit_diagnostic`. Issue rust-lang#126521 identified a case where that reordering was invalid (leading to an assertion failure) for some `Expect` diagnostics. This commit partially undoes the change, by moving the handling of unstable `Expect` diagnostics earlier again. This makes `emit_diagnostic` a bit uglier, but is necessary to fix the problem. Fixes rust-lang#126521. r? `@oli-obk`
This was referenced Jun 20, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 20, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#126380 (Add std Xtensa targets support) - rust-lang#126636 (Resolve Clippy `f16` and `f128` `unimplemented!`/`FIXME`s ) - rust-lang#126659 (More status-quo tests for the `#[coverage(..)]` attribute) - rust-lang#126711 (Make Option::as_[mut_]slice const) - rust-lang#126717 (Clean up some comments near `use` declarations) - rust-lang#126719 (Fix assertion failure for some `Expect` diagnostics.) - rust-lang#126730 (Add opaque type corner case test) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 20, 2024
Rollup merge of rust-lang#126719 - nnethercote:fix-126521, r=oli-obk Fix assertion failure for some `Expect` diagnostics. In rust-lang#120699 I moved some code dealing with `has_future_breakage` earlier in `emit_diagnostic`. Issue rust-lang#126521 identified a case where that reordering was invalid (leading to an assertion failure) for some `Expect` diagnostics. This commit partially undoes the change, by moving the handling of unstable `Expect` diagnostics earlier again. This makes `emit_diagnostic` a bit uglier, but is necessary to fix the problem. Fixes rust-lang#126521. r? ``@oli-obk``
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Jun 21, 2024
Very similar to rust-lang#126719. So much so that I added a new case to the test from that PR rather than creating a new one.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 21, 2024
Fix another assertion failure for some Expect diagnostics. Very similar to rust-lang#126719. So much so that I added a new case to the test from that PR rather than creating a new one. r? `@oli-obk`
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 21, 2024
Rollup merge of rust-lang#126774 - nnethercote:fix-126751, r=oli-obk Fix another assertion failure for some Expect diagnostics. Very similar to rust-lang#126719. So much so that I added a new case to the test from that PR rather than creating a new one. r? `@oli-obk`
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.
In #120699 I moved some code dealing with
has_future_breakageearlier inemit_diagnostic. Issue #126521 identified a case where that reordering was invalid (leading to an assertion failure) for someExpectdiagnostics.This commit partially undoes the change, by moving the handling of unstable
Expectdiagnostics earlier again. This makesemit_diagnostica bit uglier, but is necessary to fix the problem.Fixes #126521.
r? @oli-obk