diff options
| author | Ralf Jung <post@ralfj.de> | 2024-02-11 19:04:29 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-02-21 20:15:52 +0100 |
| commit | b58f647d5488dce73bba517907c44af2c2a618c4 (patch) | |
| tree | 24e9b1e2a3299ccd459c5e00db09c64220d6ba21 /library/alloc/tests | |
| parent | 1d447a9946effc38c4b964a888ab408a3df3c246 (diff) | |
| download | rust-b58f647d5488dce73bba517907c44af2c2a618c4.tar.gz rust-b58f647d5488dce73bba517907c44af2c2a618c4.zip | |
rename ptr::invalid -> ptr::without_provenance
also introduce ptr::dangling matching NonNull::dangling
Diffstat (limited to 'library/alloc/tests')
| -rw-r--r-- | library/alloc/tests/fmt.rs | 14 | ||||
| -rw-r--r-- | library/alloc/tests/vec.rs | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/library/alloc/tests/fmt.rs b/library/alloc/tests/fmt.rs index 04da95bbb83..379e09ab69a 100644 --- a/library/alloc/tests/fmt.rs +++ b/library/alloc/tests/fmt.rs @@ -77,14 +77,14 @@ fn test_format_macro_interface() { t!(format!("{}", "foo"), "foo"); t!(format!("{}", "foo".to_string()), "foo"); if cfg!(target_pointer_width = "32") { - t!(format!("{:#p}", ptr::invalid::<isize>(0x1234)), "0x00001234"); - t!(format!("{:#p}", ptr::invalid_mut::<isize>(0x1234)), "0x00001234"); + t!(format!("{:#p}", ptr::without_provenance::<isize>(0x1234)), "0x00001234"); + t!(format!("{:#p}", ptr::without_provenance_mut::<isize>(0x1234)), "0x00001234"); } else { - t!(format!("{:#p}", ptr::invalid::<isize>(0x1234)), "0x0000000000001234"); - t!(format!("{:#p}", ptr::invalid_mut::<isize>(0x1234)), "0x0000000000001234"); + t!(format!("{:#p}", ptr::without_provenance::<isize>(0x1234)), "0x0000000000001234"); + t!(format!("{:#p}", ptr::without_provenance_mut::<isize>(0x1234)), "0x0000000000001234"); } - t!(format!("{:p}", ptr::invalid::<isize>(0x1234)), "0x1234"); - t!(format!("{:p}", ptr::invalid_mut::<isize>(0x1234)), "0x1234"); + t!(format!("{:p}", ptr::without_provenance::<isize>(0x1234)), "0x1234"); + t!(format!("{:p}", ptr::without_provenance_mut::<isize>(0x1234)), "0x1234"); t!(format!("{A:x}"), "aloha"); t!(format!("{B:X}"), "adios"); t!(format!("foo {} ☃☃☃☃☃☃", "bar"), "foo bar ☃☃☃☃☃☃"); @@ -208,7 +208,7 @@ fn test_format_macro_interface() { { let val = usize::MAX; let exp = format!("{val:#x}"); - t!(format!("{:p}", std::ptr::invalid::<isize>(val)), exp); + t!(format!("{:p}", std::ptr::without_provenance::<isize>(val)), exp); } // Escaping diff --git a/library/alloc/tests/vec.rs b/library/alloc/tests/vec.rs index 04bb20e96b7..15ee4d65205 100644 --- a/library/alloc/tests/vec.rs +++ b/library/alloc/tests/vec.rs @@ -2575,7 +2575,7 @@ fn test_box_zero_allocator() { assert!(state.0.insert(addr)); state.1 += 1; std::println!("allocating {addr}"); - std::ptr::invalid_mut(addr) + std::ptr::without_provenance_mut(addr) } else { unsafe { std::alloc::alloc(layout) } }; |
