diff options
| author | bors <bors@rust-lang.org> | 2018-11-25 06:48:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-25 06:48:21 +0000 |
| commit | abe19a730576cf7ead1bf7995271b53d551ea37f (patch) | |
| tree | d26fe9c0e33d00119d9f52ee741f6eeded80931e /src/librustc_codegen_llvm | |
| parent | 37961dbd2d84a29be49007a5770b96e296f5f349 (diff) | |
| parent | b8a30f04cdd129ab89b85d0eda11f1c65058767a (diff) | |
| download | rust-abe19a730576cf7ead1bf7995271b53d551ea37f.tar.gz rust-abe19a730576cf7ead1bf7995271b53d551ea37f.zip | |
Auto merge of #55921 - scalexm:placeholders, r=nikomatsakis
Add placeholder types Fixes #48696 (handle universes in canonicalization of type inference vars), and fixes #55098.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/type_names.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_codegen_llvm/debuginfo/type_names.rs b/src/librustc_codegen_llvm/debuginfo/type_names.rs index c3a15ccca0a..60545f9e193 100644 --- a/src/librustc_codegen_llvm/debuginfo/type_names.rs +++ b/src/librustc_codegen_llvm/debuginfo/type_names.rs @@ -172,6 +172,7 @@ pub fn push_debuginfo_type_name<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, } ty::Error | ty::Infer(_) | + ty::Placeholder(..) | ty::UnnormalizedProjection(..) | ty::Projection(..) | ty::Bound(..) | |