Use function to initialize RawWaker

Author: Matthias247

futures-test/src/task/panic_waker.rs

@@ -2,7 +2,7 @@ use futures_core::task::{Waker, RawWaker, RawWakerVTable};
 use core::cell::UnsafeCell;
 use core::ptr::null;
 
-unsafe fn noop_clone(_data: *const()) -> RawWaker {
+unsafe fn clone_panic_waker(_data: *const()) -> RawWaker {
     raw_panic_waker()
 }
 
@@ -14,16 +14,13 @@ unsafe fn wake_panic(_data: *const()) {
 }
 
 const PANIC_WAKER_VTABLE: RawWakerVTable = RawWakerVTable {
-    clone: noop_clone,
+    clone: clone_panic_waker,
     drop: noop,
     wake: wake_panic,
 };
 
 fn raw_panic_waker() -> RawWaker {
-    RawWaker {
-        data: null(),
-        vtable: &PANIC_WAKER_VTABLE,
-    }
+    RawWaker::new(null(), &PANIC_WAKER_VTABLE)
 }
 
 /// Create a new [`Waker`](futures_core::task::Waker) which will

futures-util/src/task/arc_wake.rs

@@ -37,10 +37,7 @@ pub trait ArcWake {
         let ptr = Arc::into_raw(wake) as *const();
 
         unsafe {
-            Waker::new_unchecked(RawWaker{
-                data: ptr,
-                vtable: waker_vtable!(Self),
-            })
+            Waker::new_unchecked(RawWaker::new(ptr, waker_vtable!(Self)))
         }
     }
 }
@@ -56,10 +53,7 @@ unsafe fn increase_refcount<T: ArcWake>(data: *const()) {
 
 unsafe fn clone_arc_raw<T: ArcWake>(data: *const()) -> RawWaker {
     increase_refcount::<T>(data);
-    RawWaker {
-        data: data,
-        vtable: waker_vtable!(T),
-    }
+    RawWaker::new(data, waker_vtable!(T))
 }
 
 unsafe fn drop_arc_raw<T: ArcWake>(data: *const()) {

futures-util/src/task/noop_waker.rs

@@ -17,10 +17,7 @@ const NOOP_WAKER_VTABLE: RawWakerVTable = RawWakerVTable {
 };
 
 fn noop_raw_waker() -> RawWaker {
-    RawWaker {
-        data: null(),
-        vtable: &NOOP_WAKER_VTABLE,
-    }
+    RawWaker::new(null(), &NOOP_WAKER_VTABLE)
 }
 
 /// Create a new [`Waker`](futures_core::task::Waker) which does

futures-util/src/task/waker_ref.rs

@@ -76,10 +76,8 @@ where
     let ptr = &*wake as &W as *const W as *const();
 
     let waker = unsafe {
-        Waker::new_unchecked(RawWaker{
-            data: ptr,
-            vtable: ref_vtable!(W),
-        })};
+        Waker::new_unchecked(RawWaker::new(ptr, ref_vtable!(W)))
+    };
     WakerRef::new(waker)
 }
 
@@ -97,10 +95,7 @@ unsafe fn increase_refcount<T: ArcWake>(data: *const()) {
 
 unsafe fn clone_arc_raw<T: ArcWake>(data: *const()) -> RawWaker {
     increase_refcount::<T>(data);
-    RawWaker {
-        data: data,
-        vtable: owned_vtable!(T),
-    }
+    RawWaker:new(data, owned_vtable!(T))
 }
 
 unsafe fn drop_arc_raw<T: ArcWake>(data: *const()) {