diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2022-12-28 18:26:59 -0800 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2022-12-28 18:30:18 -0800 |
| commit | 38fd5a9acfd4893e572f20591ffea4f3cfd2fc2e (patch) | |
| tree | 915f00bd64d1abb9f1765917ab0fef03bb53eb42 /src/test/ui/parser/diff-markers/tuple-struct.rs | |
| parent | 375f02580522ddacb4777d194d48d82454bb6aa9 (diff) | |
| download | rust-38fd5a9acfd4893e572f20591ffea4f3cfd2fc2e.tar.gz rust-38fd5a9acfd4893e572f20591ffea4f3cfd2fc2e.zip | |
Account for ADT bodies and struct expressions
Diffstat (limited to 'src/test/ui/parser/diff-markers/tuple-struct.rs')
| -rw-r--r-- | src/test/ui/parser/diff-markers/tuple-struct.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/test/ui/parser/diff-markers/tuple-struct.rs b/src/test/ui/parser/diff-markers/tuple-struct.rs new file mode 100644 index 00000000000..7eec35c968d --- /dev/null +++ b/src/test/ui/parser/diff-markers/tuple-struct.rs @@ -0,0 +1,7 @@ +struct S( +<<<<<<< HEAD //~ ERROR encountered diff marker + u8, +======= + i8, +>>>>>>> branch +); |