From 04fa5d3adbb8212f5b4e87e3bbd7b74bb7c9ec65 Mon Sep 17 00:00:00 2001 From: varkor Date: Wed, 22 Aug 2018 01:35:29 +0100 Subject: Remove Ty prefix from Ty{Foreign|Param} --- src/librustc_codegen_llvm/debuginfo/metadata.rs | 2 +- src/librustc_codegen_llvm/debuginfo/type_names.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/librustc_codegen_llvm/debuginfo') diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs index 45bb951d9c1..670b7e1fdab 100644 --- a/src/librustc_codegen_llvm/debuginfo/metadata.rs +++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs @@ -585,7 +585,7 @@ pub fn type_metadata( trait_pointer_metadata(cx, t, None, unique_type_id), false) } - ty::TyForeign(..) => { + ty::Foreign(..) => { MetadataCreationResult::new( foreign_type_metadata(cx, t, unique_type_id), false) diff --git a/src/librustc_codegen_llvm/debuginfo/type_names.rs b/src/librustc_codegen_llvm/debuginfo/type_names.rs index e0ad72681ae..0b138d48119 100644 --- a/src/librustc_codegen_llvm/debuginfo/type_names.rs +++ b/src/librustc_codegen_llvm/debuginfo/type_names.rs @@ -48,7 +48,7 @@ pub fn push_debuginfo_type_name<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, ty::TyInt(int_ty) => output.push_str(int_ty.ty_to_string()), ty::TyUint(uint_ty) => output.push_str(uint_ty.ty_to_string()), ty::TyFloat(float_ty) => output.push_str(float_ty.ty_to_string()), - ty::TyForeign(def_id) => push_item_name(cx, def_id, qualified, output), + ty::Foreign(def_id) => push_item_name(cx, def_id, qualified, output), ty::Adt(def, substs) => { push_item_name(cx, def.did, qualified, output); push_type_params(cx, substs, output); @@ -176,7 +176,7 @@ pub fn push_debuginfo_type_name<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, ty::Projection(..) | ty::Anon(..) | ty::GeneratorWitness(..) | - ty::TyParam(_) => { + ty::Param(_) => { bug!("debuginfo: Trying to create type name for \ unexpected type: {:?}", t); } -- cgit 1.4.1-3-g733a5