diff options
| author | bors <bors@rust-lang.org> | 2021-09-24 05:29:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-24 05:29:49 +0000 |
| commit | 197fc8591e6b02ac1f359ee0a72616eb4a6d4f4c (patch) | |
| tree | 9383550a3c9d19bc0eed9347c6ffe526917ca5d1 /compiler/rustc_codegen_llvm/src | |
| parent | 293b8f2c11cbec03f0d4daae6b82ed7541ebbf4e (diff) | |
| parent | 9da27f04293853b42080c7ab20e84c1da11ec5d8 (diff) | |
| download | rust-197fc8591e6b02ac1f359ee0a72616eb4a6d4f4c.tar.gz rust-197fc8591e6b02ac1f359ee0a72616eb4a6d4f4c.zip | |
Auto merge of #89120 - In-line:remove_unneded_visible_parents_map, r=estebank
Disable visible path calculation for PrettyPrinter in Ok path of compiler
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/type_of.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/type_of.rs b/compiler/rustc_codegen_llvm/src/type_of.rs index 757ccbddbee..9e03fc33ae0 100644 --- a/compiler/rustc_codegen_llvm/src/type_of.rs +++ b/compiler/rustc_codegen_llvm/src/type_of.rs @@ -4,7 +4,7 @@ use crate::type_::Type; use rustc_codegen_ssa::traits::*; use rustc_middle::bug; use rustc_middle::ty::layout::{FnAbiOf, LayoutOf, TyAndLayout}; -use rustc_middle::ty::print::with_no_trimmed_paths; +use rustc_middle::ty::print::{with_no_trimmed_paths, with_no_visible_paths}; use rustc_middle::ty::{self, Ty, TypeFoldable}; use rustc_target::abi::{Abi, AddressSpace, Align, FieldsShape}; use rustc_target::abi::{Int, Pointer, F32, F64}; @@ -43,7 +43,8 @@ fn uncached_llvm_type<'a, 'tcx>( // in problematically distinct types due to HRTB and subtyping (see #47638). // ty::Dynamic(..) | ty::Adt(..) | ty::Closure(..) | ty::Foreign(..) | ty::Generator(..) | ty::Str => { - let mut name = with_no_trimmed_paths(|| layout.ty.to_string()); + let mut name = + with_no_visible_paths(|| with_no_trimmed_paths(|| layout.ty.to_string())); if let (&ty::Adt(def, _), &Variants::Single { index }) = (layout.ty.kind(), &layout.variants) { |