Skip to content

internal: Make block_def_map infallible #14574

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
Merged

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Apr 14, 2023

No description provided.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 14, 2023
@Veykril
Copy link
Member Author

Veykril commented Apr 14, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Apr 14, 2023

📌 Commit 49a3a14 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Apr 14, 2023

⌛ Testing commit 49a3a14 with merge 2f39dc4...

bors added a commit that referenced this pull request Apr 14, 2023
internal: Make block_def_map infallible
@Veykril
Copy link
Member Author

Veykril commented Apr 14, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Apr 14, 2023

📌 Commit c32d519 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Apr 14, 2023

⌛ Testing commit c32d519 with merge 9640742...

@bors
Copy link
Contributor

bors commented Apr 14, 2023

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing 9640742 to master...

@bors bors merged commit 9640742 into rust-lang:master Apr 14, 2023
@@ -290,7 +290,7 @@ impl InherentImpls {
let _p = profile::span("inherent_impls_in_block_query");
let mut impls = Self { map: FxHashMap::default(), invalid_impls: Vec::default() };

let block_def_map = db.block_def_map(block)?;
let block_def_map = db.block_def_map(block);
Copy link
Member

Choose a reason for hiding this comment

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

Should this and trait_impls_in_block_query be infallible now?

Copy link
Member Author

Choose a reason for hiding this comment

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

ye they should, didn't notice that

@Veykril Veykril deleted the blocks branch April 14, 2023 12:56
bors added a commit that referenced this pull request Apr 14, 2023
minor: Make inherent_impls_in_block and trait_impls_in_block infallible

Fixes #14574 (comment)
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