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

Commit ce720f2

Browse files
Fix "extra mut" warning
1 parent c0adf58 commit ce720f2

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

src/boxed.rs

+3-3
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 = Box::new(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/object.rs

+11-6
Original file line numberDiff line numberDiff line change
@@ -1438,12 +1438,13 @@ 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 mut w = Box::new(mem::MaybeUninit::zeroed());
14421442
gobject_sys::g_weak_ref_init(
1443-
mut_override(&*w.0),
1443+
mut_override((&mut *w).as_mut_ptr()),
14441444
self.as_object_ref().to_glib_none().0,
14451445
);
1446-
w
1446+
1447+
WeakRef(Box::new((&mut *w).assume_init()), PhantomData)
14471448
}
14481449
}
14491450

@@ -1532,9 +1533,13 @@ pub struct WeakRef<T: ObjectType>(Box<gobject_sys::GWeakRef>, PhantomData<*const
15321533
impl<T: ObjectType> WeakRef<T> {
15331534
pub fn new() -> WeakRef<T> {
15341535
unsafe {
1535-
let w = WeakRef(Box::new(mem::MaybeUninit::zeroed().assume_init()), PhantomData);
1536-
gobject_sys::g_weak_ref_init(mut_override(&*w.0), ptr::null_mut());
1537-
w
1536+
let mut w = Box::new(mem::MaybeUninit::zeroed());
1537+
gobject_sys::g_weak_ref_init(
1538+
(&mut *w).as_mut_ptr(),
1539+
ptr::null_mut(),
1540+
);
1541+
1542+
WeakRef(Box::new((&mut *w).assume_init()), PhantomData)
15381543
}
15391544
}
15401545

src/time_val.rs

+1-1
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

+2-2
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)