Update smithay and wayland-rs

Includes updates for split between `smithay::wayland::output` and
`smithay::output`.

src/shell/grabs.rs

@@ -18,12 +18,12 @@ use smithay::{
         },
         Seat,
     },
+    output::Output,
     reexports::{
         wayland_protocols::xdg::shell::server::xdg_toplevel::State as XdgState,
         wayland_server::protocol::wl_surface::WlSurface,
     },
     utils::{IsAlive, Logical, Physical, Point, Rectangle, Scale, Serial},
-    wayland::output::Output,
 };
 use std::cell::RefCell;
 

src/shell/layout/floating/mod.rs

@@ -6,13 +6,12 @@ use smithay::{
         pointer::{Focus, GrabStartData as PointerGrabStartData},
         Seat,
     },
+    output::Output,
     reexports::wayland_protocols::xdg::shell::server::xdg_toplevel::{
         ResizeEdge, State as XdgState,
     },
     utils::{IsAlive, Logical, Point, Rectangle, Serial},
-    wayland::{
-        compositor::with_states, output::Output, shell::xdg::XdgToplevelSurfaceRoleAttributes,
-    },
+    wayland::{compositor::with_states, shell::xdg::XdgToplevelSurfaceRoleAttributes},
 };
 use std::{collections::HashSet, sync::Mutex};
 

src/shell/layout/mod.rs

@@ -5,9 +5,8 @@ use regex::RegexSet;
 use smithay::{
     desktop::{Space, Window},
     input::Seat,
-    wayland::{
-        compositor::with_states, output::Output, shell::xdg::XdgToplevelSurfaceRoleAttributes,
-    },
+    output::Output,
+    wayland::{compositor::with_states, shell::xdg::XdgToplevelSurfaceRoleAttributes},
 };
 use std::sync::Mutex;
 

src/shell/mod.rs

@@ -3,11 +3,11 @@ use std::{cell::Cell, mem::MaybeUninit};
 use smithay::{
     desktop::{layer_map_for_output, LayerSurface, PopupManager, Window, WindowSurfaceType},
     input::{pointer::MotionEvent, Seat},
+    output::Output,
     reexports::wayland_server::{protocol::wl_surface::WlSurface, DisplayHandle},
     utils::{Logical, Point, Rectangle, SERIAL_COUNTER},
     wayland::{
         compositor::with_states,
-        output::Output,
         shell::{
             wlr_layer::{
                 KeyboardInteractivity, Layer, LayerSurfaceCachedState, WlrLayerShellState,

src/shell/workspace.rs

@@ -7,12 +7,12 @@ use crate::{
 use smithay::{
     desktop::{Kind, Space, Window, WindowSurfaceType},
     input::{pointer::GrabStartData as PointerGrabStartData, Seat},
+    output::Output,
     reexports::{
         wayland_protocols::xdg::shell::server::xdg_toplevel::{self, ResizeEdge},
         wayland_server::{protocol::wl_surface::WlSurface, DisplayHandle},
     },
     utils::{IsAlive, Serial},
-    wayland::output::Output,
 };
 use std::collections::HashMap;