diff options
| author | Michael Goulet <michael@errs.io> | 2022-08-13 14:10:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-13 14:10:05 -0700 |
| commit | ea42f3cfd7daeff596e2e9eb3f2a96aca3ed3479 (patch) | |
| tree | 7fdb00165acaf828c0d0f7c1f1e3f1deb701a1f2 | |
| parent | 4b51df3df0e740016fd7f2fd1bba48fc5527316b (diff) | |
| parent | b5786dcae6c5a300f146fcbf6dab509d2cd48ec8 (diff) | |
| download | rust-ea42f3cfd7daeff596e2e9eb3f2a96aca3ed3479.tar.gz rust-ea42f3cfd7daeff596e2e9eb3f2a96aca3ed3479.zip | |
Rollup merge of #100407 - RalfJung:no-int2ptr, r=Mark-Simulacrum
avoid some int2ptr casts in thread_local_key tests
| -rw-r--r-- | library/std/src/sys_common/thread_local_key/tests.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/library/std/src/sys_common/thread_local_key/tests.rs b/library/std/src/sys_common/thread_local_key/tests.rs index 968738a4180..6f32b858f09 100644 --- a/library/std/src/sys_common/thread_local_key/tests.rs +++ b/library/std/src/sys_common/thread_local_key/tests.rs @@ -1,4 +1,5 @@ use super::{Key, StaticKey}; +use core::ptr; fn assert_sync<T: Sync>() {} fn assert_send<T: Send>() {} @@ -12,8 +13,8 @@ fn smoke() { let k2 = Key::new(None); assert!(k1.get().is_null()); assert!(k2.get().is_null()); - k1.set(1 as *mut _); - k2.set(2 as *mut _); + k1.set(ptr::invalid_mut(1)); + k2.set(ptr::invalid_mut(2)); assert_eq!(k1.get() as usize, 1); assert_eq!(k2.get() as usize, 2); } @@ -26,8 +27,8 @@ fn statik() { unsafe { assert!(K1.get().is_null()); assert!(K2.get().is_null()); - K1.set(1 as *mut _); - K2.set(2 as *mut _); + K1.set(ptr::invalid_mut(1)); + K2.set(ptr::invalid_mut(2)); assert_eq!(K1.get() as usize, 1); assert_eq!(K2.get() as usize, 2); } |