From 67f149215f240552c2d1f6bcb00b4834d674e367 Mon Sep 17 00:00:00 2001
From: Michael Wright <mikerite@lavabit.com>
Date: Thu, 12 Sep 2019 08:47:11 +0200
Subject: [PATCH] Verify that issue #3567 is resolved

Closes #3567
---
 tests/ui/use_self.fixed  | 19 +++++++++++++++++++
 tests/ui/use_self.rs     | 19 +++++++++++++++++++
 tests/ui/use_self.stderr |  8 +++++++-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/tests/ui/use_self.fixed b/tests/ui/use_self.fixed
index 73666f2faae8..901337885260 100644
--- a/tests/ui/use_self.fixed
+++ b/tests/ui/use_self.fixed
@@ -313,3 +313,22 @@ mod rustfix {
         }
     }
 }
+
+mod issue3567 {
+    struct TestStruct {}
+    impl TestStruct {
+        fn from_something() -> Self {
+            Self {}
+        }
+    }
+
+    trait Test {
+        fn test() -> TestStruct;
+    }
+
+    impl Test for TestStruct {
+        fn test() -> TestStruct {
+            Self::from_something()
+        }
+    }
+}
diff --git a/tests/ui/use_self.rs b/tests/ui/use_self.rs
index 2e2b4f8b9d80..e6900b915341 100644
--- a/tests/ui/use_self.rs
+++ b/tests/ui/use_self.rs
@@ -313,3 +313,22 @@ mod rustfix {
         }
     }
 }
+
+mod issue3567 {
+    struct TestStruct {}
+    impl TestStruct {
+        fn from_something() -> Self {
+            Self {}
+        }
+    }
+
+    trait Test {
+        fn test() -> TestStruct;
+    }
+
+    impl Test for TestStruct {
+        fn test() -> TestStruct {
+            TestStruct::from_something()
+        }
+    }
+}
diff --git a/tests/ui/use_self.stderr b/tests/ui/use_self.stderr
index 699e735137f0..d1bfb0e230d8 100644
--- a/tests/ui/use_self.stderr
+++ b/tests/ui/use_self.stderr
@@ -216,5 +216,11 @@ error: unnecessary structure name repetition
 LL |             nested::A {};
    |             ^^^^^^^^^ help: use the applicable keyword: `Self`
 
-error: aborting due to 35 previous errors
+error: unnecessary structure name repetition
+  --> $DIR/use_self.rs:331:13
+   |
+LL |             TestStruct::from_something()
+   |             ^^^^^^^^^^ help: use the applicable keyword: `Self`
+
+error: aborting due to 36 previous errors