Skip to content

internal: Make inherent_impls_in_block and trait_impls_in_block infallible #14578

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

Merged
merged 1 commit into from
Apr 14, 2023

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Apr 14, 2023

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 14, 2023
@@ -152,7 +152,8 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> {
impl_maps.into_iter().chain(block_impls).for_each(&mut f);
def_blocks
.into_iter()
.filter_map(|it| self.db.trait_impls_in_block(it?))
.filter_map(|it| it)
Copy link
Member Author

Choose a reason for hiding this comment

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

I can never remember if the preferred idiom is .filter_map(|it| it) or .flat_map(|it| it) or something else.

Copy link
Member

Choose a reason for hiding this comment

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

.flatten() should work here as well I think?

Copy link
Member Author

Choose a reason for hiding this comment

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

Changed to .flatten().

@lnicola lnicola force-pushed the simplify-method-res branch from 95e2222 to febd506 Compare April 14, 2023 13:04
@lnicola
Copy link
Member Author

lnicola commented Apr 14, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Apr 14, 2023

📌 Commit febd506 has been approved by lnicola

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Apr 14, 2023

⌛ Testing commit febd506 with merge 57c4ee2...

@bors
Copy link
Contributor

bors commented Apr 14, 2023

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 57c4ee2 to master...

@bors bors merged commit 57c4ee2 into rust-lang:master Apr 14, 2023
@lnicola lnicola deleted the simplify-method-res branch April 14, 2023 13:33
@lnicola lnicola changed the title minor: Make inherent_impls_in_block and trait_impls_in_block infallible internal: Make inherent_impls_in_block and trait_impls_in_block infallible Apr 17, 2023
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.

4 participants