Remove all migrate.nll.stderr files #91087
Merged
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
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @estebank |
rukai
force-pushed
the
fix_test_nll_revisions
branch
from
393c8df to
249c042
Compare
This comment has been minimized.
This comment has been minimized.
rukai
force-pushed
the
fix_test_nll_revisions
branch
from
249c042 to
36a0a02
Compare
|
☔ The latest upstream changes (presumably #89580) made this pull request unmergeable. Please resolve the merge conflicts. |
rukai
force-pushed
the
fix_test_nll_revisions
branch
from
36a0a02 to
6acf860
Compare
apiraino
added
the
T-compiler
|
This looks good to me, but I need to go through this more thoroughly before I r+ r? @jackh726 |
rukai
force-pushed
the
fix_test_nll_revisions
branch
from
6acf860 to
abd704b
Compare
|
@bors r+ |
|
📌 Commit abd704b has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 30, 2021
…kh726 Remove all migrate.nll.stderr files There are a few ui tests that setup the revisions like: ```rust // revisions: migrate nll` // [nll]compile-flags: -Zborrowck=mir ``` However most of them fail to disable the nll compare mode like this: ```rust // ignore-compare-mode-nll ``` This ends up generating confusing files ending in `.migrate.nll.stderr` because the nll compare mode is run on top of the migrate revision. This PR fixes this by adding `ignore-compare-mode-nll` to these tests. I would have just made these tests use compare modes instead but I assume the reason these tests are messing around with revisions instead of just letting the nll compare mode do its thing is to enforce error annotations for both migrate and nll. Relying on just compare modes would only have the error annotations for migrate.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 1, 2021
…kh726 Remove all migrate.nll.stderr files There are a few ui tests that setup the revisions like: ```rust // revisions: migrate nll` // [nll]compile-flags: -Zborrowck=mir ``` However most of them fail to disable the nll compare mode like this: ```rust // ignore-compare-mode-nll ``` This ends up generating confusing files ending in `.migrate.nll.stderr` because the nll compare mode is run on top of the migrate revision. This PR fixes this by adding `ignore-compare-mode-nll` to these tests. I would have just made these tests use compare modes instead but I assume the reason these tests are messing around with revisions instead of just letting the nll compare mode do its thing is to enforce error annotations for both migrate and nll. Relying on just compare modes would only have the error annotations for migrate.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 1, 2021
…kh726 Remove all migrate.nll.stderr files There are a few ui tests that setup the revisions like: ```rust // revisions: migrate nll` // [nll]compile-flags: -Zborrowck=mir ``` However most of them fail to disable the nll compare mode like this: ```rust // ignore-compare-mode-nll ``` This ends up generating confusing files ending in `.migrate.nll.stderr` because the nll compare mode is run on top of the migrate revision. This PR fixes this by adding `ignore-compare-mode-nll` to these tests. I would have just made these tests use compare modes instead but I assume the reason these tests are messing around with revisions instead of just letting the nll compare mode do its thing is to enforce error annotations for both migrate and nll. Relying on just compare modes would only have the error annotations for migrate.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 1, 2021
…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#87160 (When recovering from a `:` in a pattern, use adequate AST pattern) - rust-lang#90985 (Use `get_diagnostic_name` more) - rust-lang#91087 (Remove all migrate.nll.stderr files) - rust-lang#91207 (Add support for LLVM coverage mapping format versions 5 and 6) - rust-lang#91298 (Improve error message for `E0659` if the source is not available) - rust-lang#91346 (Add `Option::inspect` and `Result::{inspect, inspect_err}`) - rust-lang#91404 (Fix bad `NodeId` limit checking.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 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.
There are a few ui tests that setup the revisions like:
However most of them fail to disable the nll compare mode like this:
// ignore-compare-mode-nllThis ends up generating confusing files ending in
.migrate.nll.stderrbecause the nll compare mode is run on top of the migrate revision.This PR fixes this by adding
ignore-compare-mode-nllto these tests.I would have just made these tests use compare modes instead but I assume the reason these tests are messing around with revisions instead of just letting the nll compare mode do its thing is to enforce error annotations for both migrate and nll.
Relying on just compare modes would only have the error annotations for migrate.