chore: Update deps

src/wayland/protocols/output_configuration.rs

@@ -11,7 +11,7 @@ use smithay::{
             zwlr_output_mode_v1::{self, ZwlrOutputModeV1},
         },
         wayland_server::{
-            backend::{ClientId, GlobalId, ObjectId},
+            backend::{ClientId, GlobalId},
             protocol::wl_output::WlOutput,
             Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
         },
@@ -247,9 +247,9 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &Output) {
+    fn destroyed(state: &mut D, _client: ClientId, resource: &ZwlrOutputHeadV1, _data: &Output) {
         for instance in &mut state.output_configuration_state().instances {
-            instance.heads.retain(|h| h.head.id() != resource);
+            instance.heads.retain(|h| &h.head != resource);
         }
     }
 }

src/wayland/protocols/screencopy.rs

@@ -883,18 +883,18 @@ where
     fn destroyed(
         state: &mut D,
         _client: wayland_backend::server::ClientId,
-        resource: wayland_backend::server::ObjectId,
+        resource: &ZcosmicScreencopySessionV1,
         data: &SessionData,
     ) {
         if data.inner.lock().unwrap().is_cursor() {
             let session = CursorSession {
-                obj: SessionResource::Destroyed(resource),
+                obj: SessionResource::Destroyed(resource.id()),
                 data: data.clone(),
             };
             state.cursor_session_destroyed(session)
         } else {
             let session = Session {
-                obj: SessionResource::Destroyed(resource),
+                obj: SessionResource::Destroyed(resource.id()),
                 data: data.clone(),
             };
             state.session_destroyed(session)

src/wayland/protocols/toplevel_info.rs

@@ -5,7 +5,7 @@ use std::{collections::HashMap, sync::Mutex};
 use smithay::{
     output::Output,
     reexports::wayland_server::{
-        backend::{ClientId, GlobalId, ObjectId},
+        backend::{ClientId, GlobalId},
         protocol::wl_surface::WlSurface,
         Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
     },
@@ -139,11 +139,11 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &()) {
+    fn destroyed(state: &mut D, _client: ClientId, resource: &ZcosmicToplevelInfoV1, _data: &()) {
         state
             .toplevel_info_state_mut()
             .instances
-            .retain(|i| i.id() != resource);
+            .retain(|i| i != resource);
     }
 }
 
@@ -174,16 +174,12 @@ where
     fn destroyed(
         state: &mut D,
         _client: ClientId,
-        resource: ObjectId,
+        resource: &ZcosmicToplevelHandleV1,
         _data: &ToplevelHandleState<W>,
     ) {
         for toplevel in &state.toplevel_info_state_mut().toplevels {
             if let Some(state) = toplevel.user_data().get::<ToplevelState>() {
-                state
-                    .lock()
-                    .unwrap()
-                    .instances
-                    .retain(|i| i.id() != resource);
+                state.lock().unwrap().instances.retain(|i| i != resource);
             }
         }
     }

src/wayland/protocols/toplevel_management.rs

@@ -4,7 +4,7 @@ use smithay::{
     input::{Seat, SeatHandler},
     output::Output,
     reexports::wayland_server::{
-        backend::{ClientId, GlobalId, ObjectId},
+        backend::{ClientId, GlobalId},
         protocol::wl_surface::WlSurface,
         Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
     },
@@ -225,9 +225,9 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, client: ClientId, resource: ObjectId, _data: &()) {
+    fn destroyed(state: &mut D, client: ClientId, resource: &ZcosmicToplevelManagerV1, _data: &()) {
         let mng_state = state.toplevel_management_state();
-        mng_state.instances.retain(|i| i.id() != resource);
+        mng_state.instances.retain(|i| i != resource);
         if !mng_state
             .instances
             .iter()

src/wayland/protocols/workspace.rs

@@ -211,11 +211,16 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &()) {
+    fn destroyed(
+        state: &mut D,
+        _client: ClientId,
+        resource: &ZcosmicWorkspaceManagerV1,
+        _data: &(),
+    ) {
         state
             .workspace_state_mut()
             .instances
-            .retain(|i| i.id() != resource);
+            .retain(|i| i != resource);
     }
 }
 
@@ -268,9 +273,14 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &WorkspaceGroupData) {
+    fn destroyed(
+        state: &mut D,
+        _client: ClientId,
+        resource: &ZcosmicWorkspaceGroupHandleV1,
+        _data: &WorkspaceGroupData,
+    ) {
         for group in &mut state.workspace_state_mut().groups {
-            group.instances.retain(|i| i.id() != resource)
+            group.instances.retain(|i| i != resource)
         }
     }
 }
@@ -361,10 +371,15 @@ where
         }
     }
 
-    fn destroyed(state: &mut D, _client: ClientId, resource: ObjectId, _data: &WorkspaceData) {
+    fn destroyed(
+        state: &mut D,
+        _client: ClientId,
+        resource: &ZcosmicWorkspaceHandleV1,
+        _data: &WorkspaceData,
+    ) {
         for group in &mut state.workspace_state_mut().groups {
             for workspace in &mut group.workspaces {
-                workspace.instances.retain(|i| i.id() != resource)
+                workspace.instances.retain(|i| i != resource)
             }
         }
     }