Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/ui/unsafe/unsafe-trait-impl.stderr b/tests/ui/unsafe/unsafe-trait-impl.stderr
new file mode 100644
index 000000000..18ba79404
--- /dev/null
+++ b/tests/ui/unsafe/unsafe-trait-impl.stderr
@@ -0,0 +1,17 @@
+error[E0053]: method `len` has an incompatible type for trait
+  --> $DIR/unsafe-trait-impl.rs:8:5
+   |
+LL |     fn len(&self) -> u32 { *self }
+   |     ^^^^^^^^^^^^^^^^^^^^ expected unsafe fn, found normal fn
+   |
+note: type in trait
+  --> $DIR/unsafe-trait-impl.rs:4:5
+   |
+LL |     unsafe fn len(&self) -> u32;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: expected signature `unsafe fn(&u32) -> _`
+              found signature `fn(&u32) -> _`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0053`.