From cc9ca640c2a402f620a6b664a25b4417e8d3615a Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Wed, 26 Feb 2020 19:20:14 +0100 Subject: [PATCH] Don't print literal type suffixes if `print_ty` is false --- src/librustc/ty/print/pretty.rs | 11 +++++++++-- src/test/ui/const-generics/const-generic-type_name.rs | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/librustc/ty/print/pretty.rs b/src/librustc/ty/print/pretty.rs index 32630737cd5..819895e6d1c 100644 --- a/src/librustc/ty/print/pretty.rs +++ b/src/librustc/ty/print/pretty.rs @@ -973,7 +973,7 @@ pub trait PrettyPrinter<'tcx>: if data == max { p!(write("std::{}::MAX", ui_str)) } else { - p!(write("{}{}", data, ui_str)) + if print_ty { p!(write("{}{}", data, ui_str)) } else { p!(write("{}", data)) } }; } (Scalar::Raw { data, .. }, ty::Int(i)) => { @@ -986,7 +986,14 @@ pub trait PrettyPrinter<'tcx>: match data { d if d == min => p!(write("std::{}::MIN", i_str)), d if d == max => p!(write("std::{}::MAX", i_str)), - _ => p!(write("{}{}", sign_extend(data, size) as i128, i_str)), + _ => { + let data = sign_extend(data, size) as i128; + if print_ty { + p!(write("{}{}", data, i_str)) + } else { + p!(write("{}", data)) + } + } } } // Char diff --git a/src/test/ui/const-generics/const-generic-type_name.rs b/src/test/ui/const-generics/const-generic-type_name.rs index 28586426b44..469843d6aae 100644 --- a/src/test/ui/const-generics/const-generic-type_name.rs +++ b/src/test/ui/const-generics/const-generic-type_name.rs @@ -7,5 +7,5 @@ struct S; fn main() { - assert_eq!(std::any::type_name::>(), "const_generic_type_name::S<3usize>"); + assert_eq!(std::any::type_name::>(), "const_generic_type_name::S<3>"); }