Auto merge of #66911 - eddyb:nicer-rustc_regions, r=matthewjasper

rustc_mir: use nicer path printing for #[rustc_regions] NLL tests.

Similar to #66850, spotted while working on #66907.

r? @matthewjasper

diff --cc src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
index abeffee4d3fc294d14d3b7bbad941a0136477a33,a6619b9a8cbb2283f2a4571a51e393933f545857..3d79ff0b706f57e71dac931892ab2300b4059cf8
--- 1/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
--- 2/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
+++ b/src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
@@@ -4,9 -4,9 +4,9 @@@ note: No external requirement
  LL |         let mut closure = expect_sig(|p, y| *p = y);
     |                                      ^^^^^^^^^^^^^
     |
-    = note: defining type: DefId(0:4 ~ escape_argument_callee[317d]::test[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: test::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's, 't0> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) mut &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) i32, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't0)) i32)),
 +               for<'r, 's, 't0> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) mut &ReLateBound(DebruijnIndex(0), BrNamed('s)) i32, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) i32)),
             ]
  
  error: lifetime may not live long enough

diff --cc src/test/ui/nll/closure-requirements/escape-argument.stderr
index f750d15533bc4cac7a6a728e94e510083f1d9070,31c7c325d1abde2f1723b52d5ea2f240e47554bd..37f04af6378d9ae24a0945ad22cc221ef7e4854e
--- 1/src/test/ui/nll/closure-requirements/escape-argument.stderr
--- 2/src/test/ui/nll/closure-requirements/escape-argument.stderr
+++ b/src/test/ui/nll/closure-requirements/escape-argument.stderr
@@@ -4,9 -4,9 +4,9 @@@ note: No external requirement
  LL |         let mut closure = expect_sig(|p, y| *p = y);
     |                                      ^^^^^^^^^^^^^
     |
-    = note: defining type: DefId(0:4 ~ escape_argument[317d]::test[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: test::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) mut &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) i32, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) i32)),
 +               for<'r, 's> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) mut &ReLateBound(DebruijnIndex(0), BrNamed('s)) i32, &ReLateBound(DebruijnIndex(0), BrNamed('s)) i32)),
             ]
  
  note: No external requirements

diff --cc src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
index 92f30d400f26ebdedc82b83ab66d99aa7cdbf0ab,eef77b0b2dccfc95ad6f62372dc7bb0263573f37..4e3aa352fffdb3b7b292014a63addb642d1b28d7
--- 1/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
--- 2/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
@@@ -8,9 -8,9 +8,9 @@@ LL | |             demand_y(x, y, p
  LL | |         },
     | |_________^
     |
-    = note: defining type: DefId(0:18 ~ propagate_approximated_fail_no_postdom[317d]::supply[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: supply::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&'_#2r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) &'_#3r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>)),
 +               for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&'_#2r &ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#3r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>)),
             ]
     = note: late-bound region is '_#4r
     = note: late-bound region is '_#5r

diff --cc src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr
index 00bb66afbe5386ec6fa7ca4288aaf4b27a61e552,8b637b1f7257a9df4b1c6b673475ca24f97b5129..cd61b8b5e555e19381ec64ed18b0207461f39d25
--- 1/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr
--- 2/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr
@@@ -9,9 -9,9 +9,9 @@@ LL | 
  LL | |     });
     | |_____^
     |
-    = note: defining type: DefId(0:16 ~ propagate_approximated_ref[317d]::supply[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: supply::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) &'_#2r u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) u32>)),
 +               for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) &'_#2r u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>)),
             ]
     = note: late-bound region is '_#3r
     = note: late-bound region is '_#4r

diff --cc src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
index 2b05503b58dbe17cd839df6d5f8818233dbb10d9,2cd21de419d90e93c1be4432569d3084d085b9db..259140c2e5a3df14c96bf35c34d3b6fe3a71d8cd
--- 1/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
--- 2/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
@@@ -8,9 -8,9 +8,9 @@@ LL | 
  LL | |     })
     | |_____^
     |
-    = note: defining type: DefId(0:9 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case1[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: case1::{{closure}}#0 with closure substs [
                 i32,
 -               for<'r> extern "rust-call" fn((std::cell::Cell<&'_#1r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>)),
 +               for<'r> extern "rust-call" fn((std::cell::Cell<&'_#1r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>)),
             ]
  
  error[E0521]: borrowed data escapes outside of closure
@@@ -46,9 -46,9 +46,9 @@@ LL | |         cell_x.set(cell_a.get())
  LL | |     })
     | |_____^
     |
-    = note: defining type: DefId(0:11 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case2[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: case2::{{closure}}#0 with closure substs [
                 i32,
 -               for<'r> extern "rust-call" fn((std::cell::Cell<&'_#1r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>)),
 +               for<'r> extern "rust-call" fn((std::cell::Cell<&'_#1r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>)),
             ]
     = note: number of external vids: 2
     = note: where '_#1r: '_#0r

diff --cc src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
index ee0f0b7e65dd828cadf3ee42bab86e6c1959c061,e61ab7d9b0d0c1db2b95b82eda0fccb12b7c8672..b3dd682e4f0b72e1079fbfaa6b9fb08707b09be8
--- 1/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
--- 2/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
@@@ -10,9 -10,9 +10,9 @@@ LL | |         demand_y(x, y, x.get()
  LL | |     });
     | |_____^
     |
-    = note: defining type: DefId(0:16 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: supply::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's, 't0, 't1, 't2> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't2)) u32>)),
 +               for<'r, 's, 't0, 't1, 't2> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t1)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t2)) u32>)),
             ]
     = note: late-bound region is '_#2r
     = note: late-bound region is '_#3r

diff --cc src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
index 611a129e00c83c088c08baa1e4ce77ae93a569bf,836a25f7ac20d24a1529578893233731e5675810..ab12d08f7b74eb2ac9ed95cc88683bdf67371f05
--- 1/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
--- 2/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
@@@ -10,9 -10,9 +10,9 @@@ LL | |         demand_y(x, y, x.get()
  LL | |     });
     | |_____^
     |
-    = note: defining type: DefId(0:16 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: supply::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't0)) std::cell::Cell<&'_#2r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) u32>)),
 +               for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&'_#2r &ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>)),
             ]
     = note: late-bound region is '_#3r
     = note: late-bound region is '_#4r

diff --cc src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr
index 9328d05518c6733dfefcad990afd629072160509,dfb1913113f8cbb5749c46c13cc7508bf467d0dd..b2209e9cab0c942eed6de671537839d50d3916e4
--- 1/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr
--- 2/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr
@@@ -9,9 -9,9 +9,9 @@@ LL | 
  LL | |     });
     | |_____^
     |
-    = note: defining type: DefId(0:16 ~ propagate_approximated_val[317d]::test[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: test::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) &'_#2r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>)),
 +               for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#2r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>)),
             ]
     = note: late-bound region is '_#3r
     = note: late-bound region is '_#4r

diff --cc src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr
index afac5267c4866100182fd5f084700056d0a152c2,33c927e5660034c7155735a0ae0a6aacea7e2d3e..55ee515a3a821b3d3ad34533aa0ef72dca5c3272
--- 1/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr
--- 2/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr
@@@ -8,9 -8,9 +8,9 @@@ LL | |             demand_y(x, y, p
  LL | |         },
     | |_________^
     |
-    = note: defining type: DefId(0:14 ~ propagate_despite_same_free_region[317d]::supply[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: supply::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) &'_#2r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>)),
 +               for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#2r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>)),
             ]
     = note: late-bound region is '_#3r
     = note: number of external vids: 4

diff --cc src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
index 9699e8fbdf8e513bc176563b91815a71809ced21,cadb0a177ae68f64fcd7bf46eaedda4b0eac1038..1c29af8c422105c6c758b2e9bbbef81a6b3abd2a
--- 1/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
--- 2/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
@@@ -9,9 -9,9 +9,9 @@@ LL | 
  LL | |     });
     | |_____^
     |
-    = note: defining type: DefId(0:16 ~ propagate_fail_to_approximate_longer_no_bounds[317d]::supply[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: supply::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's, 't0, 't1, 't2> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) &'_#1r u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>)),
 +               for<'r, 's, 't0, 't1, 't2> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#1r u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>)),
             ]
     = note: late-bound region is '_#2r
     = note: late-bound region is '_#3r

diff --cc src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
index 2a18079cdc3a3ef7310dea4ebf5fbdcfc2ef582a,24ba0e8d79e0b8ebb11086319d33b4ec5927c577..afa0e9f619ddc75887c50daaeccc04c55c8deea9
--- 1/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
--- 2/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
@@@ -9,9 -9,9 +9,9 @@@ LL | 
  LL | |     });
     | |_____^
     |
-    = note: defining type: DefId(0:16 ~ propagate_fail_to_approximate_longer_wrong_bounds[317d]::supply[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: supply::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) &'_#1r u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) &'_#2r u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) u32>)),
 +               for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#1r u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) &'_#2r u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>)),
             ]
     = note: late-bound region is '_#3r
     = note: late-bound region is '_#4r

diff --cc src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr
index 8ce0b7758b05b27fc86c0e6de02da00ea760dfa1,f6ed5e3a205720eb19a96e5b8a2f6fb29cd56596..ca794d92666f2ed32fb274f0bb07ae024e47749e
--- 1/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr
--- 2/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr
+++ b/src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr
@@@ -4,9 -4,9 +4,9 @@@ note: No external requirement
  LL |     expect_sig(|a, b| b); // ought to return `a`
     |                ^^^^^^^^
     |
-    = note: defining type: DefId(0:4 ~ return_wrong_bound_region[317d]::test[0]::{{closure}}[0]) with closure substs [
+    = note: defining type: test::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) i32, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) i32)) -> &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) i32,
 +               for<'r, 's> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) i32, &ReLateBound(DebruijnIndex(0), BrNamed('s)) i32)) -> &ReLateBound(DebruijnIndex(0), BrNamed('r)) i32,
             ]
  
  error: lifetime may not live long enough

diff --cc src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr
Simple merge

diff --cc src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr
Simple merge

diff --cc src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
index e2a9bd7e3cd08e0d64a231274f59815e970a9f78,6478e504345fe934d65488dab6ee16d72a9bda67..db0bca1dec6f5c19772a6e84000949277edc8cd4
--- 1/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
--- 2/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
+++ b/src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr
@@@ -4,10 -4,9 +4,9 @@@ note: External requirement
  LL |     twice(cell, value, |a, b| invoke(a, b));
     |                        ^^^^^^^^^^^^^^^^^^^
     |
-    = note: defining type: DefId(0:11 ~ ty_param_closure_approximate_lower_bound[317d]::generic[0]::{{closure}}[0]) with closure substs [
-                T,
+    = note: defining type: generic::<T>::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's> extern "rust-call" fn((std::option::Option<std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) ()>>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) T)),
 +               for<'r, 's> extern "rust-call" fn((std::option::Option<std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('r)) ()>>, &ReLateBound(DebruijnIndex(0), BrNamed('s)) T)),
             ]
     = note: number of external vids: 2
     = note: where T: '_#1r
@@@ -31,10 -28,9 +28,9 @@@ note: External requirement
  LL |     twice(cell, value, |a, b| invoke(a, b));
     |                        ^^^^^^^^^^^^^^^^^^^
     |
-    = note: defining type: DefId(0:15 ~ ty_param_closure_approximate_lower_bound[317d]::generic_fail[0]::{{closure}}[0]) with closure substs [
-                T,
+    = note: defining type: generic_fail::<T>::{{closure}}#0 with closure substs [
                 i16,
 -               for<'r, 's> extern "rust-call" fn((std::option::Option<std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) ()>>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) T)),
 +               for<'r, 's> extern "rust-call" fn((std::option::Option<std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('r)) ()>>, &ReLateBound(DebruijnIndex(0), BrNamed('s)) T)),
             ]
     = note: late-bound region is '_#2r
     = note: number of external vids: 3

diff --cc src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr
Simple merge