Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-16048.rs b/tests/ui/issues/issue-16048.rs
new file mode 100644
index 000000000..eaf6acff2
--- /dev/null
+++ b/tests/ui/issues/issue-16048.rs
@@ -0,0 +1,30 @@
+trait NoLifetime {
+    fn get<'p, T : Test<'p>>(&self) -> T;
+    //~^ NOTE lifetimes in impl do not match this method in trait
+}
+
+trait Test<'p> {
+    fn new(buf: &'p mut [u8]) -> Self;
+}
+
+struct Foo<'a> {
+    buf: &'a mut [u8],
+}
+
+impl<'a> Test<'a> for Foo<'a> {
+    fn new(buf: &'a mut [u8]) -> Foo<'a> {
+        Foo { buf: buf }
+    }
+}
+
+impl<'a> NoLifetime for Foo<'a> {
+    fn get<'p, T: Test<'a> + From<Foo<'a>>>(&self) -> T {
+    //~^ ERROR E0195
+    //~| NOTE lifetimes do not match method in trait
+        return *self as T;
+        //~^ ERROR non-primitive cast: `Foo<'a>` as `T`
+        //~| NOTE an `as` expression can only be used to convert between primitive types
+    }
+}
+
+fn main() {}