Account for ADT bodies and struct expressions
This commit is contained in:
parent
375f025805
commit
38fd5a9acf
12 changed files with 142 additions and 2 deletions
7
src/test/ui/parser/diff-markers/enum.rs
Normal file
7
src/test/ui/parser/diff-markers/enum.rs
Normal file
|
@ -0,0 +1,7 @@
|
|||
enum E {
|
||||
<<<<<<< HEAD //~ ERROR encountered diff marker
|
||||
Foo(u8),
|
||||
=======
|
||||
Bar(i8),
|
||||
>>>>>>> branch
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue