diff options
| author | bors <bors@rust-lang.org> | 2019-10-04 07:27:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-04 07:27:59 +0000 |
| commit | 9e35a2811d8c65e9473176b8656a3201b7e152c7 (patch) | |
| tree | 2d3c6267ad0c267bd7401d6b2b850eeb73888ab9 /src/librustc_codegen_llvm/debuginfo | |
| parent | 31d75c4e9c5318e880601d3c2cc71e5df094a120 (diff) | |
| parent | aacc89a1dde9aa7f3dc76c38c411a3d6df922aad (diff) | |
| download | rust-9e35a2811d8c65e9473176b8656a3201b7e152c7.tar.gz rust-9e35a2811d8c65e9473176b8656a3201b7e152c7.zip | |
Auto merge of #65087 - Centril:rollup-skxq0zr, r=Centril
Rollup of 5 pull requests Successful merges: - #64749 (Fix most remaining Polonius test differences) - #64817 (Replace ClosureSubsts with SubstsRef) - #64874 (Simplify ExprUseVisitor) - #65026 (metadata: Some crate loading cleanup) - #65073 (Remove `borrowck_graphviz_postflow` from test) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm/debuginfo')
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/metadata.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs index 544d6794e21..e69f4b6aca1 100644 --- a/src/librustc_codegen_llvm/debuginfo/metadata.rs +++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs @@ -6,7 +6,7 @@ use super::utils::{debug_context, DIB, span_start, get_namespace_for_item, create_DIArray, is_node_local_to_unit}; use super::namespace::mangled_name_of_instance; use super::type_names::compute_debuginfo_type_name; -use super::{CrateDebugContext}; +use super::CrateDebugContext; use crate::abi; use crate::value::Value; use rustc_codegen_ssa::traits::*; @@ -682,7 +682,7 @@ pub fn type_metadata( } ty::Closure(def_id, substs) => { - let upvar_tys : Vec<_> = substs.upvar_tys(def_id, cx.tcx).collect(); + let upvar_tys : Vec<_> = substs.as_closure().upvar_tys(def_id, cx.tcx).collect(); let containing_scope = get_namespace_for_item(cx, def_id); prepare_tuple_metadata(cx, t, |