Pretty Bound and Placeholder tys differently with Zverbose

Author: compiler-errors

compiler/rustc_middle/src/ty/print/pretty.rs

@@ -700,12 +700,18 @@ pub trait PrettyPrinter<'tcx>:
             }
             ty::Error(_) => p!("[type error]"),
             ty::Param(ref param_ty) => p!(print(param_ty)),
-            ty::Bound(debruijn, bound_ty) => match bound_ty.kind {
-                ty::BoundTyKind::Anon(bv) => {
-                    self.pretty_print_bound_var(debruijn, ty::BoundVar::from_u32(bv))?
+            ty::Bound(debruijn, bound_ty) => {
+                if self.should_print_verbose() {
+                    p!(write("Bound({:?}, {:?})", debruijn, bound_ty))
+                } else {
+                    match bound_ty.kind {
+                        ty::BoundTyKind::Anon(bv) => {
+                            self.pretty_print_bound_var(debruijn, ty::BoundVar::from_u32(bv))?
+                        }
+                        ty::BoundTyKind::Param(_, s) => p!(write("{}", s)),
+                    }
                 }
-                ty::BoundTyKind::Param(_, s) => p!(write("{}", s)),
-            },
+            }
             ty::Adt(def, substs) => {
                 p!(print_def_path(def.did(), substs));
             }
@@ -736,8 +742,10 @@ pub trait PrettyPrinter<'tcx>:
                 }
             }
             ty::Placeholder(placeholder) => match placeholder.name {
-                ty::BoundTyKind::Anon(_) => p!(write("Placeholder({:?})", placeholder)),
-                ty::BoundTyKind::Param(_, name) => p!(write("{}", name)),
+                ty::BoundTyKind::Param(_, name) if !self.should_print_verbose() => {
+                    p!(write("{}", name))
+                }
+                _ => p!(write("Placeholder({:?})", placeholder)),
             },
             ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => {
                 // We use verbose printing in 'NO_QUERIES' mode, to

tests/ui/nll/user-annotations/dump-fn-method.rs

@@ -1,8 +1,6 @@
 // Unit test for the "user substitutions" that are annotated on each
 // node.
 
-// compile-flags:-Zverbose
-
 #![feature(rustc_attrs)]
 
 // Note: we reference the names T and U in the comments below.
@@ -26,7 +24,7 @@ fn main() {
     let x = foo::<u32>;
     x(22);
 
-    let x = foo::<&'static u32>; //~ ERROR [&ReStatic u32]
+    let x = foo::<&'static u32>; //~ ERROR [&'static u32]
     x(&22);
 
     // Here: we only want the `T` to be given, the rest should be variables.
@@ -41,7 +39,7 @@ fn main() {
     x(&22, 44, 66);
 
     // Here: all are given and we have a lifetime.
-    let x = <u8 as Bazoom<&'static u16>>::method::<u32>; //~ ERROR [u8, &ReStatic u16, u32]
+    let x = <u8 as Bazoom<&'static u16>>::method::<u32>; //~ ERROR [u8, &'static u16, u32]
     x(&22, &44, 66);
 
     // Here: we want in particular that *only* the method `U`

tests/ui/nll/user-annotations/dump-fn-method.stderr

@@ -1,23 +1,23 @@
-error: user substs: UserSubsts { substs: [&ReStatic u32], user_self_ty: None }
-  --> $DIR/dump-fn-method.rs:29:13
+error: user substs: UserSubsts { substs: [&'static u32], user_self_ty: None }
+  --> $DIR/dump-fn-method.rs:27:13
    |
 LL |     let x = foo::<&'static u32>;
    |             ^^^^^^^^^^^^^^^^^^^
 
 error: user substs: UserSubsts { substs: [^0, u32, ^1], user_self_ty: None }
-  --> $DIR/dump-fn-method.rs:35:13
+  --> $DIR/dump-fn-method.rs:33:13
    |
 LL |     let x = <_ as Bazoom<u32>>::method::<_>;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: user substs: UserSubsts { substs: [u8, &ReStatic u16, u32], user_self_ty: None }
-  --> $DIR/dump-fn-method.rs:44:13
+error: user substs: UserSubsts { substs: [u8, &'static u16, u32], user_self_ty: None }
+  --> $DIR/dump-fn-method.rs:42:13
    |
 LL |     let x = <u8 as Bazoom<&'static u16>>::method::<u32>;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: user substs: UserSubsts { substs: [^0, ^1, u32], user_self_ty: None }
-  --> $DIR/dump-fn-method.rs:52:5
+  --> $DIR/dump-fn-method.rs:50:5
    |
 LL |     y.method::<u32>(44, 66);
    |     ^^^^^^^^^^^^^^^^^^^^^^^