From a3acd48cc37de9a120fc3f79003f70b1d9448889 Mon Sep 17 00:00:00 2001 From: Victor Brekenfeld Date: Sat, 8 Dec 2018 18:31:08 +0100 Subject: [PATCH] fmt: rust 1.31 --- anvil/src/glium_drawer.rs | 15 ++++-- anvil/src/input_handler.rs | 12 +++-- anvil/src/udev.rs | 9 ++-- anvil/src/winit.rs | 3 +- build.rs | 6 ++- src/backend/drm/gbm/mod.rs | 6 ++- src/backend/drm/gbm/session.rs | 9 ++-- src/backend/drm/gbm/surface.rs | 10 ++-- src/backend/drm/legacy/mod.rs | 55 ++++++++++++---------- src/backend/drm/legacy/surface.rs | 12 +++-- src/backend/egl/mod.rs | 7 +-- src/backend/libinput.rs | 25 +++++----- src/backend/session/dbus/logind.rs | 12 +++-- src/backend/session/direct.rs | 9 ++-- src/backend/udev.rs | 6 ++- src/wayland/data_device/dnd_grab.rs | 6 ++- src/wayland/data_device/mod.rs | 6 ++- src/wayland/data_device/server_dnd_grab.rs | 3 +- src/wayland/seat/keyboard.rs | 3 +- src/wayland/shell/legacy/wl_handlers.rs | 3 +- src/wayland/shell/xdg/mod.rs | 6 ++- src/wayland/shell/xdg/xdg_handlers.rs | 24 ++++++---- src/wayland/shell/xdg/zxdgv6_handlers.rs | 24 ++++++---- src/xwayland/xserver.rs | 3 +- 24 files changed, 164 insertions(+), 110 deletions(-) diff --git a/anvil/src/glium_drawer.rs b/anvil/src/glium_drawer.rs index b10e7e1..440ed5a 100644 --- a/anvil/src/glium_drawer.rs +++ b/anvil/src/glium_drawer.rs @@ -78,7 +78,8 @@ impl> + GLGraphicsBackend + 'static> GliumDrawer tex_coords: [1.0, 0.0], }, ], - ).unwrap(); + ) + .unwrap(); // building the index buffer let index_buffer = @@ -121,7 +122,8 @@ impl> + GLGraphicsBackend + 'static> GliumDrawer tex_coords: [1.0, 0.0], }, ], - ).unwrap(); + ) + .unwrap(); // building the index buffer let index_buffer = @@ -165,7 +167,8 @@ impl GliumDrawer { MipmapsOption::NoMipmap, images.width, images.height, - ).unwrap(); + ) + .unwrap(); unsafe { images .bind_to_texture(0, opengl_texture.get_id()) @@ -261,7 +264,8 @@ impl GliumDrawer { blend: blending, ..Default::default() }, - ).unwrap(); + ) + .unwrap(); } #[inline] @@ -338,7 +342,8 @@ impl GliumDrawer { TraversalAction::SkipChildren } }, - ).unwrap(); + ) + .unwrap(); } }); } diff --git a/anvil/src/input_handler.rs b/anvil/src/input_handler.rs index 689f707..cdb397f 100644 --- a/anvil/src/input_handler.rs +++ b/anvil/src/input_handler.rs @@ -132,12 +132,14 @@ impl InputHandler for AnvilInputHandler { self.running.store(false, Ordering::SeqCst); } #[cfg(feature = "udev")] - KeyAction::VtSwitch(vt) => if let Some(ref mut session) = self.session { - info!(log, "Trying to switch to vt {}", vt); - if let Err(err) = session.change_vt(vt) { - error!(log, "Error switching to vt {}: {}", vt, err); + KeyAction::VtSwitch(vt) => { + if let Some(ref mut session) = self.session { + info!(log, "Trying to switch to vt {}", vt); + if let Err(err) = session.change_vt(vt) { + error!(log, "Error switching to vt {}: {}", vt, err); + } } - }, + } KeyAction::Run(cmd) => { info!(self.log, "Starting program"; "cmd" => cmd.clone()); if let Err(e) = Command::new(&cmd).spawn() { diff --git a/anvil/src/udev.rs b/anvil/src/udev.rs index 49122e8..ffe09fa 100644 --- a/anvil/src/udev.rs +++ b/anvil/src/udev.rs @@ -130,7 +130,8 @@ pub fn run_udev(mut display: Display, mut event_loop: EventLoop<()>, log: Logger }, seat.clone(), log.clone(), - ).map_err(|_| ())?; + ) + .map_err(|_| ())?; /* * Initialize wayland clipboard @@ -151,7 +152,8 @@ pub fn run_udev(mut display: Display, mut event_loop: EventLoop<()>, log: Logger let keyboard = w_seat .add_keyboard(XkbConfig::default(), 1000, 500, |seat, focus| { set_data_device_focus(seat, focus.and_then(|s| s.client())) - }).expect("Failed to initialize the keyboard"); + }) + .expect("Failed to initialize the keyboard"); /* * Initialize a fake output (we render one screen to every device in this example) @@ -366,7 +368,8 @@ impl UdevHandler for UdevHandlerImpl .open( &path, OFlag::O_RDWR | OFlag::O_CLOEXEC | OFlag::O_NOCTTY | OFlag::O_NONBLOCK, - ).ok() + ) + .ok() .and_then(|fd| LegacyDrmDevice::new(SessionFd(fd), self.logger.clone()).ok()) .and_then(|drm| GbmDevice::new(drm, self.logger.clone()).ok()) .and_then(|gbm| EglDevice::new(gbm, self.logger.clone()).ok()) diff --git a/anvil/src/winit.rs b/anvil/src/winit.rs index 2c3c2b0..f405e4a 100644 --- a/anvil/src/winit.rs +++ b/anvil/src/winit.rs @@ -59,7 +59,8 @@ pub fn run_winit(display: &mut Display, event_loop: &mut EventLoop<()>, log: Log let keyboard = seat .add_keyboard(XkbConfig::default(), 1000, 500, |seat, focus| { set_data_device_focus(seat, focus.and_then(|s| s.client())) - }).expect("Failed to initialize the keyboard"); + }) + .expect("Failed to initialize the keyboard"); let (output, _) = Output::new( display, diff --git a/build.rs b/build.rs index 28ac1cf..dbd1dec 100644 --- a/build.rs +++ b/build.rs @@ -33,7 +33,8 @@ fn main() { "EGL_EXT_platform_device", "EGL_KHR_image_base", ], - ).write_bindings(gl_generator::GlobalGenerator, &mut file) + ) + .write_bindings(gl_generator::GlobalGenerator, &mut file) .unwrap(); } @@ -45,7 +46,8 @@ fn main() { Profile::Compatibility, Fallbacks::None, ["GL_OES_EGL_image"], - ).write_bindings(gl_generator::StructGenerator, &mut file) + ) + .write_bindings(gl_generator::StructGenerator, &mut file) .unwrap(); } } diff --git a/src/backend/drm/gbm/mod.rs b/src/backend/drm/gbm/mod.rs index ed3eeb1..7298d7c 100644 --- a/src/backend/drm/gbm/mod.rs +++ b/src/backend/drm/gbm/mod.rs @@ -149,7 +149,8 @@ impl Device for GbmDevice { h as u32, GbmFormat::XRGB8888, BufferObjectFlags::SCANOUT | BufferObjectFlags::RENDERING, - ).chain_err(|| ErrorKind::SurfaceCreationFailed)?; + ) + .chain_err(|| ErrorKind::SurfaceCreationFailed)?; // initialize a buffer for the cursor image let cursor = Cell::new(( @@ -160,7 +161,8 @@ impl Device for GbmDevice { 1, GbmFormat::ARGB8888, BufferObjectFlags::CURSOR | BufferObjectFlags::WRITE, - ).chain_err(|| ErrorKind::BufferCreationFailed)?, + ) + .chain_err(|| ErrorKind::BufferCreationFailed)?, (0, 0), )); diff --git a/src/backend/drm/gbm/session.rs b/src/backend/drm/gbm/session.rs index 4d3bd82..0777cf4 100644 --- a/src/backend/drm/gbm/session.rs +++ b/src/backend/drm/gbm/session.rs @@ -61,16 +61,15 @@ impl, - (u32, u32), - ) = unsafe { &*backend.cursor.as_ptr() }; + let &(ref cursor, ref hotspot): &(BufferObject<()>, (u32, u32)) = + unsafe { &*backend.cursor.as_ptr() }; if crtc::set_cursor2( &*backend.dev.borrow(), *crtc, cursor, ((*hotspot).0 as i32, (*hotspot).1 as i32), - ).is_err() + ) + .is_err() { if let Err(err) = crtc::set_cursor(&*backend.dev.borrow(), *crtc, cursor) { error!(self.logger, "Failed to reset cursor. Error: {}", err); diff --git a/src/backend/drm/gbm/surface.rs b/src/backend/drm/gbm/surface.rs index 96a98eb..62a7ea2 100644 --- a/src/backend/drm/gbm/surface.rs +++ b/src/backend/drm/gbm/surface.rs @@ -103,7 +103,8 @@ impl GbmSurfaceInternal { h as u32, GbmFormat::XRGB8888, BufferObjectFlags::SCANOUT | BufferObjectFlags::RENDERING, - ).chain_err(|| ErrorKind::SurfaceCreationFailed)?; + ) + .chain_err(|| ErrorKind::SurfaceCreationFailed)?; // Clean up buffers if let Some(Ok(Some(fb))) = self.next_buffer.take().map(|mut bo| bo.take_userdata()) { @@ -185,7 +186,7 @@ impl<'a, D: RawDevice + 'static> CursorBackend<'a> for GbmSurfaceInternal where ::Surface: CursorBackend<'a>, <::Surface as CursorBackend<'a>>::CursorFormat: Buffer, - <::Surface as CursorBackend<'a>>::Error: ::std::error::Error + Send + <::Surface as CursorBackend<'a>>::Error: ::std::error::Error + Send { */ // @@ -195,7 +196,7 @@ impl<'a, D: RawDevice + 'static> GraphicsBackend<'a> for GbmSurfaceInternal where ::Surface: CursorBackend<'a>, <::Surface as CursorBackend<'a>>::CursorFormat=&'a Buffer, - <::Surface as CursorBackend<'a>>::Error: ::std::error::Error + Send + <::Surface as CursorBackend<'a>>::Error: ::std::error::Error + Send { */ // But for now got to do this: @@ -231,7 +232,8 @@ impl<'a, A: AsRawFd + 'static> CursorBackend<'a> for GbmSurfaceInternal Device for LegacyDrmDevice { fn process_events(&mut self) { match crtc::receive_events(self) { - Ok(events) => for event in events { - if let crtc::Event::PageFlip(event) = event { - if self.active.load(Ordering::SeqCst) { - if self - .backends - .borrow() - .get(&event.crtc) - .iter() - .flat_map(|x| x.upgrade()) - .next() - .is_some() - { - trace!(self.logger, "Handling event for backend {:?}", event.crtc); - if let Some(handler) = self.handler.as_ref() { - handler.borrow_mut().vblank(event.crtc); + Ok(events) => { + for event in events { + if let crtc::Event::PageFlip(event) = event { + if self.active.load(Ordering::SeqCst) { + if self + .backends + .borrow() + .get(&event.crtc) + .iter() + .flat_map(|x| x.upgrade()) + .next() + .is_some() + { + trace!(self.logger, "Handling event for backend {:?}", event.crtc); + if let Some(handler) = self.handler.as_ref() { + handler.borrow_mut().vblank(event.crtc); + } + } else { + self.backends.borrow_mut().remove(&event.crtc); } - } else { - self.backends.borrow_mut().remove(&event.crtc); } } } - }, - Err(err) => if let Some(handler) = self.handler.as_ref() { - handler.borrow_mut().error( - ResultExt::<()>::chain_err(Err(err), || { - ErrorKind::DrmDev(format!("Error processing drm events on {:?}", self.dev_path())) - }).unwrap_err(), - ); - }, + } + Err(err) => { + if let Some(handler) = self.handler.as_ref() { + handler.borrow_mut().error( + ResultExt::<()>::chain_err(Err(err), || { + ErrorKind::DrmDev(format!("Error processing drm events on {:?}", self.dev_path())) + }) + .unwrap_err(), + ); + } + } } } diff --git a/src/backend/drm/legacy/surface.rs b/src/backend/drm/legacy/surface.rs index f05b618..3ea3b5b 100644 --- a/src/backend/drm/legacy/surface.rs +++ b/src/backend/drm/legacy/surface.rs @@ -102,7 +102,8 @@ impl Surface for LegacyDrmSurfaceInternal { encoder::Info::load_from_device(self, *encoder).chain_err(|| { ErrorKind::DrmDev(format!("Error loading encoder info on {:?}", self.dev_path())) }) - }).collect::>>()?; + }) + .collect::>>()?; // and if any encoder supports the selected crtc let resource_handles = self.resource_handles().chain_err(|| { @@ -137,7 +138,8 @@ impl Surface for LegacyDrmSurfaceInternal { if !connector::Info::load_from_device(self, *connector) .chain_err(|| { ErrorKind::DrmDev(format!("Error loading connector info on {:?}", self.dev_path())) - })?.modes() + })? + .modes() .contains(&mode) { bail!(ErrorKind::ModeNotSuitable(mode)); @@ -201,7 +203,8 @@ impl RawSurface for LegacyDrmSurfaceInternal { .collect::>(), (0, 0), pending.mode, - ).chain_err(|| { + ) + .chain_err(|| { ErrorKind::DrmDev(format!( "Error setting crtc {:?} on {:?}", self.crtc, @@ -222,7 +225,8 @@ impl RawSurface for LegacyDrmSurfaceInternal { self.crtc, framebuffer, &[crtc::PageFlipFlags::PageFlipEvent], - ).map_err(|_| SwapBuffersError::ContextLost) + ) + .map_err(|_| SwapBuffersError::ContextLost) } } diff --git a/src/backend/egl/mod.rs b/src/backend/egl/mod.rs index 57d4f6d..c5d29bd 100644 --- a/src/backend/egl/mod.rs +++ b/src/backend/egl/mod.rs @@ -37,12 +37,7 @@ pub use self::context::EGLContext; pub mod error; use self::error::*; -#[allow( - non_camel_case_types, - dead_code, - unused_mut, - non_upper_case_globals -)] +#[allow(non_camel_case_types, dead_code, unused_mut, non_upper_case_globals)] pub mod ffi; use self::ffi::egl::types::EGLImage; diff --git a/src/backend/libinput.rs b/src/backend/libinput.rs index 95de7d3..d700b5a 100644 --- a/src/backend/libinput.rs +++ b/src/backend/libinput.rs @@ -24,10 +24,7 @@ use wayland_server::calloop::{ // No idea if this is the same across unix platforms // Lets make this linux exclusive for now, once someone tries to build it for // any BSD-like system, they can verify if this is right and make a PR to change this. -#[cfg(all( - any(target_os = "linux", target_os = "android"), - feature = "backend_session" -))] +#[cfg(all(any(target_os = "linux", target_os = "android"), feature = "backend_session"))] const INPUT_MAJOR: u32 = 13; /// Libinput based `InputBackend`. @@ -448,16 +445,18 @@ impl backend::InputBackend for LibinputInputBackend { libinput::Event::Keyboard(keyboard_event) => { use input::event::keyboard::*; match keyboard_event { - KeyboardEvent::Key(key_event) => if let Some(ref mut handler) = self.handler { - let device_seat = key_event.device().seat(); - if let Some(ref seat) = self.seats.get(&device_seat) { - trace!(self.logger, "Calling on_keyboard_key with {:?}", key_event); - handler.on_keyboard_key(seat, key_event); - } else { - warn!(self.logger, "Received key event of non existing Seat"); - continue; + KeyboardEvent::Key(key_event) => { + if let Some(ref mut handler) = self.handler { + let device_seat = key_event.device().seat(); + if let Some(ref seat) = self.seats.get(&device_seat) { + trace!(self.logger, "Calling on_keyboard_key with {:?}", key_event); + handler.on_keyboard_key(seat, key_event); + } else { + warn!(self.logger, "Received key event of non existing Seat"); + continue; + } } - }, + } } } libinput::Event::Pointer(pointer_event) => { diff --git a/src/backend/session/dbus/logind.rs b/src/backend/session/dbus/logind.rs index 9930985..9450bc6 100644 --- a/src/backend/session/dbus/logind.rs +++ b/src/backend/session/dbus/logind.rs @@ -101,7 +101,8 @@ impl LogindSession { "org.freedesktop.login1.Manager", "GetSession", Some(vec![session_id.clone().into()]), - )?.get1::>() + )? + .get1::>() .chain_err(|| ErrorKind::UnexpectedMethodReturn)?; // Match all signals that we want to receive and handle @@ -342,7 +343,8 @@ impl Session for LogindSession { (major(stat.st_rdev) as u32).into(), (minor(stat.st_rdev) as u32).into(), ]), - )?.get2::(); + )? + .get2::(); let fd = fd.chain_err(|| ErrorKind::UnexpectedMethodReturn)?.into_fd(); Ok(fd) } else { @@ -363,7 +365,8 @@ impl Session for LogindSession { (major(stat.st_rdev) as u32).into(), (minor(stat.st_rdev) as u32).into(), ]), - ).map(|_| ()) + ) + .map(|_| ()) } else { bail!(ErrorKind::SessionLost) } @@ -390,7 +393,8 @@ impl Session for LogindSession { "org.freedesktop.login1.Seat", "SwitchTo", Some(vec![(vt_num as u32).into()]), - ).map(|_| ()) + ) + .map(|_| ()) } else { bail!(ErrorKind::SessionLost) } diff --git a/src/backend/session/direct.rs b/src/backend/session/direct.rs index d879731..cdb60d6 100644 --- a/src/backend/session/direct.rs +++ b/src/backend/session/direct.rs @@ -185,8 +185,10 @@ impl DirectSession { path, fcntl::OFlag::O_RDWR | fcntl::OFlag::O_CLOEXEC, Mode::empty(), - ).chain_err(|| ErrorKind::FailedToOpenTTY(String::from(path.to_string_lossy()))) - }).unwrap_or_else(|| { + ) + .chain_err(|| ErrorKind::FailedToOpenTTY(String::from(path.to_string_lossy()))) + }) + .unwrap_or_else(|| { dup(0 /*stdin*/).chain_err(|| ErrorKind::FailedToOpenTTY(String::from(""))) })?; @@ -429,7 +431,8 @@ pub fn direct_session_bind( .insert_source(source, { let notifier = notifier.clone(); move |_, _| notifier.borrow_mut().signal_received() - }).map_err(move |e| { + }) + .map_err(move |e| { // the backend in the closure should already have been dropped let notifier = Rc::try_unwrap(fail_notifier) .unwrap_or_else(|_| unreachable!()) diff --git a/src/backend/udev.rs b/src/backend/udev.rs index 0bdc487..cc2f901 100644 --- a/src/backend/udev.rs +++ b/src/backend/udev.rs @@ -73,7 +73,8 @@ impl UdevBackend { warn!(log, "Unable to get id of {:?}, Error: {:?}. Skipping", path, err); None } - }).collect(); + }) + .collect(); let mut builder = MonitorBuilder::new(context)?; builder.match_subsystem("drm")?; @@ -217,6 +218,7 @@ pub fn all_gpus>(context: &Context, seat: S) -> UdevResult(&self.wl_surface, |data| match data.pending_state { XdgSurfacePendingState::Toplevel(ref state) => Some(state.clone()), _ => None, - }).ok() + }) + .ok() .and_then(|x| x) } } @@ -782,7 +783,8 @@ where .with_role_data::(&self.wl_surface, |data| match data.pending_state { XdgSurfacePendingState::Popup(ref state) => Some(state.clone()), _ => None, - }).ok() + }) + .ok() .and_then(|x| x) } } diff --git a/src/wayland/shell/xdg/xdg_handlers.rs b/src/wayland/shell/xdg/xdg_handlers.rs index d5dc724..dd722cb 100644 --- a/src/wayland/shell/xdg/xdg_handlers.rs +++ b/src/wayland/shell/xdg/xdg_handlers.rs @@ -217,7 +217,8 @@ where "xdg_surface was destroyed before its role object".into(), ); } - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); } fn xdg_surface_implementation( @@ -244,7 +245,8 @@ fn xdg_surface_implementation( min_size: (0, 0), max_size: (0, 0), }); - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); let toplevel = id.implement_nonsend( toplevel_implementation::, Some(destroy_toplevel::), @@ -286,7 +288,8 @@ fn xdg_surface_implementation( parent: parent_surface, positioner: positioner_data.borrow().clone(), }); - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); let popup = id.implement_nonsend( xg_popup_implementation::, Some(destroy_popup::), @@ -315,7 +318,8 @@ fn xdg_surface_implementation( .compositor_token .with_role_data::(&data.wl_surface, |data| { data.window_geometry = Some(Rectangle { x, y, width, height }); - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); } xdg_surface::Request::AckConfigure { serial } => { data.shell_data @@ -336,7 +340,8 @@ fn xdg_surface_implementation( ); } role_data.configured = true; - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); } } } @@ -369,7 +374,8 @@ fn with_surface_toplevel_data( .with_role_data::(&toplevel_data.wl_surface, |data| match data.pending_state { XdgSurfacePendingState::Toplevel(ref mut toplevel_data) => f(toplevel_data), _ => unreachable!(), - }).expect("xdg_toplevel exists but surface has not shell_surface role?!"); + }) + .expect("xdg_toplevel exists but surface has not shell_surface role?!"); } pub fn send_toplevel_configure( @@ -539,7 +545,8 @@ where .with_role_data::(&data.wl_surface, |data| { data.pending_state = XdgSurfacePendingState::None; data.configured = false; - }).expect("xdg_toplevel exists but surface has not shell_surface role?!"); + }) + .expect("xdg_toplevel exists but surface has not shell_surface role?!"); } // remove this surface from the known ones (as well as any leftover dead surface) data.shell_data @@ -627,7 +634,8 @@ where .with_role_data::(&data.wl_surface, |data| { data.pending_state = XdgSurfacePendingState::None; data.configured = false; - }).expect("xdg_popup exists but surface has not shell_surface role?!"); + }) + .expect("xdg_popup exists but surface has not shell_surface role?!"); } // remove this surface from the known ones (as well as any leftover dead surface) data.shell_data diff --git a/src/wayland/shell/xdg/zxdgv6_handlers.rs b/src/wayland/shell/xdg/zxdgv6_handlers.rs index 1621146..eb8cc17 100644 --- a/src/wayland/shell/xdg/zxdgv6_handlers.rs +++ b/src/wayland/shell/xdg/zxdgv6_handlers.rs @@ -236,7 +236,8 @@ where "xdg_surface was destroyed before its role object".into(), ); } - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); } fn xdg_surface_implementation( @@ -263,7 +264,8 @@ fn xdg_surface_implementation( min_size: (0, 0), max_size: (0, 0), }); - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); let toplevel = id.implement_nonsend( toplevel_implementation::, Some(destroy_toplevel::), @@ -302,7 +304,8 @@ fn xdg_surface_implementation( parent: Some(parent_data.wl_surface.clone()), positioner: positioner_data.borrow().clone(), }); - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); let popup = id.implement_nonsend( popup_implementation::, Some(destroy_popup::), @@ -331,7 +334,8 @@ fn xdg_surface_implementation( .compositor_token .with_role_data::(&data.wl_surface, |data| { data.window_geometry = Some(Rectangle { x, y, width, height }); - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); } zxdg_surface_v6::Request::AckConfigure { serial } => { data.shell_data @@ -352,7 +356,8 @@ fn xdg_surface_implementation( ); } role_data.configured = true; - }).expect("xdg_surface exists but surface has not shell_surface role?!"); + }) + .expect("xdg_surface exists but surface has not shell_surface role?!"); } } } @@ -382,7 +387,8 @@ where .with_role_data::(&data.wl_surface, |data| match data.pending_state { XdgSurfacePendingState::Toplevel(ref mut toplevel_data) => f(toplevel_data), _ => unreachable!(), - }).expect("xdg_toplevel exists but surface has not shell_surface role?!"); + }) + .expect("xdg_toplevel exists but surface has not shell_surface role?!"); } pub fn send_toplevel_configure( @@ -553,7 +559,8 @@ where .with_role_data::(&data.wl_surface, |data| { data.pending_state = XdgSurfacePendingState::None; data.configured = false; - }).expect("xdg_toplevel exists but surface has not shell_surface role?!"); + }) + .expect("xdg_toplevel exists but surface has not shell_surface role?!"); } // remove this surface from the known ones (as well as any leftover dead surface) data.shell_data @@ -644,7 +651,8 @@ where .with_role_data::(&data.wl_surface, |data| { data.pending_state = XdgSurfacePendingState::None; data.configured = false; - }).expect("xdg_popup exists but surface has not shell_surface role?!"); + }) + .expect("xdg_popup exists but surface has not shell_surface role?!"); } // remove this surface from the known ones (as well as any leftover dead surface) data.shell_data diff --git a/src/xwayland/xserver.rs b/src/xwayland/xserver.rs index 868129c..32eb4c2 100644 --- a/src/xwayland/xserver.rs +++ b/src/xwayland/xserver.rs @@ -97,7 +97,8 @@ impl XWayland { debug_assert!(evt.signal() == Signal::SIGUSR1); xwayland_ready(&inner); }, - ).map_err(|_| ()) + ) + .map_err(|_| ()) }), wayland_display: display, instance: None,