diff options
| -rw-r--r-- | src/librustc/hir/lowering.rs | 4 | ||||
| -rw-r--r-- | src/librustc/hir/mod.rs | 4 | ||||
| -rw-r--r-- | src/librustc/infer/opaque_types/mod.rs | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index f16a637aab3..20ec7b1f386 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -1763,7 +1763,7 @@ impl<'a> LoweringContext<'a> { }, bounds: hir_bounds, impl_trait_fn: fn_def_id, - origin: hir::OpaqueTyOrigin::ReturnImplTrait, + origin: hir::OpaqueTyOrigin::FnReturn, }; trace!("exist ty from impl trait def-index: {:#?}", opaque_ty_def_index); @@ -3451,7 +3451,7 @@ impl<'a> LoweringContext<'a> { bounds: self.lower_param_bounds(b, ImplTraitContext::OpaqueTy(None)), impl_trait_fn: None, - origin: hir::OpaqueTyOrigin::TraitAliasImplTrait, + origin: hir::OpaqueTyOrigin::TypeAlias, }, ), ItemKind::Enum(ref enum_definition, ref generics) => { diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index 54392a420a4..d954484533a 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -1933,9 +1933,9 @@ pub struct OpaqueTy { #[derive(Copy, Clone, RustcEncodable, RustcDecodable, Debug, HashStable)] pub enum OpaqueTyOrigin { /// `type Foo = impl Trait;` - TraitAliasImplTrait, + TypeAlias, /// `-> impl Trait` - ReturnImplTrait, + FnReturn, /// `async fn` AsyncFn, } diff --git a/src/librustc/infer/opaque_types/mod.rs b/src/librustc/infer/opaque_types/mod.rs index e797a37fe75..5c62f76e3bb 100644 --- a/src/librustc/infer/opaque_types/mod.rs +++ b/src/librustc/infer/opaque_types/mod.rs @@ -495,8 +495,8 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { hir::OpaqueTyOrigin::AsyncFn => return false, // Otherwise, generate the label we'll use in the error message. - hir::OpaqueTyOrigin::TraitAliasImplTrait => "impl Trait", - hir::OpaqueTyOrigin::ReturnImplTrait => "impl Trait", + hir::OpaqueTyOrigin::TypeAlias => "impl Trait", + hir::OpaqueTyOrigin::FnReturn => "impl Trait", }; let msg = format!("ambiguous lifetime bound in `{}`", context_name); let mut err = self.tcx.sess.struct_span_err(span, &msg); @@ -1052,7 +1052,7 @@ impl<'a, 'tcx> Instantiator<'a, 'tcx> { origin, ), _ => { - (def_scope_default(), hir::OpaqueTyOrigin::TraitAliasImplTrait) + (def_scope_default(), hir::OpaqueTyOrigin::TypeAlias) } }, Some(Node::ImplItem(item)) => match item.node { @@ -1062,10 +1062,10 @@ impl<'a, 'tcx> Instantiator<'a, 'tcx> { self.parent_def_id, opaque_hir_id, ), - hir::OpaqueTyOrigin::TraitAliasImplTrait, + hir::OpaqueTyOrigin::TypeAlias, ), _ => { - (def_scope_default(), hir::OpaqueTyOrigin::TraitAliasImplTrait) + (def_scope_default(), hir::OpaqueTyOrigin::TypeAlias) } }, _ => bug!( |