]> git.lizzy.rs Git - rust.git/blob - src/test/ui/parser/diff-markers/struct-expr.rs
Account for ADT bodies and struct expressions
[rust.git] / src / test / ui / parser / diff-markers / struct-expr.rs
1 struct S {
2     x: u8,
3 }
4 fn main() {
5     let _ = S {
6 <<<<<<< HEAD //~ ERROR encountered diff marker
7         x: 42,
8 =======
9         x: 0,
10 >>>>>>> branch
11     }
12 }