Revert rendering of short ty::Instance to use Value NS

Author: estebank

compiler/rustc_middle/src/ty/diagnostics.rs

@@ -7,7 +7,7 @@ use rustc_data_structures::fx::FxIndexMap;
 use rustc_errors::{
     Applicability, Diag, DiagArgValue, IntoDiagArg, into_diag_arg_using_display, listify, pluralize,
 };
-use rustc_hir::def::DefKind;
+use rustc_hir::def::{DefKind, Namespace};
 use rustc_hir::def_id::DefId;
 use rustc_hir::{self as hir, AmbigArg, LangItem, PredicateOrigin, WherePredicateKind};
 use rustc_span::{BytePos, Span};
@@ -31,7 +31,7 @@ impl IntoDiagArg for Ty<'_> {
 impl IntoDiagArg for Instance<'_> {
     fn into_diag_arg(self, path: &mut Option<std::path::PathBuf>) -> rustc_errors::DiagArgValue {
         ty::tls::with(|tcx| {
-            let instance = tcx.short_string(self, path);
+            let instance = tcx.short_string_namespace(self, path, Namespace::ValueNS);
             rustc_errors::DiagArgValue::Str(std::borrow::Cow::Owned(instance))
         })
     }

compiler/rustc_middle/src/ty/error.rs

@@ -160,7 +160,11 @@ impl<'tcx> Ty<'tcx> {
             _ => {
                 let width = tcx.sess.diagnostic_width();
                 let length_limit = std::cmp::max(width / 4, 40);
-                format!("`{}`", tcx.string_with_limit(self, length_limit)).into()
+                format!(
+                    "`{}`",
+                    tcx.string_with_limit(self, length_limit, hir::def::Namespace::TypeNS)
+                )
+                .into()
             }
         }
     }
@@ -213,12 +217,12 @@ impl<'tcx> Ty<'tcx> {
 }
 
 impl<'tcx> TyCtxt<'tcx> {
-    pub fn string_with_limit<T>(self, p: T, length_limit: usize) -> String
+    pub fn string_with_limit<T>(self, p: T, length_limit: usize, ns: hir::def::Namespace) -> String
     where
         T: Copy + for<'a, 'b> Lift<TyCtxt<'b>, Lifted: Print<'b, FmtPrinter<'a, 'b>>>,
     {
         let mut type_limit = 50;
-        let regular = FmtPrinter::print_string(self, hir::def::Namespace::TypeNS, |cx| {
+        let regular = FmtPrinter::print_string(self, ns, |cx| {
             self.lift(p).expect("could not lift for printing").print(cx)
         })
         .expect("could not write to `String`");
@@ -229,11 +233,7 @@ impl<'tcx> TyCtxt<'tcx> {
         loop {
             // Look for the longest properly trimmed path that still fits in length_limit.
             short = with_forced_trimmed_paths!({
-                let mut cx = FmtPrinter::new_with_limit(
-                    self,
-                    hir::def::Namespace::TypeNS,
-                    rustc_session::Limit(type_limit),
-                );
+                let mut cx = FmtPrinter::new_with_limit(self, ns, rustc_session::Limit(type_limit));
                 self.lift(p)
                     .expect("could not lift for printing")
                     .print(&mut cx)
@@ -248,15 +248,27 @@ impl<'tcx> TyCtxt<'tcx> {
         short
     }
 
+    pub fn short_string<T>(self, p: T, path: &mut Option<PathBuf>) -> String
+    where
+        T: Copy + Hash + for<'a, 'b> Lift<TyCtxt<'b>, Lifted: Print<'b, FmtPrinter<'a, 'b>>>,
+    {
+        self.short_string_namespace(p, path, hir::def::Namespace::TypeNS)
+    }
+
     /// When calling this after a `Diag` is constructed, the preferred way of doing so is
     /// `tcx.short_string(ty, diag.long_ty_path())`. The diagnostic itself is the one that keeps
     /// the existence of a "long type" anywhere in the diagnostic, so the note telling the user
     /// where we wrote the file to is only printed once.
-    pub fn short_string<T>(self, p: T, path: &mut Option<PathBuf>) -> String
+    pub fn short_string_namespace<T>(
+        self,
+        p: T,
+        path: &mut Option<PathBuf>,
+        namespace: hir::def::Namespace,
+    ) -> String
     where
         T: Copy + Hash + for<'a, 'b> Lift<TyCtxt<'b>, Lifted: Print<'b, FmtPrinter<'a, 'b>>>,
     {
-        let regular = FmtPrinter::print_string(self, hir::def::Namespace::TypeNS, |cx| {
+        let regular = FmtPrinter::print_string(self, namespace, |cx| {
             self.lift(p).expect("could not lift for printing").print(cx)
         })
         .expect("could not write to `String`");
@@ -270,7 +282,7 @@ impl<'tcx> TyCtxt<'tcx> {
         if regular.len() <= width * 2 / 3 {
             return regular;
         }
-        let short = self.string_with_limit(p, length_limit);
+        let short = self.string_with_limit(p, length_limit, namespace);
         if regular == short {
             return regular;
         }

tests/ui/async-await/async-closures/post-mono-higher-ranked-hang-2.stderr

@@ -1,4 +1,4 @@
-error: reached the recursion limit while instantiating `recur<{async closure@$DIR/post-mono-higher-ranked-hang-2.rs:13:24: 13:32}>`
+error: reached the recursion limit while instantiating `recur::<{async closure@$DIR/post-mono-higher-ranked-hang-2.rs:13:24: 13:32}>`
   --> $DIR/post-mono-higher-ranked-hang-2.rs:13:17
    |
 LL |           let _ = recur(&async || {

tests/ui/async-await/async-closures/post-mono-higher-ranked-hang.stderr

@@ -1,4 +1,4 @@
-error: reached the recursion limit while instantiating `ToChain<'_, '_>::perm_pairs<{async closure@$DIR/post-mono-higher-ranked-hang.rs:43:45: 43:67}>`
+error: reached the recursion limit while instantiating `ToChain::<'_, '_>::perm_pairs::<{async closure@$DIR/post-mono-higher-ranked-hang.rs:43:45: 43:67}>`
   --> $DIR/post-mono-higher-ranked-hang.rs:43:21
    |
 LL | /                     self.perm_pairs(l, &mut async move |left_pair| {

tests/ui/consts/const-eval/index-out-of-bounds-never-type.stderr

@@ -10,7 +10,7 @@ note: erroneous constant encountered
 LL |     let _ = PrintName::<T>::VOID;
    |             ^^^^^^^^^^^^^^^^^^^^
 
-note: the above error was encountered while instantiating `fn f<()>`
+note: the above error was encountered while instantiating `fn f::<()>`
   --> $DIR/index-out-of-bounds-never-type.rs:20:5
    |
 LL |     f::<()>();

tests/ui/consts/const-eval/issue-50814-2.normal.stderr

@@ -24,7 +24,7 @@ LL |     &<A<T> as Foo<T>>::BAR
    |
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
-note: the above error was encountered while instantiating `fn foo<()>`
+note: the above error was encountered while instantiating `fn foo::<()>`
   --> $DIR/issue-50814-2.rs:33:22
    |
 LL |     println!("{:x}", foo::<()>() as *const usize as usize);

tests/ui/consts/const-eval/issue-50814.stderr

@@ -40,7 +40,7 @@ LL |     &Sum::<U8, U8>::MAX
    |
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
-note: the above error was encountered while instantiating `fn foo<i32>`
+note: the above error was encountered while instantiating `fn foo::<i32>`
   --> $DIR/issue-50814.rs:27:5
    |
 LL |     foo(0);

tests/ui/consts/const-eval/issue-85155.stderr

@@ -12,7 +12,7 @@ LL |     static_assert_imm1!(IMM1);
    |
    = note: this note originates in the macro `static_assert_imm1` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-note: the above error was encountered while instantiating `fn stdarch_intrinsic<2>`
+note: the above error was encountered while instantiating `fn stdarch_intrinsic::<2>`
   --> $DIR/issue-85155.rs:19:5
    |
 LL |     post_monomorphization_error::stdarch_intrinsic::<2>();

tests/ui/consts/mono-reachable-invalid-const.stderr

@@ -18,7 +18,7 @@ LL |         let val = Self::ASSERT;
    |
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
-note: the above error was encountered while instantiating `fn Bar<0>::assert`
+note: the above error was encountered while instantiating `fn Bar::<0>::assert`
   --> $DIR/mono-reachable-invalid-const.rs:21:5
    |
 LL |     Bar::<0>::assert();

tests/ui/consts/required-consts/collect-in-called-fn.noopt.stderr

@@ -10,7 +10,7 @@ note: erroneous constant encountered
 LL |         let _ = Fail::<T>::C;
    |                 ^^^^^^^^^^^^
 
-note: the above error was encountered while instantiating `fn called<i32>`
+note: the above error was encountered while instantiating `fn called::<i32>`
   --> $DIR/collect-in-called-fn.rs:24:5
    |
 LL |     called::<i32>();