Nothing Special   »   [go: up one dir, main page]

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up tests/ui by removing does-nothing.rs #123568

Merged
merged 1 commit into from
Apr 10, 2024

Conversation

Oneirical
Copy link
Contributor
@Oneirical Oneirical commented Apr 6, 2024

In a previous PR, it was suggested that this test be removed:

it's testing a basic diagnostic for an unknown variable (added over a decade ago for #154) that is already covered by probably dozens or hundreds of other tests.

It was then suggested that opening a new PR for this would be more organized.

I'm setting this as a draft, as:

  1. The tests/ui directory is rather disorganized, a large quantity of tests are not even contained inside their own directories. This PR could turn into "clean up the UI tests directory", if I were to place everything into categories (for example, everything related to CLI flags could get placed in a cli directory).
  2. This will have a merge conflict with Rewrite version test run-make as an UI test #123563 should that get merged. I trust that this time, I won't run into The Incident while rebasing. Edit: Yay, I did it properly!

@rustbot
Copy link
Collaborator
rustbot commented Apr 6, 2024

r? @wesleywiser

rustbot has assigned @wesleywiser.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 6, 2024
@Oneirical
Copy link
Contributor Author

r? @jieyouxu

@rustbot rustbot assigned jieyouxu and unassigned wesleywiser Apr 6, 2024
@bors
Copy link
Contributor
bors commented Apr 7, 2024

☔ The latest upstream changes (presumably #123576) made this pull request unmergeable. Please resolve the merge conflicts.

fix: restore issues_entry_limit
@Oneirical Oneirical marked this pull request as ready for review April 10, 2024 00:27
@wesleywiser
Copy link
Member

Seems fine!

@bors r+ rollup

@bors
Copy link
Contributor
bors commented Apr 10, 2024

📌 Commit cbf1501 has been approved by wesleywiser

It is now in the queue for this repository.

@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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 10, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#121884 (Port exit-code run-make test to use rust)
 - rust-lang#122200 (Unconditionally show update nightly hint on ICE)
 - rust-lang#123568 (Clean up tests/ui by removing `does-nothing.rs`)
 - rust-lang#123609 (Don't use bytepos offsets when computing semicolon span for removal)
 - rust-lang#123612 (Set target-abi module flag for RISC-V targets)
 - rust-lang#123633 (Store all args in the unsupported Command implementation)
 - rust-lang#123668 (async closure coroutine by move body MirPass refactoring)

Failed merges:

 - rust-lang#123701 (Only assert for child/parent projection compatibility AFTER checking that theyre coming from the same place)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c14b468 into rust-lang:master Apr 10, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 10, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2024
Rollup merge of rust-lang#123568 - Oneirical:delete-tests, r=wesleywiser

Clean up tests/ui by removing `does-nothing.rs`

In [a previous PR](rust-lang#123297 (comment)), it was suggested that this test be removed:

> it's testing a basic diagnostic for an unknown variable (added over a decade ago for rust-lang#154) that is already covered by probably dozens or hundreds of other tests.

It was then suggested that [opening a new PR](rust-lang#123563 (comment)) for this would be more organized.

I'm setting this as a draft, as:

1. The tests/ui directory is rather disorganized, a large quantity of tests are not even contained inside their own directories. This PR could turn into "clean up the UI tests directory", if I were to place everything into categories (for example, everything related to CLI flags could get placed in a cli directory).
2. This will have a merge conflict with rust-lang#123563 should that get merged. I trust that _this time_, I won't run into [The Incident](rust-lang#123297 (comment)) while rebasing. Edit: Yay, I did it properly!
@Oneirical Oneirical deleted the delete-tests branch May 11, 2024 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants