diff options
| author | Paul Dicker <pitdicker@gmail.com> | 2019-11-24 16:28:01 +0100 |
|---|---|---|
| committer | Paul Dicker <pitdicker@gmail.com> | 2019-11-24 16:49:50 +0100 |
| commit | 23c5e584e0ea40a6f630be0d4c5151b67ba96dd1 (patch) | |
| tree | 83cffabffd33ec4a699fe48192a8293656a37ebe | |
| parent | 3b1c742e23648260e60f87d67aa47e1f43d0cc0d (diff) | |
| download | rust-23c5e584e0ea40a6f630be0d4c5151b67ba96dd1.tar.gz rust-23c5e584e0ea40a6f630be0d4c5151b67ba96dd1.zip | |
Use as_mut_ptr instead of casts
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/wasm/alloc.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/wasm/condvar_atomics.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/wasm/mutex_atomics.rs | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 927fd2a6b0b..98464763882 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -234,6 +234,7 @@ #![feature(allocator_internals)] #![feature(allow_internal_unsafe)] #![feature(allow_internal_unstable)] +#![feature(atomic_mut_ptr)] #![feature(arbitrary_self_types)] #![feature(array_error_internals)] #![feature(asm)] diff --git a/src/libstd/sys/wasm/alloc.rs b/src/libstd/sys/wasm/alloc.rs index c1af6ec1262..05e55334ac0 100644 --- a/src/libstd/sys/wasm/alloc.rs +++ b/src/libstd/sys/wasm/alloc.rs @@ -67,7 +67,7 @@ mod lock { // // unsafe { // let r = core::arch::wasm32::i32_atomic_wait( - // &LOCKED as *const AtomicI32 as *mut i32, + // LOCKED.as_mut_ptr(), // 1, // expected value // -1, // timeout // ); @@ -143,7 +143,7 @@ mod lock { // // unsafe { // core::arch::wasm32::atomic_notify( - // &LOCKED as *const AtomicI32 as *mut i32, + // LOCKED.as_mut_ptr(), // 1, // only one thread // ); // } diff --git a/src/libstd/sys/wasm/condvar_atomics.rs b/src/libstd/sys/wasm/condvar_atomics.rs index 580d2121844..f452bbd3487 100644 --- a/src/libstd/sys/wasm/condvar_atomics.rs +++ b/src/libstd/sys/wasm/condvar_atomics.rs @@ -89,6 +89,6 @@ impl Condvar { #[inline] fn ptr(&self) -> *mut i32 { assert_eq!(mem::size_of::<usize>(), mem::size_of::<i32>()); - &self.cnt as *const AtomicUsize as *mut i32 + self.cnt.as_mut_ptr() as *mut i32 } } diff --git a/src/libstd/sys/wasm/mutex_atomics.rs b/src/libstd/sys/wasm/mutex_atomics.rs index 0e4f3d80aa9..cddd584dd22 100644 --- a/src/libstd/sys/wasm/mutex_atomics.rs +++ b/src/libstd/sys/wasm/mutex_atomics.rs @@ -56,7 +56,7 @@ impl Mutex { #[inline] fn ptr(&self) -> *mut i32 { assert_eq!(mem::size_of::<usize>(), mem::size_of::<i32>()); - &self.locked as *const AtomicUsize as *mut isize as *mut i32 + self.locked.as_mut_ptr() as *mut i32 } } @@ -145,6 +145,6 @@ impl ReentrantMutex { #[inline] fn ptr(&self) -> *mut i32 { - &self.owner as *const AtomicU32 as *mut i32 + self.owner.as_mut_ptr() as *mut i32 } } |