diff --git a/wayland-cursor/src/lib.rs b/wayland-cursor/src/lib.rs index 7154ca67bb9..275d71fe669 100644 --- a/wayland-cursor/src/lib.rs +++ b/wayland-cursor/src/lib.rs @@ -86,7 +86,9 @@ pub struct CursorTheme { fallback: Option, } -struct FallBack(Box Option>>); +type FallBackInner = Box Option>>; + +struct FallBack(FallBackInner); impl FallBack { fn new(fallback: F) -> Self @@ -195,9 +197,7 @@ impl CursorTheme { None => { let cursor = match self.load_cursor(name, self.size) { None => { - let Some(ref fallback) = self.fallback else { - return None; - }; + let fallback = self.fallback.as_ref()?; let data = fallback.0(name, self.size)?; let images = xparser::parse_xcursor(&data)?; let conn = Connection::from_backend(self.backend.upgrade()?); @@ -221,10 +221,10 @@ impl CursorTheme { /// # use wayland_cursor::CursorTheme; /// # use wayland_client::{Connection, backend::InvalidId, protocol::wl_shm}; /// # fn example(conn: &Connection, shm: wl_shm::WlShm, size: u32) -> Result { - /// let mut theme = CursorTheme::load_or(conn, shm, "default", size); - /// theme.set_callback(|name, size| { - /// include_bytes!("./icons/default") - /// }); + /// # let mut theme = CursorTheme::load_or(conn, shm, "default", size); + /// # theme.set_callback(|name, size| { + /// # include_bytes!("./icons/default") + /// # }); /// # } /// ``` pub fn set_callback(&mut self, fallback: F)