Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/ui/object-safety/object-safety-no-static.rs b/tests/ui/object-safety/object-safety-no-static.rs
new file mode 100644
index 000000000..03b622174
--- /dev/null
+++ b/tests/ui/object-safety/object-safety-no-static.rs
@@ -0,0 +1,24 @@
+// Check that we correctly prevent users from making trait objects
+// from traits with static methods.
+//
+// revisions: curr object_safe_for_dispatch
+
+#![cfg_attr(object_safe_for_dispatch, feature(object_safe_for_dispatch))]
+
+trait Foo {
+    fn foo() {}
+}
+
+fn diverges() -> Box<dyn Foo> {
+    //[curr]~^ ERROR E0038
+    loop { }
+}
+
+struct Bar;
+
+impl Foo for Bar {}
+
+fn main() {
+    let b: Box<dyn Foo> = Box::new(Bar);
+    //[object_safe_for_dispatch]~^ ERROR E0038
+}