Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 30 deletions

diff --git a/src/test/ui/issues/issue-16048.rs b/src/test/ui/issues/issue-16048.rs
deleted file mode 100644
index eaf6acff2..000000000
--- a/src/test/ui/issues/issue-16048.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-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() {}