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

UI test cleanup: Extract lint from methods.rs test #3610

Merged
merged 4 commits into from
Jan 5, 2019

Conversation

phansch
Copy link
Member

@phansch phansch commented Jan 2, 2019

Extracts the result_map_unwrap_or_else lint into a separate test file.

This also extracts the IteratorFalsePositives struct and impl into
auxiliary/option_helpers.rs.

cc #2038

@phansch phansch added the S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) label Jan 2, 2019
tests/ui/iter_skip_next.rs Outdated Show resolved Hide resolved
@phansch phansch added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties and removed S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) labels Jan 3, 2019
@@ -22,6 +24,9 @@
clippy::useless_format
)]

#[macro_use]
extern crate option_helpers;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this extern crate necessary? Aren't we using the 2018 edition in the tests? Or do we need this because of the aux-build of compiletest-rs?

use option_helpers::opt_map;

should be possible.

Copy link
Member Author

@phansch phansch Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently it's necessary yes. I think it's an issue with compiletest: Manishearth/compiletest-rs#150

@flip1995
Copy link
Member

flip1995 commented Jan 4, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 4, 2019

📌 Commit a5d3f37 has been approved by flip1995

@bors
Copy link
Collaborator

bors commented Jan 4, 2019

⌛ Testing commit a5d3f37 with merge fe3f3af...

bors added a commit that referenced this pull request Jan 4, 2019
UI test cleanup: Extract lint from methods.rs test

Extracts the `result_map_unwrap_or_else` lint into a separate test file.

This also extracts the `IteratorFalsePositives` struct and impl into
`auxiliary/option_helpers.rs`.

cc #2038
@bors
Copy link
Collaborator

bors commented Jan 4, 2019

💔 Test failed - status-travis

@flip1995 flip1995 added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Jan 4, 2019
@matthiaskrgr
Copy link
Member

This should re-r+'ed after #3633 is merged

@phansch
Copy link
Member Author

phansch commented Jan 5, 2019

@bors r=flip1995

@bors
Copy link
Collaborator

bors commented Jan 5, 2019

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Jan 5, 2019

📌 Commit a5d3f37 has been approved by flip1995

@phansch
Copy link
Member Author

phansch commented Jan 5, 2019

@bors retry

@bors
Copy link
Collaborator

bors commented Jan 5, 2019

⌛ Testing commit a5d3f37 with merge 3846b8b...

bors added a commit that referenced this pull request Jan 5, 2019
UI test cleanup: Extract lint from methods.rs test

Extracts the `result_map_unwrap_or_else` lint into a separate test file.

This also extracts the `IteratorFalsePositives` struct and impl into
`auxiliary/option_helpers.rs`.

cc #2038
@bors
Copy link
Collaborator

bors commented Jan 5, 2019

💔 Test failed - status-appveyor

@matthiaskrgr
Copy link
Member

@bors retry

@bors
Copy link
Collaborator

bors commented Jan 5, 2019

⌛ Testing commit a5d3f37 with merge 3bcf67c...

bors added a commit that referenced this pull request Jan 5, 2019
UI test cleanup: Extract lint from methods.rs test

Extracts the `result_map_unwrap_or_else` lint into a separate test file.

This also extracts the `IteratorFalsePositives` struct and impl into
`auxiliary/option_helpers.rs`.

cc #2038
@bors
Copy link
Collaborator

bors commented Jan 5, 2019

☀️ Test successful - status-appveyor, status-travis
Approved by: flip1995
Pushing 3bcf67c to master...

@bors bors merged commit a5d3f37 into rust-lang:master Jan 5, 2019
@phansch phansch deleted the method_rs_cleanup branch January 5, 2019 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants