Name RegionKind::ReVar lifetimes in diagnostics

src/librustc_infer/infer/error_reporting/mod.rs

@@ -987,13 +987,16 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
         }
 
         fn push_ty_ref<'tcx>(
-            r: &ty::Region<'tcx>,
+            region: &ty::Region<'tcx>,
             ty: Ty<'tcx>,
             mutbl: hir::Mutability,
             s: &mut DiagnosticStyledString,
         ) {
-            let mut r = r.to_string();
-            if r == "'_" {
+            let mut r = region.to_string();
+            if let ty::RegionKind::ReVar(var) = region {
+                // Show these named, not as `'_` or elide them in "expected/found" notes.
+                r = format!("'z{} ", var.index());
+            } else if r == "'_" {
                 r.clear();
             } else {
                 r.push(' ');

src/librustc_infer/infer/error_reporting/nice_region_error/trait_impl_difference.rs

@@ -1,11 +1,15 @@
 //! Error Reporting for `impl` items that do not match the obligations from their `trait`.
 
+use crate::hir::def_id::DefId;
 use crate::infer::error_reporting::nice_region_error::NiceRegionError;
 use crate::infer::lexical_region_resolve::RegionResolutionError;
 use crate::infer::{Subtype, ValuePairs};
 use crate::traits::ObligationCauseCode::CompareImplMethodObligation;
+use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::ErrorReported;
-use rustc_middle::ty::Ty;
+use rustc_middle::ty::error::ExpectedFound;
+use rustc_middle::ty::fold::TypeFoldable;
+use rustc_middle::ty::{self, Ty};
 use rustc_span::Span;
 
 impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
@@ -52,9 +56,52 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
             .tcx()
             .sess
             .struct_span_err(sp, "`impl` item signature doesn't match `trait` item signature");
-        err.note(&format!("expected `{:?}`\n   found `{:?}`", expected, found));
         err.span_label(sp, &format!("found {:?}", found));
         err.span_label(impl_sp, &format!("expected {:?}", expected));
+
+        struct EarlyBoundRegionHighlighter(FxHashSet<DefId>);
+        impl<'tcx> ty::fold::TypeVisitor<'tcx> for EarlyBoundRegionHighlighter {
+            fn visit_region(&mut self, r: ty::Region<'tcx>) -> bool {
+                debug!("LateBoundRegionNameCollector visit_region {:?}", r);
+                match *r {
+                    ty::ReFree(free) => {
+                        self.0.insert(free.scope);
+                    }
+
+                    ty::ReEarlyBound(bound) => {
+                        self.0.insert(bound.def_id);
+                    }
+                    _ => {}
+                }
+                r.super_visit_with(self)
+            }
+        }
+
+        let mut visitor = EarlyBoundRegionHighlighter(FxHashSet::default());
+        expected.visit_with(&mut visitor);
+
+        let note = !visitor.0.is_empty();
+
+        if let Some((expected, found)) = self
+            .tcx()
+            .infer_ctxt()
+            .enter(|infcx| infcx.expected_found_str_ty(&ExpectedFound { expected, found }))
+        {
+            err.note_expected_found(&"", expected, &"", found);
+        } else {
+            // This fallback shouldn't be necessary, but let's keep it in just in case.
+            err.note(&format!("expected `{:?}`\n   found `{:?}`", expected, found));
+        }
+        if note {
+            err.note(
+                "the lifetime requirements from the `trait` could not be fulfilled by the \
+                      `impl`",
+            );
+            err.help(
+                "consider adding a named lifetime to the `trait` that constrains the item's \
+                      `self` argument, its inputs and its output with it",
+            );
+        }
         err.emit();
     }
 }

src/test/ui/coercion/coerce-mut.rs

@@ -4,7 +4,7 @@ fn main() {
     let x = 0;
     f(&x);
     //~^ ERROR mismatched types
-    //~| expected mutable reference `&mut i32`
-    //~| found reference `&{integer}`
+    //~| expected mutable reference `&'z1 mut i32`
+    //~| found reference `&'z2 {integer}`
     //~| types differ in mutability
 }

src/test/ui/coercion/coerce-mut.stderr

@@ -4,8 +4,8 @@ error[E0308]: mismatched types
 LL |     f(&x);
    |       ^^ types differ in mutability
    |
-   = note: expected mutable reference `&mut i32`
-                      found reference `&{integer}`
+   = note: expected mutable reference `&'z1 mut i32`
+                      found reference `&'z2 {integer}`
 
 error: aborting due to previous error
 

src/test/ui/compare-method/reordered-type-param.stderr

@@ -11,7 +11,7 @@ LL |   fn b<F:Clone,G>(&self, _x: G) -> G { panic!() }
    |        expected type parameter
    |
    = note: expected fn pointer `fn(&E, F) -> F`
-              found fn pointer `fn(&E, G) -> G`
+              found fn pointer `fn(&'z0 E, G) -> G`
    = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound
    = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
 

src/test/ui/hrtb/hrtb-exists-forall-fn.stderr

@@ -7,7 +7,7 @@ LL |     let _: for<'b> fn(&'b u32) = foo();
    |            expected due to this
    |
    = note: expected fn pointer `for<'b> fn(&'b u32)`
-              found fn pointer `fn(&u32)`
+              found fn pointer `fn(&'z0 u32)`
 
 error: aborting due to previous error
 

src/test/ui/impl-trait/impl-generic-mismatch-ab.stderr

@@ -10,7 +10,7 @@ LL |     fn foo<B: Debug>(&self, a: &impl Debug, b: &B) { }
    |            expected type parameter
    |
    = note: expected fn pointer `fn(&(), &B, &impl Debug)`
-              found fn pointer `fn(&(), &impl Debug, &B)`
+              found fn pointer `fn(&'z0 (), &impl Debug, &B)`
    = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound
    = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
 

src/test/ui/impl-trait/trait_type.stderr

@@ -5,7 +5,7 @@ LL |    fn fmt(&self, x: &str) -> () { }
    |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability
    |
    = note: expected fn pointer `fn(&MyType, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>`
-              found fn pointer `fn(&MyType, &str)`
+              found fn pointer `fn(&'z0 MyType, &str)`
 
 error[E0050]: method `fmt` has 1 parameter but the declaration in trait `std::fmt::Display::fmt` has 2
   --> $DIR/trait_type.rs:12:11

src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr

@@ -10,7 +10,9 @@ LL |     fn deref(&self) -> &Self::Target;
    |     --------------------------------- expected fn(&Struct) -> &(dyn Trait + 'static)
    |
    = note: expected `fn(&Struct) -> &(dyn Trait + 'static)`
-              found `fn(&Struct) -> &dyn Trait`
+              found `fn(&'z0 Struct) -> &dyn Trait`
+   = note: the lifetime requirements from the `trait` could not be fulfilled by the `impl`
+   = help: consider adding a named lifetime to the `trait` that constrains the item's `self` argument, its inputs and its output with it
 
 error: aborting due to previous error
 

src/test/ui/in-band-lifetimes/mismatched_trait_impl.stderr

@@ -8,7 +8,9 @@ LL |     fn foo(&self, x: &u32, y: &'a u32) -> &'a u32 {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found fn(&i32, &u32, &u32) -> &u32
    |
    = note: expected `fn(&i32, &'a u32, &u32) -> &'a u32`
-              found `fn(&i32, &u32, &u32) -> &u32`
+              found `fn(&'z0 i32, &'z1 u32, &'z2 u32) -> &'z2 u32`
+   = note: the lifetime requirements from the `trait` could not be fulfilled by the `impl`
+   = help: consider adding a named lifetime to the `trait` that constrains the item's `self` argument, its inputs and its output with it
 
 error[E0623]: lifetime mismatch
   --> $DIR/mismatched_trait_impl.rs:10:9

src/test/ui/issues/issue-13033.rs

@@ -8,7 +8,7 @@ impl Foo for Baz {
     fn bar(&mut self, other: &dyn Foo) {}
     //~^ ERROR method `bar` has an incompatible type for trait
     //~| expected fn pointer `fn(&mut Baz, &mut dyn Foo)`
-    //~| found fn pointer `fn(&mut Baz, &dyn Foo)`
+    //~| found fn pointer `fn(&'z0 mut Baz, &dyn Foo)`
 }
 
 fn main() {}

src/test/ui/issues/issue-13033.stderr

@@ -8,7 +8,7 @@ LL |     fn bar(&mut self, other: &dyn Foo) {}
    |                              ^^^^^^^^ types differ in mutability
    |
    = note: expected fn pointer `fn(&mut Baz, &mut dyn Foo)`
-              found fn pointer `fn(&mut Baz, &dyn Foo)`
+              found fn pointer `fn(&'z0 mut Baz, &dyn Foo)`
 help: consider change the type to match the mutability in trait
    |
 LL |     fn bar(&mut self, other: &mut dyn Foo) {}

src/test/ui/issues/issue-16683.stderr

@@ -27,7 +27,7 @@ note: ...so that the types are compatible
 LL |         self.a();
    |              ^
    = note: expected `&'a Self`
-              found `&Self`
+              found `&'z0 Self`
 
 error: aborting due to previous error
 

src/test/ui/issues/issue-17758.stderr

@@ -28,7 +28,7 @@ note: ...so that the types are compatible
 LL |         self.foo();
    |              ^^^
    = note: expected `&'a Self`
-              found `&Self`
+              found `&'z0 Self`
 
 error: aborting due to previous error
 

src/test/ui/issues/issue-20225.stderr

@@ -7,7 +7,9 @@ LL |   extern "rust-call" fn call(&self, (_,): (T,)) {}
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&T`, found type parameter `T`
    |
    = note: expected fn pointer `extern "rust-call" fn(&Foo, (&'a T,))`
-              found fn pointer `extern "rust-call" fn(&Foo, (T,))`
+              found fn pointer `extern "rust-call" fn(&'z0 Foo, (T,))`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
 
 error[E0053]: method `call_mut` has an incompatible type for trait
   --> $DIR/issue-20225.rs:11:3
@@ -18,7 +20,9 @@ LL |   extern "rust-call" fn call_mut(&mut self, (_,): (T,)) {}
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&T`, found type parameter `T`
    |
    = note: expected fn pointer `extern "rust-call" fn(&mut Foo, (&'a T,))`
-              found fn pointer `extern "rust-call" fn(&mut Foo, (T,))`
+              found fn pointer `extern "rust-call" fn(&'z0 mut Foo, (T,))`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
 
 error[E0053]: method `call_once` has an incompatible type for trait
   --> $DIR/issue-20225.rs:18:3

src/test/ui/issues/issue-21332.stderr

@@ -5,7 +5,7 @@ LL |     fn next(&mut self) -> Result<i32, i32> { Ok(7) }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected enum `std::option::Option`, found enum `std::result::Result`
    |
    = note: expected fn pointer `fn(&mut S) -> std::option::Option<i32>`
-              found fn pointer `fn(&mut S) -> std::result::Result<i32, i32>`
+              found fn pointer `fn(&'z0 mut S) -> std::result::Result<i32, i32>`
 
 error: aborting due to previous error
 

src/test/ui/lifetimes/lifetime-mismatch-between-trait-and-impl.stderr

@@ -8,7 +8,9 @@ LL |     fn foo<'a>(x: &'a i32, y: &'a i32) -> &'a i32 {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found fn(&i32, &i32) -> &i32
    |
    = note: expected `fn(&i32, &'a i32) -> &'a i32`
-              found `fn(&i32, &i32) -> &i32`
+              found `fn(&'z0 i32, &'z0 i32) -> &'z0 i32`
+   = note: the lifetime requirements from the `trait` could not be fulfilled by the `impl`
+   = help: consider adding a named lifetime to the `trait` that constrains the item's `self` argument, its inputs and its output with it
 
 error: aborting due to previous error
 

src/test/ui/mismatched_types/E0053.stderr

@@ -20,7 +20,7 @@ LL |     fn bar(&mut self) { }
    |            ^^^^^^^^^ types differ in mutability
    |
    = note: expected fn pointer `fn(&Bar)`
-              found fn pointer `fn(&mut Bar)`
+              found fn pointer `fn(&'z0 mut Bar)`
 help: consider change the type to match the mutability in trait
    |
 LL |     fn bar(&self) { }

src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr

@@ -20,7 +20,7 @@ LL |     fn bar(&mut self, bar: &Bar) { }
    |                            ^^^^ types differ in mutability
    |
    = note: expected fn pointer `fn(&mut Bar, &mut Bar)`
-              found fn pointer `fn(&mut Bar, &Bar)`
+              found fn pointer `fn(&'z0 mut Bar, &'z1 Bar)`
 help: consider change the type to match the mutability in trait
    |
 LL |     fn bar(&mut self, bar: &mut Bar) { }

src/test/ui/nll/type-alias-free-regions.stderr

@@ -16,7 +16,7 @@ note: ...so that the expression is assignable
    |
 LL |         C { f: b }
    |                ^
-   = note: expected `std::boxed::Box<std::boxed::Box<&isize>>`
+   = note: expected `std::boxed::Box<std::boxed::Box<&'z0 isize>>`
               found `std::boxed::Box<std::boxed::Box<&isize>>`
 note: but, the lifetime must be valid for the lifetime `'a` as defined on the impl at 15:6...
   --> $DIR/type-alias-free-regions.rs:15:6
@@ -49,7 +49,7 @@ note: ...so that the expression is assignable
    |
 LL |         C { f: Box::new(b.0) }
    |                         ^^^
-   = note: expected `std::boxed::Box<&isize>`
+   = note: expected `std::boxed::Box<&'z1 isize>`
               found `std::boxed::Box<&isize>`
 note: but, the lifetime must be valid for the lifetime `'a` as defined on the impl at 25:6...
   --> $DIR/type-alias-free-regions.rs:25:6

src/test/ui/regions-fn-subtyping-return-static-fail.stderr

@@ -5,7 +5,7 @@ LL |     want_F(bar);
    |            ^^^ expected concrete lifetime, found bound lifetime parameter 'cx
    |
    = note: expected fn pointer `for<'cx> fn(&'cx S) -> &'cx S`
-                 found fn item `for<'a> fn(&'a S) -> &S {bar::<'_>}`
+                 found fn item `for<'a> fn(&'a S) -> &'z2 S {bar::<'_>}`
 
 error[E0308]: mismatched types
   --> $DIR/regions-fn-subtyping-return-static-fail.rs:48:12

src/test/ui/regions/region-object-lifetime-in-coercion.stderr

@@ -39,7 +39,7 @@ note: ...so that the expression is assignable
    |
 LL |     Box::new(v)
    |              ^
-   = note: expected `&[u8]`
+   = note: expected `&'z1 [u8]`
               found `&'a [u8]`
 note: but, the lifetime must be valid for the lifetime `'b` as defined on the function body at 25:9...
   --> $DIR/region-object-lifetime-in-coercion.rs:25:9

src/test/ui/regions/regions-fn-subtyping-return-static.stderr

@@ -5,7 +5,7 @@ LL |     want_F(bar);
    |            ^^^ expected concrete lifetime, found bound lifetime parameter 'cx
    |
    = note: expected fn pointer `for<'cx> fn(&'cx S) -> &'cx S`
-                 found fn item `for<'a> fn(&'a S) -> &S {bar::<'_>}`
+                 found fn item `for<'a> fn(&'a S) -> &'z2 S {bar::<'_>}`
 
 error: aborting due to previous error
 

src/test/ui/regions/regions-nested-fns.stderr

@@ -40,7 +40,7 @@ LL | |         return z;
 LL | |     }));
    | |_____^
    = note: expected `&isize`
-              found `&isize`
+              found `&'z13 isize`
 
 error[E0312]: lifetime of reference outlives lifetime of borrowed content...
   --> $DIR/regions-nested-fns.rs:14:27

src/test/ui/regions/regions-ret-borrowed-1.stderr

@@ -14,7 +14,7 @@ note: ...so that the expression is assignable
    |
 LL |     with(|o| o)
    |              ^
-   = note: expected `&isize`
+   = note: expected `&'z0 isize`
               found `&isize`
 note: but, the lifetime must be valid for the lifetime `'a` as defined on the function body at 9:14...
   --> $DIR/regions-ret-borrowed-1.rs:9:14

src/test/ui/regions/regions-ret-borrowed.stderr

@@ -14,7 +14,7 @@ note: ...so that the expression is assignable
    |
 LL |     with(|o| o)
    |              ^
-   = note: expected `&isize`
+   = note: expected `&'z0 isize`
               found `&isize`
 note: but, the lifetime must be valid for the lifetime `'a` as defined on the function body at 12:14...
   --> $DIR/regions-ret-borrowed.rs:12:14

src/test/ui/regions/regions-trait-1.stderr

@@ -5,7 +5,7 @@ LL |     fn get_ctxt(&self) -> &'a Ctxt {
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
    = note: expected fn pointer `fn(&HasCtxt<'a>) -> &Ctxt`
-              found fn pointer `fn(&HasCtxt<'a>) -> &'a Ctxt`
+              found fn pointer `fn(&'z0 HasCtxt<'a>) -> &'a Ctxt`
 note: the lifetime `'a` as defined on the impl at 12:6...
   --> $DIR/regions-trait-1.rs:12:6
    |

src/test/ui/regions/regions-trait-object-subtyping.stderr

@@ -42,7 +42,7 @@ note: ...so that the expression is assignable
 LL |     x
    |     ^
    = note: expected `&'b mut (dyn Dummy + 'b)`
-              found `&mut (dyn Dummy + 'b)`
+              found `&'z1 mut (dyn Dummy + 'b)`
 
 error[E0308]: mismatched types
   --> $DIR/regions-trait-object-subtyping.rs:22:5

src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr

@@ -54,8 +54,8 @@ LL |         Opts::A(ref mut i) | Opts::B(ref i) => {}
    |                 |
    |                 first introduced with type `&mut isize` here
    |
-   = note: expected type `&mut isize`
-              found type `&isize`
+   = note: expected type `&'z0 mut isize`
+              found type `&'z1 isize`
    = note: in the same arm, a binding must have the same type in all alternatives
 
 error: aborting due to 6 previous errors

src/test/ui/span/coerce-suggestions.stderr

@@ -22,8 +22,8 @@ error[E0308]: mismatched types
 LL |     test(&y);
    |          ^^ types differ in mutability
    |
-   = note: expected mutable reference `&mut std::string::String`
-                      found reference `&std::string::String`
+   = note: expected mutable reference `&'z2 mut std::string::String`
+                      found reference `&'z3 std::string::String`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-suggestions.rs:14:11

src/test/ui/traits/trait-impl-method-mismatch.stderr

@@ -8,7 +8,7 @@ LL |     unsafe fn jumbo(&self, x: &usize) { *self + *x; }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected normal fn, found unsafe fn
    |
    = note: expected fn pointer `fn(&usize, &usize) -> usize`
-              found fn pointer `unsafe fn(&usize, &usize)`
+              found fn pointer `unsafe fn(&'z0 usize, &'z1 usize)`
 
 error: aborting due to previous error