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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Test Cleanup: Split up checked_unwrap tests #4276

Merged
merged 1 commit into from Jul 16, 2019

Conversation

@phansch
Copy link
Member

@phansch phansch commented Jul 15, 2019

Let's slowly bring that ticket closer to the finish line 馃悓 馃弫

This splits up tests/ui/checked_unwrap.rs into:

  • tests/ui/checked_unwrap/complex.rs
  • tests/ui/checked_unwrap/simple.rs

Based on the naming of the methods in the tests.

changelog: none

cc #2038

@phansch
Copy link
Member Author

@phansch phansch commented Jul 15, 2019

A small bike-shedding opportunity: I'm totally open to other naming schemes for these files:

  • simple and complex seem a bit arbitrary, but I can't think of anything better.
  • Maybe not associating any meaning at all makes it easier to decide where to put new tests for this lint? So maybe 1.rs, 2.rs, 3.rs, etc?

馃毑 馃彋锔

Loading

@flip1995
Copy link
Member

@flip1995 flip1995 commented Jul 16, 2019

Maybe single_conditional vs multiple_conditionals? I don't think allowing names like 1.rs, ... would be a good idea, because you would need to look through all those files to find where to put a potential new test case.

r=me with telling names (simple and complex is also good enough IMO)

Loading

This splits up `tests/ui/checked_unwrap.rs` into:

 * `tests/ui/checked_unwrap/complex.rs`
 * `tests/ui/checked_unwrap/simple.rs`

Based on the naming of the methods in the tests.

cc rust-lang#2038
@phansch
Copy link
Member Author

@phansch phansch commented Jul 16, 2019

@bors r=flip1995 I changed the filenames to include conditionals, that makes them a bit more clear. Thanks for the suggestion!

Loading

@bors
Copy link
Contributor

@bors bors commented Jul 16, 2019

馃搶 Commit 48bff49 has been approved by flip1995

Loading

@bors
Copy link
Contributor

@bors bors commented Jul 16, 2019

Testing commit 48bff49 with merge f53e55f...

Loading

bors added a commit that referenced this issue Jul 16, 2019
UI Test Cleanup: Split up checked_unwrap tests

Let's slowly bring that ticket closer to the finish line 馃悓 馃弫

This splits up `tests/ui/checked_unwrap.rs` into:

 * `tests/ui/checked_unwrap/complex.rs`
 * `tests/ui/checked_unwrap/simple.rs`

Based on the naming of the methods in the tests.

cc #2038
@bors
Copy link
Contributor

@bors bors commented Jul 16, 2019

馃挃 Test failed - checks-travis

Loading

@phansch
Copy link
Member Author

@phansch phansch commented Jul 16, 2019

@bors retry (forgot the changelog)

Loading

@bors
Copy link
Contributor

@bors bors commented Jul 16, 2019

Testing commit 48bff49 with merge 7498a5f...

Loading

bors added a commit that referenced this issue Jul 16, 2019
UI Test Cleanup: Split up checked_unwrap tests

Let's slowly bring that ticket closer to the finish line 馃悓 馃弫

This splits up `tests/ui/checked_unwrap.rs` into:

 * `tests/ui/checked_unwrap/complex.rs`
 * `tests/ui/checked_unwrap/simple.rs`

Based on the naming of the methods in the tests.

changelog: none

cc #2038
@bors
Copy link
Contributor

@bors bors commented Jul 16, 2019

鈽锔 Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing 7498a5f to master...

Loading

@bors bors merged commit 48bff49 into rust-lang:master Jul 16, 2019
2 checks passed
Loading
@phansch phansch deleted the uitestcleanup branch Jul 17, 2019
@flip1995
Copy link
Member

@flip1995 flip1995 commented Jul 17, 2019

(forgot the changelog)

Yay, so that works 馃帀

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants