From 38fd5a9acfd4893e572f20591ffea4f3cfd2fc2e Mon Sep 17 00:00:00 2001
From: Esteban Küber <esteban@kuber.com.ar>
Date: Wed, 28 Dec 2022 18:26:59 -0800
Subject: Account for ADT bodies and struct expressions

---
 src/test/ui/parser/diff-markers/struct-expr.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/test/ui/parser/diff-markers/struct-expr.rs

(limited to 'src/test/ui/parser/diff-markers/struct-expr.rs')

diff --git a/src/test/ui/parser/diff-markers/struct-expr.rs b/src/test/ui/parser/diff-markers/struct-expr.rs
new file mode 100644
index 00000000000..99d2fd662c6
--- /dev/null
+++ b/src/test/ui/parser/diff-markers/struct-expr.rs
@@ -0,0 +1,12 @@
+struct S {
+    x: u8,
+}
+fn main() {
+    let _ = S {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+        x: 42,
+=======
+        x: 0,
+>>>>>>> branch
+    }
+}
-- 
cgit 1.4.1-3-g733a5