zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-18 18:08:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove failed attempt at eliminating static bounds on entities

Browse Source
This commit is contained in:
Nathan Sobo 2023-10-24 15:12:51 +02:00
parent 9f48cdac83
commit 9f9137cf76
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/gpui2/src/app/entity_map.rs
View File

@ -86,8 +86,8 @@ impl EntityMap {
.insert(lease.handle.entity_id, lease.entity.take().unwrap());
}
pub fn read<T>(&self, handle: &Handle<T>) -> &T {
(handle.downcast_entity)(&self.entities[handle.entity_id])
pub fn read<T: 'static>(&self, handle: &Handle<T>) -> &T {
self.entities[handle.entity_id].downcast_ref().unwrap()
}
pub fn take_dropped(&mut self) -> Vec<(EntityId, AnyBox)> {
@ -105,17 +105,17 @@ pub struct Lease<'a, T> {
entity_type: PhantomData<T>,
}
impl<'a, T> core::ops::Deref for Lease<'a, T> {
impl<'a, T: 'static> core::ops::Deref for Lease<'a, T> {
type Target = T;
fn deref(&self) -> &Self::Target {
(self.handle.downcast_entity)(self.entity.as_ref().unwrap())
self.entity.as_ref().unwrap().downcast_ref().unwrap()
}
}
impl<'a, T> core::ops::DerefMut for Lease<'a, T> {
impl<'a, T: 'static> core::ops::DerefMut for Lease<'a, T> {
fn deref_mut(&mut self) -> &mut Self::Target {
(self.handle.downcast_entity_mut)(self.entity.as_mut().unwrap())
self.entity.as_mut().unwrap().downcast_mut().unwrap()
}
}
@ -163,8 +163,6 @@ impl AnyHandle {
Some(Handle {
any_handle: self.clone(),
entity_type: PhantomData,
downcast_entity: |any| any.downcast_ref().unwrap(),
downcast_entity_mut: |any| any.downcast_mut().unwrap(),
})
} else {
None
@ -238,8 +236,6 @@ pub struct Handle<T> {
#[deref_mut]
any_handle: AnyHandle,
entity_type: PhantomData<T>,
downcast_entity: fn(&dyn Any) -> &T,
downcast_entity_mut: fn(&mut dyn Any) -> &mut T,
}
unsafe impl<T> Send for Handle<T> {}
@ -253,8 +249,6 @@ impl<T: 'static> Handle<T> {
Self {
any_handle: AnyHandle::new(id, TypeId::of::<T>(), entity_map),
entity_type: PhantomData,
downcast_entity: |any| any.downcast_ref().unwrap(),
downcast_entity_mut: |any| any.downcast_mut().unwrap(),
}
}
@ -262,8 +256,6 @@ impl<T: 'static> Handle<T> {
WeakHandle {
any_handle: self.any_handle.downgrade(),
entity_type: self.entity_type,
downcast_entity: self.downcast_entity,
downcast_entity_mut: self.downcast_entity_mut,
}
}
@ -293,8 +285,6 @@ impl<T> Clone for Handle<T> {
Self {
any_handle: self.any_handle.clone(),
entity_type: self.entity_type,
downcast_entity: self.downcast_entity,
downcast_entity_mut: self.downcast_entity_mut,
}
}
}
@ -386,8 +376,6 @@ pub struct WeakHandle<T> {
#[deref_mut]
any_handle: AnyWeakHandle,
entity_type: PhantomData<T>,
downcast_entity: fn(&dyn Any) -> &T,
pub(crate) downcast_entity_mut: fn(&mut dyn Any) -> &mut T,
}
unsafe impl<T> Send for WeakHandle<T> {}
@ -398,8 +386,6 @@ impl<T> Clone for WeakHandle<T> {
Self {
any_handle: self.any_handle.clone(),
entity_type: self.entity_type,
downcast_entity: self.downcast_entity,
downcast_entity_mut: self.downcast_entity_mut,
}
}
}
@ -409,8 +395,6 @@ impl<T: 'static> WeakHandle<T> {
Some(Handle {
any_handle: self.any_handle.upgrade()?,
entity_type: self.entity_type,
downcast_entity: self.downcast_entity,
downcast_entity_mut: self.downcast_entity_mut,
})
}