Skip to content

Commit 6df6b81

Browse files
authored
Fix conflict markers in fn_ptr_global.rs: keep Rust 2024-safe raw pointer pattern
1 parent f9eb263 commit 6df6b81

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

tests/unit/out/unsafe/fn_ptr_global.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,12 @@ unsafe fn main_0() -> i32 {
4949
let _fn: Option<unsafe fn(i32) -> i32> = None;
5050
set_op_3(_fn)
5151
});
52-
<<<<<<< HEAD
5352
assert!(unsafe { (&raw const g_op_2).as_ref().unwrap().is_none() });
5453
assert!(
5554
((unsafe {
5655
let _x: i32 = 5;
5756
call_op_4(_x)
5857
}) == (5))
5958
);
60-
=======
61-
assert!((g_op_2).is_none());
62-
assert!(((unsafe { call_op_4(5,) }) == (5)));
63-
>>>>>>> origin/master
6459
return 0;
6560
}

0 commit comments

Comments
 (0)