Skip to content

Avoid accessing the HIR in the happy path of coherent_trait #120835

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.

Sign up for GitHub

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
bors merged 5 commits into from
Feb 12, 2024
Merged

Avoid accessing the HIR in the happy path of coherent_trait #120835

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4661c83
Avoid accessing the HIR in the happy path of `coherent_trait`
oli-obk Feb 9, 2024
23277a5
Simplify conditional erroring
oli-obk Feb 9, 2024
7f871ab
No need for FnMut when FnOnce works now
oli-obk Feb 9, 2024
97b4b7f
use `impl Trait` argument instead of generic param for simplicity
oli-obk Feb 9, 2024
614ff0f
Don't reinvoke `impl_trait_ref` query after it was already invoked
oli-obk Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use impl Trait argument instead of generic param for simplicity
  • Loading branch information
@oli-obk
oli-obk committed Feb 9, 2024
commit 97b4b7f72b72965f4cde19761064821e2b0dc435
9 changes: 5 additions & 4 deletions compiler/rustc_hir_analysis/src/coherence/builtin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ struct Checker<'tcx> {
}

impl<'tcx> Checker<'tcx> {
fn check<F>(&self, trait_def_id: Option<DefId>, f: F) -> Result<(), ErrorGuaranteed>
where
F: FnOnce(TyCtxt<'tcx>, LocalDefId) -> Result<(), ErrorGuaranteed>,
{
fn check(
&self,
trait_def_id: Option<DefId>,
f: impl FnOnce(TyCtxt<'tcx>, LocalDefId) -> Result<(), ErrorGuaranteed>,
) -> Result<(), ErrorGuaranteed> {
if Some(self.trait_def_id) == trait_def_id { f(self.tcx, self.impl_def_id) } else { Ok(()) }
}
}
Expand Down