bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move opaque_type_origin_unchecked onto TyCtxt and re-use it where it was open coded

Browse source
This commit is contained in:
Oli Scherer 2023-06-15 07:40:17 +00:00
parent fa06a371b7
commit c8979e587b
6 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_infer/src/infer/opaque_types.rs
View file

@ -378,7 +378,7 @@ impl<'tcx> InferCtxt<'tcx> {
DefiningAnchor::Bind(bind) => bind,
};
let origin = self.opaque_type_origin_unchecked(def_id);
let origin = self.tcx.opaque_type_origin(def_id);
let in_definition_scope = match origin {
// Async `impl Trait`
hir::OpaqueTyOrigin::AsyncFn(parent) => parent == parent_def_id,
@ -395,13 +395,6 @@ impl<'tcx> InferCtxt<'tcx> {
};
in_definition_scope.then_some(origin)
}
/// Returns the origin of the opaque type `def_id` even if we are not in its
/// defining scope.
#[instrument(skip(self), level = "trace", ret)]
fn opaque_type_origin_unchecked(&self, def_id: LocalDefId) -> OpaqueTyOrigin {
self.tcx.hir().expect_item(def_id).expect_opaque_ty().origin
}
}
/// Visitor that requires that (almost) all regions in the type visited outlive