bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Store impl_trait_fn inside OpaqueTyOrigin.

Browse source
This commit is contained in:
Camille GILLOT 2021-11-30 19:11:35 +01:00
parent 72b6f7049c
commit 8576ab45e4
13 changed files with 119 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/util.rs
View file

@ -107,7 +107,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
kind:
hir::ItemKind::OpaqueTy(hir::OpaqueTy {
bounds,
origin: hir::OpaqueTyOrigin::AsyncFn,
origin: hir::OpaqueTyOrigin::AsyncFn(..),
..
}),
..

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

@ -276,7 +276,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
debug!(?concrete_ty);
let first_own_region = match opaque_defn.origin {
hir::OpaqueTyOrigin::FnReturn | hir::OpaqueTyOrigin::AsyncFn => {
hir::OpaqueTyOrigin::FnReturn(..) | hir::OpaqueTyOrigin::AsyncFn(..) => {
// We lower
//
// fn foo<'l0..'ln>() -> impl Trait<'l0..'lm>
@ -463,20 +463,24 @@ impl<'a, 'tcx> Instantiator<'a, 'tcx> {
let parent_def_id = self.infcx.defining_use_anchor;
let (in_definition_scope, origin) = match tcx.hir().expect_item(def_id).kind
{
// Async `impl Trait`
hir::ItemKind::OpaqueTy(hir::OpaqueTy {
origin: hir::OpaqueTyOrigin::AsyncFn(parent),
..
}) => (parent == parent_def_id, hir::OpaqueTyOrigin::AsyncFn(parent)),
// Anonymous `impl Trait`
hir::ItemKind::OpaqueTy(hir::OpaqueTy {
impl_trait_fn: Some(parent),
origin,
origin: hir::OpaqueTyOrigin::FnReturn(parent),
..
}) => (parent == parent_def_id.to_def_id(), origin),
}) => (parent == parent_def_id, hir::OpaqueTyOrigin::FnReturn(parent)),
// Named `type Foo = impl Bar;`
hir::ItemKind::OpaqueTy(hir::OpaqueTy {
impl_trait_fn: None,
origin,
origin: hir::OpaqueTyOrigin::TyAlias,
..
}) => {
(may_define_opaque_type(tcx, parent_def_id, opaque_hir_id), origin)
}
}) => (
may_define_opaque_type(tcx, parent_def_id, opaque_hir_id),
hir::OpaqueTyOrigin::TyAlias,
),
ref itemkind => {
span_bug!(
self.value_span,