tests/ui/parser/diff-markers/fn-arg.rs


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16

trait T {
    fn foo(
<<<<<<< HEAD //~ ERROR encountered diff marker
        x: u8,
=======
        x: i8,
>>>>>>> branch
    ) {}
}

struct S;
impl T for S {}

fn main() {
    S::foo(42);
}