From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/ui/not-panic/not-panic-safe-2.rs | 13 ---------- src/test/ui/not-panic/not-panic-safe-2.stderr | 34 --------------------------- src/test/ui/not-panic/not-panic-safe-3.rs | 13 ---------- src/test/ui/not-panic/not-panic-safe-3.stderr | 34 --------------------------- src/test/ui/not-panic/not-panic-safe-4.rs | 12 ---------- src/test/ui/not-panic/not-panic-safe-4.stderr | 34 --------------------------- src/test/ui/not-panic/not-panic-safe-5.rs | 10 -------- src/test/ui/not-panic/not-panic-safe-5.stderr | 17 -------------- src/test/ui/not-panic/not-panic-safe-6.rs | 12 ---------- src/test/ui/not-panic/not-panic-safe-6.stderr | 34 --------------------------- src/test/ui/not-panic/not-panic-safe.rs | 10 -------- src/test/ui/not-panic/not-panic-safe.stderr | 20 ---------------- 12 files changed, 243 deletions(-) delete mode 100644 src/test/ui/not-panic/not-panic-safe-2.rs delete mode 100644 src/test/ui/not-panic/not-panic-safe-2.stderr delete mode 100644 src/test/ui/not-panic/not-panic-safe-3.rs delete mode 100644 src/test/ui/not-panic/not-panic-safe-3.stderr delete mode 100644 src/test/ui/not-panic/not-panic-safe-4.rs delete mode 100644 src/test/ui/not-panic/not-panic-safe-4.stderr delete mode 100644 src/test/ui/not-panic/not-panic-safe-5.rs delete mode 100644 src/test/ui/not-panic/not-panic-safe-5.stderr delete mode 100644 src/test/ui/not-panic/not-panic-safe-6.rs delete mode 100644 src/test/ui/not-panic/not-panic-safe-6.stderr delete mode 100644 src/test/ui/not-panic/not-panic-safe.rs delete mode 100644 src/test/ui/not-panic/not-panic-safe.stderr (limited to 'src/test/ui/not-panic') diff --git a/src/test/ui/not-panic/not-panic-safe-2.rs b/src/test/ui/not-panic/not-panic-safe-2.rs deleted file mode 100644 index f3faa7043..000000000 --- a/src/test/ui/not-panic/not-panic-safe-2.rs +++ /dev/null @@ -1,13 +0,0 @@ -#![allow(dead_code)] - -use std::panic::UnwindSafe; -use std::rc::Rc; -use std::cell::RefCell; - -fn assert() {} - -fn main() { - assert::>>(); - //~^ ERROR the type `UnsafeCell` may contain interior mutability and a - //~| ERROR the type `UnsafeCell` may contain interior mutability and a -} diff --git a/src/test/ui/not-panic/not-panic-safe-2.stderr b/src/test/ui/not-panic/not-panic-safe-2.stderr deleted file mode 100644 index 3b0f83b3b..000000000 --- a/src/test/ui/not-panic/not-panic-safe-2.stderr +++ /dev/null @@ -1,34 +0,0 @@ -error[E0277]: the type `UnsafeCell` 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::>>(); - | ^^^^^^^^^^^^^^^^ `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - = help: within `RefCell`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell` - = note: required because it appears within the type `RefCell` - = note: required for `Rc>` to implement `UnwindSafe` -note: required by a bound in `assert` - --> $DIR/not-panic-safe-2.rs:7:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error[E0277]: the type `UnsafeCell` 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::>>(); - | ^^^^^^^^^^^^^^^^ `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - = help: within `RefCell`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell` - = note: required because it appears within the type `Cell` - = note: required because it appears within the type `RefCell` - = note: required for `Rc>` to implement `UnwindSafe` -note: required by a bound in `assert` - --> $DIR/not-panic-safe-2.rs:7:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0277`. diff --git a/src/test/ui/not-panic/not-panic-safe-3.rs b/src/test/ui/not-panic/not-panic-safe-3.rs deleted file mode 100644 index 21f0c0993..000000000 --- a/src/test/ui/not-panic/not-panic-safe-3.rs +++ /dev/null @@ -1,13 +0,0 @@ -#![allow(dead_code)] - -use std::panic::UnwindSafe; -use std::sync::Arc; -use std::cell::RefCell; - -fn assert() {} - -fn main() { - assert::>>(); - //~^ ERROR the type `UnsafeCell` may contain interior mutability and a - //~| ERROR the type `UnsafeCell` may contain interior mutability and a -} diff --git a/src/test/ui/not-panic/not-panic-safe-3.stderr b/src/test/ui/not-panic/not-panic-safe-3.stderr deleted file mode 100644 index 9e9a12764..000000000 --- a/src/test/ui/not-panic/not-panic-safe-3.stderr +++ /dev/null @@ -1,34 +0,0 @@ -error[E0277]: the type `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-3.rs:10:14 - | -LL | assert::>>(); - | ^^^^^^^^^^^^^^^^^ `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - = help: within `RefCell`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell` - = note: required because it appears within the type `RefCell` - = note: required for `Arc>` to implement `UnwindSafe` -note: required by a bound in `assert` - --> $DIR/not-panic-safe-3.rs:7:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error[E0277]: the type `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-3.rs:10:14 - | -LL | assert::>>(); - | ^^^^^^^^^^^^^^^^^ `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - = help: within `RefCell`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell` - = note: required because it appears within the type `Cell` - = note: required because it appears within the type `RefCell` - = note: required for `Arc>` to implement `UnwindSafe` -note: required by a bound in `assert` - --> $DIR/not-panic-safe-3.rs:7:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0277`. diff --git a/src/test/ui/not-panic/not-panic-safe-4.rs b/src/test/ui/not-panic/not-panic-safe-4.rs deleted file mode 100644 index ba93af5c0..000000000 --- a/src/test/ui/not-panic/not-panic-safe-4.rs +++ /dev/null @@ -1,12 +0,0 @@ -#![allow(dead_code)] - -use std::panic::UnwindSafe; -use std::cell::RefCell; - -fn assert() {} - -fn main() { - assert::<&RefCell>(); - //~^ ERROR the type `UnsafeCell` may contain interior mutability and a - //~| ERROR the type `UnsafeCell` may contain interior mutability and a -} diff --git a/src/test/ui/not-panic/not-panic-safe-4.stderr b/src/test/ui/not-panic/not-panic-safe-4.stderr deleted file mode 100644 index fc1c594d0..000000000 --- a/src/test/ui/not-panic/not-panic-safe-4.stderr +++ /dev/null @@ -1,34 +0,0 @@ -error[E0277]: the type `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-4.rs:9:14 - | -LL | assert::<&RefCell>(); - | ^^^^^^^^^^^^^ `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - = help: within `RefCell`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell` - = note: required because it appears within the type `RefCell` - = note: required for `&RefCell` to implement `UnwindSafe` -note: required by a bound in `assert` - --> $DIR/not-panic-safe-4.rs:6:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error[E0277]: the type `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-4.rs:9:14 - | -LL | assert::<&RefCell>(); - | ^^^^^^^^^^^^^ `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - = help: within `RefCell`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell` - = note: required because it appears within the type `Cell` - = note: required because it appears within the type `RefCell` - = note: required for `&RefCell` to implement `UnwindSafe` -note: required by a bound in `assert` - --> $DIR/not-panic-safe-4.rs:6:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0277`. diff --git a/src/test/ui/not-panic/not-panic-safe-5.rs b/src/test/ui/not-panic/not-panic-safe-5.rs deleted file mode 100644 index e0d37517d..000000000 --- a/src/test/ui/not-panic/not-panic-safe-5.rs +++ /dev/null @@ -1,10 +0,0 @@ -#![allow(dead_code)] - -use std::panic::UnwindSafe; -use std::cell::UnsafeCell; - -fn assert() {} - -fn main() { - assert::<*const UnsafeCell>(); //~ ERROR E0277 -} diff --git a/src/test/ui/not-panic/not-panic-safe-5.stderr b/src/test/ui/not-panic/not-panic-safe-5.stderr deleted file mode 100644 index cb78370b4..000000000 --- a/src/test/ui/not-panic/not-panic-safe-5.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error[E0277]: the type `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-5.rs:9:14 - | -LL | assert::<*const UnsafeCell>(); - | ^^^^^^^^^^^^^^^^^^^^^^ `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - = help: the trait `RefUnwindSafe` is not implemented for `UnsafeCell` - = note: required for `*const UnsafeCell` to implement `UnwindSafe` -note: required by a bound in `assert` - --> $DIR/not-panic-safe-5.rs:6:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0277`. diff --git a/src/test/ui/not-panic/not-panic-safe-6.rs b/src/test/ui/not-panic/not-panic-safe-6.rs deleted file mode 100644 index 4915096dc..000000000 --- a/src/test/ui/not-panic/not-panic-safe-6.rs +++ /dev/null @@ -1,12 +0,0 @@ -#![allow(dead_code)] - -use std::panic::UnwindSafe; -use std::cell::RefCell; - -fn assert() {} - -fn main() { - assert::<*mut RefCell>(); - //~^ ERROR the type `UnsafeCell` may contain interior mutability and a - //~| ERROR the type `UnsafeCell` may contain interior mutability and a -} diff --git a/src/test/ui/not-panic/not-panic-safe-6.stderr b/src/test/ui/not-panic/not-panic-safe-6.stderr deleted file mode 100644 index 7986e341e..000000000 --- a/src/test/ui/not-panic/not-panic-safe-6.stderr +++ /dev/null @@ -1,34 +0,0 @@ -error[E0277]: the type `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-6.rs:9:14 - | -LL | assert::<*mut RefCell>(); - | ^^^^^^^^^^^^^^^^^ `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - = help: within `RefCell`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell` - = note: required because it appears within the type `RefCell` - = note: required for `*mut RefCell` to implement `UnwindSafe` -note: required by a bound in `assert` - --> $DIR/not-panic-safe-6.rs:6:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error[E0277]: the type `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - --> $DIR/not-panic-safe-6.rs:9:14 - | -LL | assert::<*mut RefCell>(); - | ^^^^^^^^^^^^^^^^^ `UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - = help: within `RefCell`, the trait `RefUnwindSafe` is not implemented for `UnsafeCell` - = note: required because it appears within the type `Cell` - = note: required because it appears within the type `RefCell` - = note: required for `*mut RefCell` to implement `UnwindSafe` -note: required by a bound in `assert` - --> $DIR/not-panic-safe-6.rs:6:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0277`. diff --git a/src/test/ui/not-panic/not-panic-safe.rs b/src/test/ui/not-panic/not-panic-safe.rs deleted file mode 100644 index 4165c5dc1..000000000 --- a/src/test/ui/not-panic/not-panic-safe.rs +++ /dev/null @@ -1,10 +0,0 @@ -#![allow(dead_code)] - -use std::panic::UnwindSafe; - -fn assert() {} - -fn main() { - assert::<&mut i32>(); - //~^ ERROR the type `&mut i32` may not be safely transferred across an unwind boundary -} diff --git a/src/test/ui/not-panic/not-panic-safe.stderr b/src/test/ui/not-panic/not-panic-safe.stderr deleted file mode 100644 index 2cd51a439..000000000 --- a/src/test/ui/not-panic/not-panic-safe.stderr +++ /dev/null @@ -1,20 +0,0 @@ -error[E0277]: the type `&mut i32` may not be safely transferred across an unwind boundary - --> $DIR/not-panic-safe.rs:8:14 - | -LL | assert::<&mut i32>(); - | -^^^^^^^ - | | - | `&mut i32` may not be safely transferred across an unwind boundary - | help: consider removing the leading `&`-reference - | - = help: the trait `UnwindSafe` is not implemented for `&mut i32` - = note: `UnwindSafe` is implemented for `&i32`, but not for `&mut i32` -note: required by a bound in `assert` - --> $DIR/not-panic-safe.rs:5:14 - | -LL | fn assert() {} - | ^^^^^^^^^^ required by this bound in `assert` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0277`. -- cgit v1.2.3