Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 36 deletions

diff --git a/src/test/ui/test-attrs/issue-53675-a-test-called-panic.rs b/src/test/ui/test-attrs/issue-53675-a-test-called-panic.rs
deleted file mode 100644
index e57303898..000000000
--- a/src/test/ui/test-attrs/issue-53675-a-test-called-panic.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// rust-lang/rust#53675: At one point the compiler errored when a test
-// named `panic` used the `assert!` macro in expression position.
-
-// check-pass
-// compile-flags: --test
-
-mod in_expression_position {
-    #[test]
-    fn panic() {
-        assert!(true)
-    }
-}
-
-mod in_statement_position {
-    #[test]
-    fn panic() {
-        assert!(true);
-    }
-}
-
-mod what_if_we_use_panic_directly_in_expr {
-    #[test]
-    #[should_panic]
-    fn panic() {
-        panic!("in expr")
-    }
-}
-
-
-mod what_if_we_use_panic_directly_in_stmt {
-    #[test]
-    #[should_panic]
-    fn panic() {
-        panic!("in stmt");
-    }
-}