Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 12 deletions

diff --git a/src/test/ui/string-box-error.rs b/src/test/ui/string-box-error.rs
deleted file mode 100644
index 11a5bd07c..000000000
--- a/src/test/ui/string-box-error.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// run-pass
-// Ensure that both `Box<dyn Error + Send + Sync>` and `Box<dyn Error>` can be
-// obtained from `String`.
-
-use std::error::Error;
-
-fn main() {
-    let _err1: Box<dyn Error + Send + Sync> = From::from("test".to_string());
-    let _err2: Box<dyn Error> = From::from("test".to_string());
-    let _err3: Box<dyn Error + Send + Sync + 'static> = From::from("test");
-    let _err4: Box<dyn Error> = From::from("test");
-}