github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

make trait TypedId:From<Id>

Browse Source
This commit is contained in:
psincf
2019-05-01 12:15:23 +02:00
parent f7794fd82b
commit 565e5fdfeb
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wgpu-native/src/hub.rs
View File

@@ -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());

14
wgpu-native/src/lib.rs
View File

@@ -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
}
}
)
}