From 71e220b5f94c8af1ddfbc8e57182d9a51c1f6136 Mon Sep 17 00:00:00 2001 From: Matias Linares Date: Mon, 22 Jun 2020 20:33:24 -0300 Subject: Use MaybeUninit::uninit() in favor of mem::uninitialized() --- src/dotwm.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/dotwm.rs') diff --git a/src/dotwm.rs b/src/dotwm.rs index 248e969..88951b8 100644 --- a/src/dotwm.rs +++ b/src/dotwm.rs @@ -20,7 +20,7 @@ use desktop::Desktop; use std::ptr; use std::process::exit; -use std::mem::uninitialized; +use std::mem::MaybeUninit; use std::collections::HashMap; use libc::c_int; use libc::c_char; @@ -86,7 +86,7 @@ impl DotWM { let root = unsafe { xlib::XDefaultRootWindow(d) }; unsafe { - let mut attrs: xlib::XSetWindowAttributes = uninitialized(); + let mut attrs: xlib::XSetWindowAttributes = MaybeUninit::uninit().assume_init(); attrs.event_mask = xlib::SubstructureNotifyMask; xlib::XChangeWindowAttributes(d, root, xlib::CWEventMask, &mut attrs); } @@ -134,7 +134,7 @@ impl DotWM { pub fn current_desktop(&self) -> &Desktop { self.desktops.get(self.desktop_idx).unwrap() } - + /// Add a window to the current desktop pub fn add_window(&mut self, w: xlib::Window) { self.current_desktop_mut().add_window(w); @@ -212,14 +212,14 @@ impl DotWM { let old_desktop = &self.desktops[self.desktop_idx]; new_desktop.show_windows(); - // let mut do_not_propagate: xlib::XSetWindowAttributes = unsafe { uninitialized() }; + // let mut do_not_propagate: xlib::XSetWindowAttributes = unsafe { MaybeUninit::uninit().assume_init() }; // let root = root_window(self.display); // do_not_propagate.do_not_propagate_mask = xlib::SubstructureNotifyMask; // change_window_attributes(self.display, root, xlib::CWEventMask, // &mut do_not_propagate); old_desktop.hide_windows(); - // let mut root_mask: xlib::XSetWindowAttributes = unsafe { uninitialized() }; + // let mut root_mask: xlib::XSetWindowAttributes = unsafe { MaybeUninit::uninit().assume_init() }; // root_mask.event_mask = xlib::SubstructureRedirectMask|xlib::ButtonPressMask|xlib::SubstructureNotifyMask|xlib::PropertyChangeMask; // change_window_attributes(self.display, root, xlib::CWEventMask, // &mut root_mask); -- cgit v1.2.3-70-g09d2