Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 34 insertions, 0 deletions

diff --git a/tests/ui/not-panic/not-panic-safe-2.stderr b/tests/ui/not-panic/not-panic-safe-2.stderr
new file mode 100644
index 000000000..3b0f83b3b
--- /dev/null
+++ b/tests/ui/not-panic/not-panic-safe-2.stderr
@@ -0,0 +1,34 @@
+error[E0277]: the type `UnsafeCell<i32>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
+  --> $DIR/not-panic-safe-2.rs:10:14
+   |
+LL |     assert::<Rc<RefCell<i32>>>();
+   |              ^^^^^^^^^^^^^^^^ `UnsafeCell<i32>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
+   |
+   = help: within `RefCell<i32>`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell<i32>`
+   = note: required because it appears within the type `RefCell<i32>`
+   = note: required for `Rc<RefCell<i32>>` to implement `UnwindSafe`
+note: required by a bound in `assert`
+  --> $DIR/not-panic-safe-2.rs:7:14
+   |
+LL | fn assert<T: UnwindSafe + ?Sized>() {}
+   |              ^^^^^^^^^^ required by this bound in `assert`
+
+error[E0277]: the type `UnsafeCell<isize>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
+  --> $DIR/not-panic-safe-2.rs:10:14
+   |
+LL |     assert::<Rc<RefCell<i32>>>();
+   |              ^^^^^^^^^^^^^^^^ `UnsafeCell<isize>` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary
+   |
+   = help: within `RefCell<i32>`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell<isize>`
+   = note: required because it appears within the type `Cell<isize>`
+   = note: required because it appears within the type `RefCell<i32>`
+   = note: required for `Rc<RefCell<i32>>` to implement `UnwindSafe`
+note: required by a bound in `assert`
+  --> $DIR/not-panic-safe-2.rs:7:14
+   |
+LL | fn assert<T: UnwindSafe + ?Sized>() {}
+   |              ^^^^^^^^^^ required by this bound in `assert`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.