diff --git a/compiler/rustc_const_eval/src/interpret/intrinsics/type_name.rs b/compiler/rustc_const_eval/src/interpret/intrinsics/type_name.rs index e6f243e28db..aa84b16b502 100644 --- a/compiler/rustc_const_eval/src/interpret/intrinsics/type_name.rs +++ b/compiler/rustc_const_eval/src/interpret/intrinsics/type_name.rs @@ -149,7 +149,7 @@ fn path_generic_args( } impl<'tcx> PrettyPrinter<'tcx> for AbsolutePathPrinter<'tcx> { - fn region_should_not_be_omitted(&self, _region: ty::Region<'_>) -> bool { + fn should_print_region(&self, _region: ty::Region<'_>) -> bool { false } fn comma_sep(mut self, mut elems: impl Iterator) -> Result diff --git a/compiler/rustc_middle/src/ty/print/pretty.rs b/compiler/rustc_middle/src/ty/print/pretty.rs index 359e4f5e581..403315a7a78 100644 --- a/compiler/rustc_middle/src/ty/print/pretty.rs +++ b/compiler/rustc_middle/src/ty/print/pretty.rs @@ -275,7 +275,7 @@ fn generic_delimiters( /// Returns `true` if the region should be printed in /// optional positions, e.g., `&'a T` or `dyn Tr + 'b`. /// This is typically the case for all non-`'_` regions. - fn region_should_not_be_omitted(&self, region: ty::Region<'_>) -> bool; + fn should_print_region(&self, region: ty::Region<'_>) -> bool; // Defaults (should not be overridden): @@ -577,7 +577,7 @@ fn pretty_print_type(mut self, ty: Ty<'tcx>) -> Result } ty::Ref(r, ty, mutbl) => { p!("&"); - if self.region_should_not_be_omitted(r) { + if self.should_print_region(r) { p!(print(r), " "); } p!(print(ty::TypeAndMut { ty, mutbl })) @@ -621,7 +621,7 @@ fn pretty_print_type(mut self, ty: Ty<'tcx>) -> Result p!(print_def_path(def.did, substs)); } ty::Dynamic(data, r) => { - let print_r = self.region_should_not_be_omitted(r); + let print_r = self.should_print_region(r); if print_r { p!("("); } @@ -1914,7 +1914,7 @@ fn generic_delimiters( Ok(inner) } - fn region_should_not_be_omitted(&self, region: ty::Region<'_>) -> bool { + fn should_print_region(&self, region: ty::Region<'_>) -> bool { let highlight = self.region_highlight_mode; if highlight.region_highlighted(region).is_some() { return true; diff --git a/compiler/rustc_symbol_mangling/src/legacy.rs b/compiler/rustc_symbol_mangling/src/legacy.rs index cec1d4bc157..47bf0fe1221 100644 --- a/compiler/rustc_symbol_mangling/src/legacy.rs +++ b/compiler/rustc_symbol_mangling/src/legacy.rs @@ -346,7 +346,7 @@ fn path_generic_args( } impl<'tcx> PrettyPrinter<'tcx> for &mut SymbolPrinter<'tcx> { - fn region_should_not_be_omitted(&self, _region: ty::Region<'_>) -> bool { + fn should_print_region(&self, _region: ty::Region<'_>) -> bool { false } fn comma_sep(mut self, mut elems: impl Iterator) -> Result