mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libcore tests: avoid int2ptr casts

Browse source
This commit is contained in:
Ralf Jung 2022-06-27 11:09:53 -04:00
parent 221bdb62a2
commit 8c977cfda8
4 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/core/tests/alloc.rs
View file

@ -1,5 +1,5 @@
use core::alloc::Layout; use core::alloc::Layout;
use core::ptr::NonNull; use core::ptr::{self, NonNull};
#[test] #[test]
fn const_unchecked_layout() { fn const_unchecked_layout() {
@ -9,7 +9,7 @@ fn const_unchecked_layout() {
const DANGLING: NonNull<u8> = LAYOUT.dangling(); const DANGLING: NonNull<u8> = LAYOUT.dangling();
assert_eq!(LAYOUT.size(), SIZE); assert_eq!(LAYOUT.size(), SIZE);
assert_eq!(LAYOUT.align(), ALIGN); assert_eq!(LAYOUT.align(), ALIGN);
assert_eq!(Some(DANGLING), NonNull::new(ALIGN as *mut u8)); assert_eq!(Some(DANGLING), NonNull::new(ptr::invalid_mut(ALIGN)));
} }
#[test] #[test]

5
library/core/tests/hash/mod.rs
View file

@ -2,6 +2,7 @@ mod sip;
use std::default::Default; use std::default::Default;
use std::hash::{BuildHasher, Hash, Hasher}; use std::hash::{BuildHasher, Hash, Hasher};
use std::ptr;
use std::rc::Rc; use std::rc::Rc;
struct MyHasher { struct MyHasher {
@ -69,10 +70,10 @@ fn test_writer_hasher() {
let cs: Rc<[u8]> = Rc::new([1, 2, 3]); let cs: Rc<[u8]> = Rc::new([1, 2, 3]);
assert_eq!(hash(&cs), 9); assert_eq!(hash(&cs), 9);
let ptr = 5_usize as *const i32; let ptr = ptr::invalid::<i32>(5_usize);
assert_eq!(hash(&ptr), 5); assert_eq!(hash(&ptr), 5);
let ptr = 5_usize as *mut i32; let ptr = ptr::invalid_mut::<i32>(5_usize);
assert_eq!(hash(&ptr), 5); assert_eq!(hash(&ptr), 5);
if cfg!(miri) { if cfg!(miri) {

26
library/core/tests/ptr.rs
View file

@ -353,9 +353,9 @@ fn align_offset_zst() {
// all, because no amount of elements will align the pointer. // all, because no amount of elements will align the pointer.
let mut p = 1; let mut p = 1;
while p < 1024 { while p < 1024 {
assert_eq!((p as *const ()).align_offset(p), 0); assert_eq!(ptr::invalid::<()>(p).align_offset(p), 0);
if p != 1 { if p != 1 {
assert_eq!(((p + 1) as *const ()).align_offset(p), !0); assert_eq!(ptr::invalid::<()>(p + 1).align_offset(p), !0);
} }
p = (p + 1).next_power_of_two(); p = (p + 1).next_power_of_two();
} }
@ -371,7 +371,7 @@ fn align_offset_stride1() {
let expected = ptr % align; let expected = ptr % align;
let offset = if expected == 0 { 0 } else { align - expected }; let offset = if expected == 0 { 0 } else { align - expected };
assert_eq!( assert_eq!(
(ptr as *const u8).align_offset(align), ptr::invalid::<u8>(ptr).align_offset(align),
offset, offset,
"ptr = {}, align = {}, size = 1", "ptr = {}, align = {}, size = 1",
ptr, ptr,
@ -434,14 +434,14 @@ fn align_offset_weird_strides() {
while align < limit { while align < limit {
for ptr in 1usize..4 * align { for ptr in 1usize..4 * align {
unsafe { unsafe {
x |= test_weird_stride::<A3>(ptr as *const A3, align); x |= test_weird_stride::<A3>(ptr::invalid::<A3>(ptr), align);
x |= test_weird_stride::<A4>(ptr as *const A4, align); x |= test_weird_stride::<A4>(ptr::invalid::<A4>(ptr), align);
x |= test_weird_stride::<A5>(ptr as *const A5, align); x |= test_weird_stride::<A5>(ptr::invalid::<A5>(ptr), align);
x |= test_weird_stride::<A6>(ptr as *const A6, align); x |= test_weird_stride::<A6>(ptr::invalid::<A6>(ptr), align);
x |= test_weird_stride::<A7>(ptr as *const A7, align); x |= test_weird_stride::<A7>(ptr::invalid::<A7>(ptr), align);
x |= test_weird_stride::<A8>(ptr as *const A8, align); x |= test_weird_stride::<A8>(ptr::invalid::<A8>(ptr), align);
x |= test_weird_stride::<A9>(ptr as *const A9, align); x |= test_weird_stride::<A9>(ptr::invalid::<A9>(ptr), align);
x |= test_weird_stride::<A10>(ptr as *const A10, align); x |= test_weird_stride::<A10>(ptr::invalid::<A10>(ptr), align);
} }
} }
align = (align + 1).next_power_of_two(); align = (align + 1).next_power_of_two();
@ -479,8 +479,8 @@ fn ptr_metadata() {
let () = metadata(&[4, 7]); let () = metadata(&[4, 7]);
let () = metadata(&(4, String::new())); let () = metadata(&(4, String::new()));
let () = metadata(&Pair(4, String::new())); let () = metadata(&Pair(4, String::new()));
let () = metadata(0 as *const Extern); let () = metadata(ptr::null::<()>() as *const Extern);
let () = metadata(0 as *const <&u32 as std::ops::Deref>::Target); let () = metadata(ptr::null::<()>() as *const <&u32 as std::ops::Deref>::Target);
assert_eq!(metadata("foo"), 3_usize); assert_eq!(metadata("foo"), 3_usize);
assert_eq!(metadata(&[4, 7][..]), 2_usize); assert_eq!(metadata(&[4, 7][..]), 2_usize);

4
library/core/tests/waker.rs
View file

@ -3,7 +3,7 @@ use std::task::{RawWaker, RawWakerVTable, Waker};
#[test] #[test]
fn test_waker_getters() { fn test_waker_getters() {
let raw_waker = RawWaker::new(42usize as *mut (), &WAKER_VTABLE); let raw_waker = RawWaker::new(ptr::invalid_mut(42usize), &WAKER_VTABLE);
assert_eq!(raw_waker.data() as usize, 42); assert_eq!(raw_waker.data() as usize, 42);
assert!(ptr::eq(raw_waker.vtable(), &WAKER_VTABLE)); assert!(ptr::eq(raw_waker.vtable(), &WAKER_VTABLE));
@ -15,7 +15,7 @@ fn test_waker_getters() {
} }
static WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new( static WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new(
|data| RawWaker::new((data as usize + 1) as *mut (), &WAKER_VTABLE), |data| RawWaker::new(ptr::invalid_mut(data as usize + 1), &WAKER_VTABLE),
|_| {}, |_| {},
|_| {}, |_| {},
|_| {}, |_| {},