Skip to content

Don't pass -Z unstable-options by default for UI tests#82639

Merged
bors merged 1 commit intorust-lang:masterfrom
jyn514:stable-options
Jun 10, 2021
Merged

Don't pass -Z unstable-options by default for UI tests#82639
bors merged 1 commit intorust-lang:masterfrom
jyn514:stable-options

Conversation

@jyn514
Copy link
Member

@jyn514 jyn514 commented Feb 28, 2021 •
edited
Loading

Unconditionally passing -Z unstable-options makes it impossible to test whether an option requires unstable-options or not.

This uncovered quite a lot of bugs, I'll open issues for each. These don't strictly need to be fixed before this is merged, it just makes the diff much larger because of the changes to diagnostics.

@jyn514 jyn514 added A-testsuite Area: The testsuite used to check the correctness of rustc T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 28, 2021
@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 28, 2021

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 28, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2021
@bors

This comment has been minimized.

Sign in to view
@crlf0710 crlf0710 added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 26, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jyn514
Don't pass -Z unstable-options by default for UI tests
1cdc81b 
- Pass it explicitly where appropriate
- Update stderr files and warnings; it turns that unstable-options has
  far-reaching effects on diagnostics.
@jyn514 jyn514 changed the title [WIP] Don't pass -Z unstable-options by default for UI tests Don't pass -Z unstable-options by default for UI tests Jun 6, 2021
@jyn514 jyn514 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 6, 2021
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jun 6, 2021

r=me with PR description updated (it notes this blocked a PR, but that PR is merged). Thanks for filing issues for the changes in outputs!

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 6, 2021
@jyn514
Copy link
Member Author

jyn514 commented Jun 6, 2021

@bors r=Mark-Simulacrum rollup=iffy

@bors
Copy link
Collaborator

bors commented Jun 6, 2021

📌 Commit 1cdc81b has been approved by Mark-Simulacrum

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 6, 2021
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 6, 2021
@bors
Copy link
Collaborator

bors commented Jun 7, 2021

⌛ Testing commit 1cdc81b with merge 33d9d6c539001c37692eaaadd4ee79f6203db092...

@camsteffen
Copy link
Contributor

camsteffen commented Jun 7, 2021 •
edited
Loading

@bors ping

@Aaron1011
Copy link
Contributor

Aaron1011 commented Jun 9, 2021

@bors retry

@Aaron1011
Copy link
Contributor

Aaron1011 commented Jun 9, 2021

@bors r=Mark-Simulacrum

@Aaron1011
Copy link
Contributor

Aaron1011 commented Jun 9, 2021

@bors ping

@camsteffen
Copy link
Contributor

camsteffen commented Jun 9, 2021 •
edited
Loading

@bors ping -Z unstable-options

...just kidding

@Aaron1011 Aaron1011 closed this Jun 10, 2021
@Aaron1011 Aaron1011 reopened this Jun 10, 2021
@ehuss
Copy link
Contributor

ehuss commented Jun 10, 2021

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 10, 2021
@ehuss
Copy link
Contributor

ehuss commented Jun 10, 2021

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jun 10, 2021

📌 Commit 1cdc81b has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 10, 2021
@bors
Copy link
Collaborator

bors commented Jun 10, 2021

⌛ Testing commit 1cdc81b with merge 40c1623...

@bors
Copy link
Collaborator

bors commented Jun 10, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 40c1623 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 10, 2021
@bors bors merged commit 40c1623 into rust-lang:master Jun 10, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 10, 2021
@bors bors mentioned this pull request Jun 10, 2021
Merged
@jyn514 jyn514 deleted the stable-options branch June 10, 2021 18:21
nnethercote added a commit to nnethercote/rust that referenced this pull request Jan 5, 2024
@nnethercote
Unbreak tests/ui/lint/use_suggestion_json.rs.
f5a09a9 
PR rust-lang#82639 changed UI tests so `-Z unstable-options` aren't passed to UI
tests by default. This completely broke `use_suggestion_json.rs`, which
uses the unstable `--error-format=pretty-json` option. The expected
output went from 400 lines of pretty JSON error messages to a single
JSON error saying "`--error-format=pretty-json` is unstable"!

This commit adds `-Z unstable-options` back and reinstates the old
expected output, with some minor changes to account for shifted spans
and slightly JSON output changes since then.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.54.0

Development

Successfully merging this pull request may close these issues.

10 participants

@jyn514 @rust-highfive @rust-log-analyzer @bors @Mark-Simulacrum @camsteffen @Aaron1011 @ehuss @crlf0710 @rustbot