From 565e5fdfeb05a0fea8dd207c9e637185f5084aa4 Mon Sep 17 00:00:00 2001
From: psincf <44228825+psincf@users.noreply.github.com>
Date: Wed, 1 May 2019 12:15:23 +0200
Subject: [PATCH] make trait TypedId:From<Id>

---
 wgpu-native/src/hub.rs | 10 +++++-----
 wgpu-native/src/lib.rs | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wgpu-native/src/hub.rs b/wgpu-native/src/hub.rs
index 941b8b37db..f07e5ec1e4 100644
--- a/wgpu-native/src/hub.rs
+++ b/wgpu-native/src/hub.rs
@@ -137,13 +137,13 @@ impl<T, I:TypedId> Storage<T, I> {
     }
 }
 
-pub struct Registry<T, I:TypedId + From<Id>> {
+pub struct Registry<T, I:TypedId> {
     #[cfg(feature = "local")]
     identity: Mutex<IdentityManager>,
     data: RwLock<Storage<T, I>>,
 }
 
-impl<T, I: TypedId + From<Id>> Default for Registry<T, I> {
+impl<T, I: TypedId> Default for Registry<T, I> {
     fn default() -> Self {
         Registry {
             #[cfg(feature = "local")]
@@ -153,20 +153,20 @@ impl<T, I: TypedId + From<Id>> Default for Registry<T, I> {
     }
 }
 
-impl<T, I: TypedId + From<Id>> ops::Deref for Registry<T, I> {
+impl<T, I: TypedId> ops::Deref for Registry<T, I> {
     type Target = RwLock<Storage<T, I>>;
     fn deref(&self) -> &Self::Target {
         &self.data
     }
 }
 
-impl<T, I: TypedId + From<Id>> ops::DerefMut for Registry<T, I> {
+impl<T, I: TypedId> ops::DerefMut for Registry<T, I> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.data
     }
 }
 
-impl<T, I: TypedId + From<Id> + Clone> Registry<T, I> {
+impl<T, I: TypedId + Clone> Registry<T, I> {
     pub fn register(&self, id: I, value: T) {
         let old = self.data.write().map.insert(id.raw().0 as usize, (value, id.raw().1));
         assert!(old.is_none());
diff --git a/wgpu-native/src/lib.rs b/wgpu-native/src/lib.rs
index 7493304a7d..fb6638e6e7 100644
--- a/wgpu-native/src/lib.rs
+++ b/wgpu-native/src/lib.rs
@@ -185,22 +185,22 @@ macro_rules! transparent {
     )
 }
 
-pub trait TypedId {
+pub trait TypedId:From<Id> {
     fn raw(&self) -> Id;
 }
 
 macro_rules! typed_id {
-    ($i:ident) => (
-        impl TypedId for $i {
-            fn raw(&self) -> Id {
-                self.0
-            }
-        } 
+    ($i:ident) => ( 
         impl From<Id> for $i {
             fn from(id:Id) -> $i {
                 $i(id)
             }
         }
+        impl TypedId for $i {
+            fn raw(&self) -> Id {
+                self.0
+            }
+        }
     )
 }