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

Fix path_to_res for enum inherent items #6567

Merged
merged 1 commit into from
Jan 20, 2021

Conversation

camsteffen
Copy link
Contributor

changelog: none

I tried to add Option::is_some to the paths but got a false positive from the invalid paths lint. Turns out the path_to_res function does not find inherent impls for enums. I fixed this and took the liberty to do some additional cleanup in the method.

@rust-highfive
Copy link

r? @ebroto

(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 Jan 8, 2021
@ebroto
Copy link
Member

ebroto commented Jan 16, 2021

r? @Manishearth (I'm leaving the team, so I'm reassigning my PRs to other active members)

@rust-highfive rust-highfive assigned Manishearth and unassigned ebroto Jan 16, 2021
@camsteffen
Copy link
Contributor Author

This is no longer immediately needed, but I think it's still a positive change that could be useful later.

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 20, 2021

📌 Commit 8490862 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jan 20, 2021

⌛ Testing commit 8490862 with merge d990c31...

@bors
Copy link
Contributor

bors commented Jan 20, 2021

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Manishearth
Pushing d990c31 to master...

@bors bors merged commit d990c31 into rust-lang:master Jan 20, 2021
bors added a commit that referenced this pull request Jan 22, 2021
`manual_filter_map` and `manual_find_map`

changelog: Add `manual_filter_map` and replace `find_map` with `manual_find_map`

Replaces #6453

Fixes #3188
Fixes #4193

~Depends on #6567 (to fix an internal lint false positive)~

This replaces `filter_map` and `find_map` with `manual_filter_map` and `manual_find_map` respectively. However, `filter_map` is left in place since it is used for a variety of other cases. See discussion in #6453.
@camsteffen camsteffen deleted the path-to-res-enum branch July 8, 2021 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants