From fa5d58cd007812b5990ec5721082bac293a97467 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sun, 10 Nov 2024 23:50:37 -0800
Subject: [PATCH] Use ui test syntax that does not interfere with rustfmt

---
 test_suite/tests/ui/conflict/alias-enum.rs     | 2 +-
 test_suite/tests/ui/conflict/alias-enum.stderr | 6 +++---
 test_suite/tests/ui/conflict/alias.rs          | 2 +-
 test_suite/tests/ui/conflict/alias.stderr      | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test_suite/tests/ui/conflict/alias-enum.rs b/test_suite/tests/ui/conflict/alias-enum.rs
index e5e614e29..5ca958b6d 100644
--- a/test_suite/tests/ui/conflict/alias-enum.rs
+++ b/test_suite/tests/ui/conflict/alias-enum.rs
@@ -71,5 +71,5 @@ enum E3 {
 }
 
 fn main() {
-    @//fail
+    __FAIL__;
 }
diff --git a/test_suite/tests/ui/conflict/alias-enum.stderr b/test_suite/tests/ui/conflict/alias-enum.stderr
index ea2ed1009..c84041051 100644
--- a/test_suite/tests/ui/conflict/alias-enum.stderr
+++ b/test_suite/tests/ui/conflict/alias-enum.stderr
@@ -1,8 +1,8 @@
-error: expected expression, found `@`
+error[E0425]: cannot find value `__FAIL__` in this scope
   --> tests/ui/conflict/alias-enum.rs:74:5
    |
-74 |     @//fail
-   |     ^ expected expression
+74 |     __FAIL__;
+   |     ^^^^^^^^ not found in this scope
 
 warning: unreachable pattern
   --> tests/ui/conflict/alias-enum.rs:13:9
diff --git a/test_suite/tests/ui/conflict/alias.rs b/test_suite/tests/ui/conflict/alias.rs
index 8158301c2..e18254759 100644
--- a/test_suite/tests/ui/conflict/alias.rs
+++ b/test_suite/tests/ui/conflict/alias.rs
@@ -35,5 +35,5 @@ struct S3 {
 }
 
 fn main() {
-    @//fail
+    __FAIL__;
 }
diff --git a/test_suite/tests/ui/conflict/alias.stderr b/test_suite/tests/ui/conflict/alias.stderr
index 2040cec32..4c1a96d1c 100644
--- a/test_suite/tests/ui/conflict/alias.stderr
+++ b/test_suite/tests/ui/conflict/alias.stderr
@@ -1,8 +1,8 @@
-error: expected expression, found `@`
+error[E0425]: cannot find value `__FAIL__` in this scope
   --> tests/ui/conflict/alias.rs:38:5
    |
-38 |     @//fail
-   |     ^ expected expression
+38 |     __FAIL__;
+   |     ^^^^^^^^ not found in this scope
 
 warning: unreachable pattern
   --> tests/ui/conflict/alias.rs:10:5