mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-29 19:47:38 +00:00
17 lines
191 B
Rust
17 lines
191 B
Rust
|
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);
|
||
|
|
}
|