Skip to content
This repository was archived by the owner on Jun 8, 2021. It is now read-only.

Commit c0adf58

Browse files
Replace zeroed with MaybeUninit::zeroed
1 parent d97731c commit c0adf58

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

src/boxed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ impl<T: 'static, MM: BoxedMemoryManager<T>> Uninitialized for Boxed<T, MM> {
366366
unsafe fn uninitialized() -> Self {
367367
Boxed {
368368
inner: {
369-
let mut inner = Box::<T>::new(mem::zeroed());
369+
let mut inner = Box::<T>::new(mem::MaybeUninit::zeroed().assume_init());
370370
MM::init(&mut *inner);
371371

372372
AnyBox::Native(inner)

src/closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl Closure {
9393
let mut result = unsafe { Value::uninitialized() };
9494

9595
let v_args: Vec<Value>;
96-
let mut s_args: [Value; 10] = unsafe { mem::zeroed() };
96+
let mut s_args: [Value; 10] = unsafe { mem::MaybeUninit::zeroed().assume_init() };
9797
let values = if values.len() <= 10 {
9898
for (i, arg) in values.iter().enumerate() {
9999
s_args[i] = arg.to_value();

src/object.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,8 +1269,9 @@ impl<T: ObjectType> ObjectExt for T {
12691269
return Err(glib_bool_error!("Signal not found"));
12701270
}
12711271

1272-
let mut details = mem::zeroed();
1273-
gobject_sys::g_signal_query(signal_id, &mut details);
1272+
let mut details = mem::MaybeUninit::zeroed();
1273+
gobject_sys::g_signal_query(signal_id, details.as_mut_ptr());
1274+
let details = details.assume_init();
12741275
if details.signal_id != signal_id {
12751276
return Err(glib_bool_error!("Signal not found"));
12761277
}
@@ -1370,8 +1371,9 @@ impl<T: ObjectType> ObjectExt for T {
13701371
return Err(glib_bool_error!("Signal not found"));
13711372
}
13721373

1373-
let mut details = mem::zeroed();
1374-
gobject_sys::g_signal_query(signal_id, &mut details);
1374+
let mut details = mem::MaybeUninit::zeroed();
1375+
gobject_sys::g_signal_query(signal_id, details.as_mut_ptr());
1376+
let details = details.assume_init();
13751377
if details.signal_id != signal_id {
13761378
return Err(glib_bool_error!("Signal not found"));
13771379
}
@@ -1389,7 +1391,7 @@ impl<T: ObjectType> ObjectExt for T {
13891391
}
13901392

13911393
let mut v_args: Vec<Value>;
1392-
let mut s_args: [Value; 10] = mem::zeroed();
1394+
let mut s_args: [Value; 10] = mem::MaybeUninit::zeroed().assume_init();
13931395
let self_v = {
13941396
let mut v = Value::uninitialized();
13951397
gobject_sys::g_value_init(v.to_glib_none_mut().0, self.get_type().to_glib());
@@ -1436,7 +1438,7 @@ impl<T: ObjectType> ObjectExt for T {
14361438

14371439
fn downgrade(&self) -> WeakRef<T> {
14381440
unsafe {
1439-
let w = WeakRef(Box::new(mem::zeroed()), PhantomData);
1441+
let w = WeakRef(Box::new(mem::MaybeUninit::zeroed().assume_init()), PhantomData);
14401442
gobject_sys::g_weak_ref_init(
14411443
mut_override(&*w.0),
14421444
self.as_object_ref().to_glib_none().0,
@@ -1530,7 +1532,7 @@ pub struct WeakRef<T: ObjectType>(Box<gobject_sys::GWeakRef>, PhantomData<*const
15301532
impl<T: ObjectType> WeakRef<T> {
15311533
pub fn new() -> WeakRef<T> {
15321534
unsafe {
1533-
let w = WeakRef(Box::new(mem::zeroed()), PhantomData);
1535+
let w = WeakRef(Box::new(mem::MaybeUninit::zeroed().assume_init()), PhantomData);
15341536
gobject_sys::g_weak_ref_init(mut_override(&*w.0), ptr::null_mut());
15351537
w
15361538
}
@@ -1560,7 +1562,7 @@ impl<T: ObjectType> Drop for WeakRef<T> {
15601562
impl<T: ObjectType> Clone for WeakRef<T> {
15611563
fn clone(&self) -> Self {
15621564
unsafe {
1563-
let c = WeakRef(Box::new(mem::zeroed()), PhantomData);
1565+
let c = WeakRef(Box::new(mem::MaybeUninit::zeroed().assume_init()), PhantomData);
15641566

15651567
let o = gobject_sys::g_weak_ref_get(mut_override(&*self.0));
15661568
gobject_sys::g_weak_ref_init(mut_override(&*c.0), o);

src/time_val.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ impl<'a> ToGlibPtrMut<'a, *mut glib_sys::GTimeVal> for TimeVal {
2727

2828
impl Uninitialized for TimeVal {
2929
unsafe fn uninitialized() -> TimeVal {
30-
mem::zeroed()
30+
mem::MaybeUninit::zeroed().assume_init()
3131
}
3232
}

src/value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ impl From<SendValue> for Value {
273273

274274
impl Uninitialized for Value {
275275
unsafe fn uninitialized() -> Value {
276-
Value(mem::zeroed(), PhantomData)
276+
Value(mem::MaybeUninit::zeroed().assume_init(), PhantomData)
277277
}
278278
}
279279

0 commit comments

Comments
 (0)