diff options
| author | bors <bors@rust-lang.org> | 2019-09-26 12:34:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-26 12:34:54 +0000 |
| commit | ddf43867a9cbb3766b48552632a602498fae2699 (patch) | |
| tree | 8bc475f0aea8c2d41b84fe038a3fc0b5ce2d0f70 /src/librustc_codegen_llvm/debuginfo/mod.rs | |
| parent | 134004f74db3b4626bde37cc068d9ae6dedd2d38 (diff) | |
| parent | e3fb05dc3c32160e89ad354297b168fae11ffba1 (diff) | |
| download | rust-ddf43867a9cbb3766b48552632a602498fae2699.tar.gz rust-ddf43867a9cbb3766b48552632a602498fae2699.zip | |
Auto merge of #64515 - varkor:kindedterm, r=oli-obk
Rename `subst::Kind` to `subst::GenericArg` And `subst::UnpackedKind` to `subst::GenericArgKind`. Individual variable names (e.g. `kind`) are not renamed, which would be an infeasible mission. Fixes https://github.com/rust-lang/rust/issues/64352. r? @eddyb
Diffstat (limited to 'src/librustc_codegen_llvm/debuginfo/mod.rs')
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/debuginfo/mod.rs b/src/librustc_codegen_llvm/debuginfo/mod.rs index 08a37ce9bbf..4efa1993d43 100644 --- a/src/librustc_codegen_llvm/debuginfo/mod.rs +++ b/src/librustc_codegen_llvm/debuginfo/mod.rs @@ -15,7 +15,7 @@ use crate::llvm::debuginfo::{DIFile, DIType, DIScope, DIBuilder, DISubprogram, D DISPFlags, DILexicalBlock}; use rustc::hir::CodegenFnAttrFlags; use rustc::hir::def_id::{DefId, CrateNum, LOCAL_CRATE}; -use rustc::ty::subst::{SubstsRef, UnpackedKind}; +use rustc::ty::subst::{SubstsRef, GenericArgKind}; use crate::abi::Abi; use crate::common::CodegenCx; @@ -460,7 +460,7 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> { let template_params: Vec<_> = if cx.sess().opts.debuginfo == DebugInfo::Full { let names = get_parameter_names(cx, generics); substs.iter().zip(names).filter_map(|(kind, name)| { - if let UnpackedKind::Type(ty) = kind.unpack() { + if let GenericArgKind::Type(ty) = kind.unpack() { let actual_type = cx.tcx.normalize_erasing_regions(ParamEnv::reveal_all(), ty); let actual_type_metadata = |