Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 39 deletions

diff --git a/src/test/ui/object-safety/object-safety-generics.rs b/src/test/ui/object-safety/object-safety-generics.rs
deleted file mode 100644
index 63dcd1699..000000000
--- a/src/test/ui/object-safety/object-safety-generics.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Check that we correctly prevent users from making trait objects
-// from traits with generic methods, unless `where Self : Sized` is
-// present.
-// revisions: curr object_safe_for_dispatch
-
-#![cfg_attr(object_safe_for_dispatch, feature(object_safe_for_dispatch))]
-
-
-trait Bar {
-    fn bar<T>(&self, t: T);
-}
-
-trait Quux {
-    fn bar<T>(&self, t: T)
-        where Self : Sized;
-}
-
-fn make_bar<T:Bar>(t: &T) -> &dyn Bar {
-    //[curr]~^ ERROR E0038
-    t
-    //[object_safe_for_dispatch]~^ ERROR E0038
-}
-
-fn make_bar_explicit<T:Bar>(t: &T) -> &dyn Bar {
-    //[curr]~^ ERROR E0038
-    t as &dyn Bar
-    //[object_safe_for_dispatch]~^ ERROR E0038
-}
-
-fn make_quux<T:Quux>(t: &T) -> &dyn Quux {
-    t
-}
-
-fn make_quux_explicit<T:Quux>(t: &T) -> &dyn Quux {
-    t as &dyn Quux
-}
-
-fn main() {
-}