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

Commit 2ec63a3

Browse files
Fix "extra mut" warning
1 parent c0adf58 commit 2ec63a3

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/boxed.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,10 +366,10 @@ 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::MaybeUninit::zeroed().assume_init());
370-
MM::init(&mut *inner);
369+
let mut inner = mem::MaybeUninit::zeroed();
370+
MM::init(inner.as_mut_ptr());
371371

372-
AnyBox::Native(inner)
372+
AnyBox::Native(Box::new(inner.assume_init()))
373373
},
374374
_dummy: PhantomData,
375375
}

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::MaybeUninit::zeroed().assume_init() };
96+
let mut s_args: [Value; 10] = unsafe { mem::zeroed() };
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,7 +1391,7 @@ impl<T: ObjectType> ObjectExt for T {
13911391
}
13921392

13931393
let mut v_args: Vec<Value>;
1394-
let mut s_args: [Value; 10] = mem::MaybeUninit::zeroed().assume_init();
1394+
let mut s_args: [Value; 10] = mem::zeroed();
13951395
let self_v = {
13961396
let mut v = Value::uninitialized();
13971397
gobject_sys::g_value_init(v.to_glib_none_mut().0, self.get_type().to_glib());
@@ -1438,7 +1438,7 @@ impl<T: ObjectType> ObjectExt for T {
14381438

14391439
fn downgrade(&self) -> WeakRef<T> {
14401440
unsafe {
1441-
let w = WeakRef(Box::new(mem::MaybeUninit::zeroed().assume_init()), PhantomData);
1441+
let w = WeakRef(Box::new(mem::zeroed()), PhantomData);
14421442
gobject_sys::g_weak_ref_init(
14431443
mut_override(&*w.0),
14441444
self.as_object_ref().to_glib_none().0,
@@ -1532,7 +1532,7 @@ pub struct WeakRef<T: ObjectType>(Box<gobject_sys::GWeakRef>, PhantomData<*const
15321532
impl<T: ObjectType> WeakRef<T> {
15331533
pub fn new() -> WeakRef<T> {
15341534
unsafe {
1535-
let w = WeakRef(Box::new(mem::MaybeUninit::zeroed().assume_init()), PhantomData);
1535+
let w = WeakRef(Box::new(mem::zeroed()), PhantomData);
15361536
gobject_sys::g_weak_ref_init(mut_override(&*w.0), ptr::null_mut());
15371537
w
15381538
}
@@ -1562,7 +1562,7 @@ impl<T: ObjectType> Drop for WeakRef<T> {
15621562
impl<T: ObjectType> Clone for WeakRef<T> {
15631563
fn clone(&self) -> Self {
15641564
unsafe {
1565-
let c = WeakRef(Box::new(mem::MaybeUninit::zeroed().assume_init()), PhantomData);
1565+
let c = WeakRef(Box::new(mem::zeroed()), PhantomData);
15661566

15671567
let o = gobject_sys::g_weak_ref_get(mut_override(&*self.0));
15681568
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::MaybeUninit::zeroed().assume_init()
30+
mem::zeroed()
3131
}
3232
}

src/value.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ impl Value {
199199
}
200200

201201
#[doc(hidden)]
202-
pub fn into_raw(mut self) -> gobject_sys::GValue {
202+
pub fn into_raw(self) -> gobject_sys::GValue {
203203
unsafe {
204204
let ret = ptr::read(&self.0);
205205
mem::forget(self);
@@ -273,7 +273,7 @@ impl From<SendValue> for Value {
273273

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

0 commit comments

Comments
 (0)