merge issues/issue-17740.rs with lifetimes/explicit-self-lifetime-mismatch.rs

Author: reddevilmidzy

tests/ui/issues/issue-17740.rs

@@ -1,22 +1,41 @@
 //@ dont-require-annotations: NOTE
+//! regression test for <https://github.com/rust-lang/rust/issues/17740>
 
-struct Foo<'a,'b> {
+struct Foo<'a, 'b> {
     x: &'a isize,
     y: &'b isize,
 }
 
-impl<'a,'b> Foo<'a,'b> {
-    fn bar(self:
-           Foo<'b,'a>
-    //~^ ERROR mismatched `self` parameter type
-    //~| NOTE expected struct `Foo<'a, 'b>`
-    //~| NOTE found struct `Foo<'b, 'a>`
-    //~| NOTE lifetime mismatch
-    //~| ERROR mismatched `self` parameter type
-    //~| NOTE expected struct `Foo<'a, 'b>`
-    //~| NOTE found struct `Foo<'b, 'a>`
-    //~| NOTE lifetime mismatch
-           ) {}
+impl<'a, 'b> Foo<'a, 'b> {
+    fn bar(
+        self: Foo<'b, 'a>,
+        //~^ ERROR mismatched `self` parameter type
+        //~| NOTE expected struct `Foo<'a, 'b>`
+        //~| NOTE found struct `Foo<'b, 'a>`
+        //~| NOTE lifetime mismatch
+        //~| ERROR mismatched `self` parameter type
+        //~| NOTE expected struct `Foo<'a, 'b>`
+        //~| NOTE found struct `Foo<'b, 'a>`
+        //~| NOTE lifetime mismatch
+    ) {
+    }
+}
+
+struct Bar<'a> {
+    data: &'a [u8],
+}
+
+impl<'a> Bar<'a> {
+    fn bar(self: &mut Bar) {
+        //~^ ERROR mismatched `self` parameter type
+        //~| NOTE expected struct `Bar<'a>`
+        //~| NOTE found struct `Bar<'_>`
+        //~| NOTE lifetime mismatch
+        //~| ERROR mismatched `self` parameter type
+        //~| NOTE expected struct `Bar<'a>`
+        //~| NOTE found struct `Bar<'_>`
+        //~| NOTE lifetime mismatch
+    }
 }
 
 fn main() {}

tests/ui/issues/issue-17740.stderr

@@ -1,41 +1,79 @@
 error[E0308]: mismatched `self` parameter type
-  --> $DIR/explicit-self-lifetime-mismatch.rs:10:12
+  --> $DIR/explicit-self-lifetime-mismatch.rs:10:15
    |
-LL |            Foo<'b,'a>
-   |            ^^^^^^^^^^ lifetime mismatch
+LL |         self: Foo<'b, 'a>,
+   |               ^^^^^^^^^^^ lifetime mismatch
    |
    = note: expected struct `Foo<'a, 'b>`
               found struct `Foo<'b, 'a>`
 note: the lifetime `'b` as defined here...
-  --> $DIR/explicit-self-lifetime-mismatch.rs:8:9
+  --> $DIR/explicit-self-lifetime-mismatch.rs:8:10
    |
-LL | impl<'a,'b> Foo<'a,'b> {
-   |         ^^
+LL | impl<'a, 'b> Foo<'a, 'b> {
+   |          ^^
 note: ...does not necessarily outlive the lifetime `'a` as defined here
   --> $DIR/explicit-self-lifetime-mismatch.rs:8:6
    |
-LL | impl<'a,'b> Foo<'a,'b> {
+LL | impl<'a, 'b> Foo<'a, 'b> {
    |      ^^
 
 error[E0308]: mismatched `self` parameter type
-  --> $DIR/explicit-self-lifetime-mismatch.rs:10:12
+  --> $DIR/explicit-self-lifetime-mismatch.rs:10:15
    |
-LL |            Foo<'b,'a>
-   |            ^^^^^^^^^^ lifetime mismatch
+LL |         self: Foo<'b, 'a>,
+   |               ^^^^^^^^^^^ lifetime mismatch
    |
    = note: expected struct `Foo<'a, 'b>`
               found struct `Foo<'b, 'a>`
 note: the lifetime `'a` as defined here...
   --> $DIR/explicit-self-lifetime-mismatch.rs:8:6
    |
-LL | impl<'a,'b> Foo<'a,'b> {
+LL | impl<'a, 'b> Foo<'a, 'b> {
    |      ^^
 note: ...does not necessarily outlive the lifetime `'b` as defined here
-  --> $DIR/explicit-self-lifetime-mismatch.rs:8:9
+  --> $DIR/explicit-self-lifetime-mismatch.rs:8:10
    |
-LL | impl<'a,'b> Foo<'a,'b> {
-   |         ^^
+LL | impl<'a, 'b> Foo<'a, 'b> {
+   |          ^^
 
-error: aborting due to 2 previous errors
+error[E0308]: mismatched `self` parameter type
+  --> $DIR/explicit-self-lifetime-mismatch.rs:28:18
+   |
+LL |     fn bar(self: &mut Bar) {
+   |                  ^^^^^^^^ lifetime mismatch
+   |
+   = note: expected struct `Bar<'a>`
+              found struct `Bar<'_>`
+note: the anonymous lifetime defined here...
+  --> $DIR/explicit-self-lifetime-mismatch.rs:28:23
+   |
+LL |     fn bar(self: &mut Bar) {
+   |                       ^^^
+note: ...does not necessarily outlive the lifetime `'a` as defined here
+  --> $DIR/explicit-self-lifetime-mismatch.rs:27:6
+   |
+LL | impl<'a> Bar<'a> {
+   |      ^^
+
+error[E0308]: mismatched `self` parameter type
+  --> $DIR/explicit-self-lifetime-mismatch.rs:28:18
+   |
+LL |     fn bar(self: &mut Bar) {
+   |                  ^^^^^^^^ lifetime mismatch
+   |
+   = note: expected struct `Bar<'a>`
+              found struct `Bar<'_>`
+note: the lifetime `'a` as defined here...
+  --> $DIR/explicit-self-lifetime-mismatch.rs:27:6
+   |
+LL | impl<'a> Bar<'a> {
+   |      ^^
+note: ...does not necessarily outlive the anonymous lifetime defined here
+  --> $DIR/explicit-self-lifetime-mismatch.rs:28:23
+   |
+LL |     fn bar(self: &mut Bar) {
+   |                       ^^^
+
+error: aborting due to 4 previous errors
 
 For more information about this error, try `rustc --explain E0308`.