From d5366137056d53f1cb41fbf4b4c9f98c9f55096a Mon Sep 17 00:00:00 2001
From: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
Date: Wed, 9 Nov 2022 16:46:49 -0500
Subject: [PATCH] Fix merge compile issues (#3198)

---
 wgpu/src/backend/direct.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs
index 6548ce710a..ddd595e788 100644
--- a/wgpu/src/backend/direct.rs
+++ b/wgpu/src/backend/direct.rs
@@ -880,9 +880,10 @@ impl crate::GlobalId for CommandEncoder {
 }
 
 impl crate::GlobalId for Queue {
-    fn global_id(&self) -> Id {
+    #[allow(clippy::useless_conversion)] // because not(id32)
+    fn global_id(&self) -> u64 {
         use wgc::id::TypedId;
-        self.id.unzip()
+        self.id.into_raw().get().into()
     }
 }