Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some stray Send bounds

Browse source
This commit is contained in:
Antonio Scandurra 2023-11-02 09:18:16 +01:00
parent 18fcb41292
commit b2c7ddc41f
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/gpui2/src/app/async_context.rs
View file

@ -254,7 +254,7 @@ impl VisualContext for AsyncWindowContext {
build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V,
) -> Self::Result<View<V>> ) -> Self::Result<View<V>>
where where
V: 'static + Send + Render, V: Render,
{ {
self.window self.window
.update(self, |_, cx| cx.replace_root_view(build_view)) .update(self, |_, cx| cx.replace_root_view(build_view))

2
crates/gpui2/src/gpui2.rs
View file

@ -113,7 +113,7 @@ pub trait VisualContext: Context {
build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V,
) -> Self::Result<View<V>> ) -> Self::Result<View<V>>
where where
V: 'static + Send + Render; V: Render;
} }
pub trait Entity<T>: Sealed { pub trait Entity<T>: Sealed {

24
crates/gpui2/src/window.rs
View file

@ -1310,7 +1310,7 @@ impl VisualContext for WindowContext<'_> {
build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V, build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V,
) -> Self::Result<View<V>> ) -> Self::Result<View<V>>
where where
V: 'static + Send + Render, V: Render,
{ {
let slot = self.app.entities.reserve(); let slot = self.app.entities.reserve();
let view = View { let view = View {
@ -1598,7 +1598,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
pub fn observe<V2, E>( pub fn observe<V2, E>(
&mut self, &mut self,
entity: &E, entity: &E,
mut on_notify: impl FnMut(&mut V, E, &mut ViewContext<'_, V>) + Send + 'static, mut on_notify: impl FnMut(&mut V, E, &mut ViewContext<'_, V>) + 'static,
) -> Subscription ) -> Subscription
where where
V2: 'static, V2: 'static,
@ -1629,7 +1629,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
pub fn subscribe<V2, E>( pub fn subscribe<V2, E>(
&mut self, &mut self,
entity: &E, entity: &E,
mut on_event: impl FnMut(&mut V, E, &V2::Event, &mut ViewContext<'_, V>) + Send + 'static, mut on_event: impl FnMut(&mut V, E, &V2::Event, &mut ViewContext<'_, V>) + 'static,
) -> Subscription ) -> Subscription
where where
V2: EventEmitter, V2: EventEmitter,
@ -1659,7 +1659,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
pub fn on_release( pub fn on_release(
&mut self, &mut self,
on_release: impl FnOnce(&mut V, &mut WindowContext) + Send + 'static, on_release: impl FnOnce(&mut V, &mut WindowContext) + 'static,
) -> Subscription { ) -> Subscription {
let window_handle = self.window.handle; let window_handle = self.window.handle;
self.app.release_listeners.insert( self.app.release_listeners.insert(
@ -1674,10 +1674,10 @@ impl<'a, V: 'static> ViewContext<'a, V> {
pub fn observe_release<V2, E>( pub fn observe_release<V2, E>(
&mut self, &mut self,
entity: &E, entity: &E,
mut on_release: impl FnMut(&mut V, &mut V2, &mut ViewContext<'_, V>) + Send + 'static, mut on_release: impl FnMut(&mut V, &mut V2, &mut ViewContext<'_, V>) + 'static,
) -> Subscription ) -> Subscription
where where
V: Any + Send, V: 'static,
V2: 'static, V2: 'static,
E: Entity<V2>, E: Entity<V2>,
{ {
@ -1704,7 +1704,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
pub fn on_focus_changed( pub fn on_focus_changed(
&mut self, &mut self,
listener: impl Fn(&mut V, &FocusEvent, &mut ViewContext<V>) + Send + 'static, listener: impl Fn(&mut V, &FocusEvent, &mut ViewContext<V>) + 'static,
) { ) {
let handle = self.view().downgrade(); let handle = self.view().downgrade();
self.window.focus_listeners.push(Box::new(move |event, cx| { self.window.focus_listeners.push(Box::new(move |event, cx| {
@ -1814,7 +1814,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
pub fn update_global<G, R>(&mut self, f: impl FnOnce(&mut G, &mut Self) -> R) -> R pub fn update_global<G, R>(&mut self, f: impl FnOnce(&mut G, &mut Self) -> R) -> R
where where
G: 'static + Send, G: 'static,
{ {
let mut global = self.app.lease_global::<G>(); let mut global = self.app.lease_global::<G>();
let result = f(&mut global, self); let result = f(&mut global, self);
@ -1824,7 +1824,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
pub fn observe_global<G: 'static>( pub fn observe_global<G: 'static>(
&mut self, &mut self,
f: impl Fn(&mut V, &mut ViewContext<'_, V>) + Send + 'static, f: impl Fn(&mut V, &mut ViewContext<'_, V>) + 'static,
) -> Subscription { ) -> Subscription {
let window_handle = self.window.handle; let window_handle = self.window.handle;
let view = self.view().downgrade(); let view = self.view().downgrade();
@ -1854,7 +1854,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
impl<V> ViewContext<'_, V> impl<V> ViewContext<'_, V>
where where
V: EventEmitter, V: EventEmitter,
V::Event: 'static + Send, V::Event: 'static,
{ {
pub fn emit(&mut self, event: V::Event) { pub fn emit(&mut self, event: V::Event) {
let emitter = self.view.model.entity_id; let emitter = self.view.model.entity_id;
@ -1904,7 +1904,7 @@ impl<V: 'static> VisualContext for ViewContext<'_, V> {
view: &View<V2>, view: &View<V2>,
update: impl FnOnce(&mut V2, &mut ViewContext<'_, V2>) -> R, update: impl FnOnce(&mut V2, &mut ViewContext<'_, V2>) -> R,
) -> Self::Result<R> { ) -> Self::Result<R> {
VisualContext::update_view(&mut self.window_cx, view, update) self.window_cx.update_view(view, update)
} }
fn replace_root_view<W>( fn replace_root_view<W>(
@ -1912,7 +1912,7 @@ impl<V: 'static> VisualContext for ViewContext<'_, V> {
build_view: impl FnOnce(&mut ViewContext<'_, W>) -> W, build_view: impl FnOnce(&mut ViewContext<'_, W>) -> W,
) -> Self::Result<View<W>> ) -> Self::Result<View<W>>
where where
W: 'static + Send + Render, W: Render,
{ {
self.window_cx.replace_root_view(build_view) self.window_cx.replace_root_view(build_view)
} }