Skip to content

Commit 25d4b2d

Browse files
committed
Update test to make miri happy
1 parent 798c9c6 commit 25d4b2d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/hole.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -752,17 +752,18 @@ pub mod test {
752752
fn hole_list_new_min_size() {
753753
// define an array of `u64` instead of `u8` for alignment
754754
static mut HEAP: [u64; 2] = [0; 2];
755+
let heap_start = unsafe { HEAP.as_ptr() as usize };
755756
let heap =
756757
unsafe { HoleList::new(HEAP.as_mut_ptr().cast(), 2 * core::mem::size_of::<usize>()) };
757-
assert_eq!(heap.bottom.cast(), unsafe { HEAP.as_mut_ptr() });
758-
assert_eq!(heap.top.cast(), unsafe { HEAP.as_mut_ptr().add(2) });
758+
assert_eq!(heap.bottom as usize, heap_start);
759+
assert_eq!(heap.top as usize, heap_start + 2 * size_of::<usize>());
759760
assert_eq!(heap.first.size, 0); // dummy
760761
assert_eq!(
761762
heap.first.next,
762763
Some(NonNull::new(heap.bottom.cast())).unwrap()
763764
);
764765
assert_eq!(
765-
unsafe { &*(heap.first.next.unwrap().as_ptr()) }.size,
766+
unsafe { heap.first.next.as_ref().unwrap().as_ref() }.size,
766767
2 * core::mem::size_of::<usize>()
767768
);
768769
assert_eq!(unsafe { &*(heap.first.next.unwrap().as_ptr()) }.next, None);

0 commit comments

Comments
 (0)