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

Merge pull request #2401 from zed-industries/simplify-context-lifetimes

Browse source 
Remove unnecessary lifetime parameter from WindowContext
This commit is contained in:
Nathan Sobo 2023-04-21 14:26:26 -06:00 • committed by GitHub
commit 09111b65d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/editor/src/display_map/block_map.rs
View file

@ -80,8 +80,8 @@ pub enum BlockStyle {
Sticky, Sticky,
} }
pub struct BlockContext<'a, 'b, 'c, 'd> { pub struct BlockContext<'a, 'b, 'c> {
pub view_context: &'d mut ViewContext<'a, 'b, 'c, Editor>, pub view_context: &'c mut ViewContext<'a, 'b, Editor>,
pub anchor_x: f32, pub anchor_x: f32,
pub scroll_x: f32, pub scroll_x: f32,
pub gutter_width: f32, pub gutter_width: f32,
@ -932,15 +932,15 @@ impl BlockDisposition {
} }
} }
impl<'a, 'b, 'c, 'd> Deref for BlockContext<'a, 'b, 'c, 'd> { impl<'a, 'b, 'c> Deref for BlockContext<'a, 'b, 'c> {
type Target = ViewContext<'a, 'b, 'c, Editor>; type Target = ViewContext<'a, 'b, Editor>;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
self.view_context self.view_context
} }
} }
impl DerefMut for BlockContext<'_, '_, '_, '_> { impl DerefMut for BlockContext<'_, '_, '_> {
fn deref_mut(&mut self) -> &mut Self::Target { fn deref_mut(&mut self) -> &mut Self::Target {
self.view_context self.view_context
} }

65
crates/gpui/src/app.rs
View file

@ -69,7 +69,7 @@ pub trait Entity: 'static {
pub trait View: Entity + Sized { pub trait View: Entity + Sized {
fn ui_name() -> &'static str; fn ui_name() -> &'static str;
fn render(&mut self, cx: &mut ViewContext<'_, '_, '_, Self>) -> Element<Self>; fn render(&mut self, cx: &mut ViewContext<'_, '_, Self>) -> Element<Self>;
fn focus_in(&mut self, _: AnyViewHandle, _: &mut ViewContext<Self>) {} fn focus_in(&mut self, _: AnyViewHandle, _: &mut ViewContext<Self>) {}
fn focus_out(&mut self, _: AnyViewHandle, _: &mut ViewContext<Self>) {} fn focus_out(&mut self, _: AnyViewHandle, _: &mut ViewContext<Self>) {}
fn key_down(&mut self, _: &KeyDownEvent, _: &mut ViewContext<Self>) -> bool { fn key_down(&mut self, _: &KeyDownEvent, _: &mut ViewContext<Self>) -> bool {
@ -2518,12 +2518,7 @@ pub trait AnyView {
) -> Option<Pin<Box<dyn 'static + Future<Output = ()>>>>; ) -> Option<Pin<Box<dyn 'static + Future<Output = ()>>>>;
fn ui_name(&self) -> &'static str; fn ui_name(&self) -> &'static str;
fn render(&mut self, cx: &mut WindowContext, view_id: usize) -> Box<dyn AnyRootElement>; fn render(&mut self, cx: &mut WindowContext, view_id: usize) -> Box<dyn AnyRootElement>;
fn focus_in<'a, 'b>( fn focus_in<'a, 'b>(&mut self, focused_id: usize, cx: &mut WindowContext<'a>, view_id: usize);
&mut self,
focused_id: usize,
cx: &mut WindowContext<'a, 'b>,
view_id: usize,
);
fn focus_out(&mut self, focused_id: usize, cx: &mut WindowContext, view_id: usize); fn focus_out(&mut self, focused_id: usize, cx: &mut WindowContext, view_id: usize);
fn key_down(&mut self, event: &KeyDownEvent, cx: &mut WindowContext, view_id: usize) -> bool; fn key_down(&mut self, event: &KeyDownEvent, cx: &mut WindowContext, view_id: usize) -> bool;
fn key_up(&mut self, event: &KeyUpEvent, cx: &mut WindowContext, view_id: usize) -> bool; fn key_up(&mut self, event: &KeyUpEvent, cx: &mut WindowContext, view_id: usize) -> bool;
@ -2919,28 +2914,28 @@ impl<M> DerefMut for ModelContext<'_, M> {
} }
} }
pub struct ViewContext<'a, 'b, 'c, T: ?Sized> { pub struct ViewContext<'a, 'b, T: ?Sized> {
window_context: Reference<'c, WindowContext<'a, 'b>>, window_context: Reference<'b, WindowContext<'a>>,
view_id: usize, view_id: usize,
view_type: PhantomData<T>, view_type: PhantomData<T>,
} }
impl<'a, 'b, 'c, T: View> Deref for ViewContext<'a, 'b, 'c, T> { impl<'a, 'b, T: View> Deref for ViewContext<'a, 'b, T> {
type Target = WindowContext<'a, 'b>; type Target = WindowContext<'a>;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.window_context &self.window_context
} }
} }
impl<T: View> DerefMut for ViewContext<'_, '_, '_, T> { impl<T: View> DerefMut for ViewContext<'_, '_, T> {
fn deref_mut(&mut self) -> &mut Self::Target { fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.window_context &mut self.window_context
} }
} }
impl<'a, 'b, 'c, V: View> ViewContext<'a, 'b, 'c, V> { impl<'a, 'b, V: View> ViewContext<'a, 'b, V> {
pub(crate) fn mutable(window_context: &'c mut WindowContext<'a, 'b>, view_id: usize) -> Self { pub(crate) fn mutable(window_context: &'b mut WindowContext<'a>, view_id: usize) -> Self {
Self { Self {
window_context: Reference::Mutable(window_context), window_context: Reference::Mutable(window_context),
view_id, view_id,
@ -2948,7 +2943,7 @@ impl<'a, 'b, 'c, V: View> ViewContext<'a, 'b, 'c, V> {
} }
} }
pub(crate) fn immutable(window_context: &'c WindowContext<'a, 'b>, view_id: usize) -> Self { pub(crate) fn immutable(window_context: &'b WindowContext<'a>, view_id: usize) -> Self {
Self { Self {
window_context: Reference::Immutable(window_context), window_context: Reference::Immutable(window_context),
view_id, view_id,
@ -2956,7 +2951,7 @@ impl<'a, 'b, 'c, V: View> ViewContext<'a, 'b, 'c, V> {
} }
} }
pub fn window_context(&mut self) -> &mut WindowContext<'a, 'b> { pub fn window_context(&mut self) -> &mut WindowContext<'a> {
&mut self.window_context &mut self.window_context
} }
@ -3450,7 +3445,7 @@ impl<'a, 'b, 'c, V: View> ViewContext<'a, 'b, 'c, V> {
} }
} }
impl<V> UpgradeModelHandle for ViewContext<'_, '_, '_, V> { impl<V> UpgradeModelHandle for ViewContext<'_, '_, V> {
fn upgrade_model_handle<T: Entity>( fn upgrade_model_handle<T: Entity>(
&self, &self,
handle: &WeakModelHandle<T>, handle: &WeakModelHandle<T>,
@ -3467,7 +3462,7 @@ impl<V> UpgradeModelHandle for ViewContext<'_, '_, '_, V> {
} }
} }
impl<V> UpgradeViewHandle for ViewContext<'_, '_, '_, V> { impl<V> UpgradeViewHandle for ViewContext<'_, '_, V> {
fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> { fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> {
self.window_context.upgrade_view_handle(handle) self.window_context.upgrade_view_handle(handle)
} }
@ -3477,13 +3472,13 @@ impl<V> UpgradeViewHandle for ViewContext<'_, '_, '_, V> {
} }
} }
impl<V: View> ReadModel for ViewContext<'_, '_, '_, V> { impl<V: View> ReadModel for ViewContext<'_, '_, V> {
fn read_model<T: Entity>(&self, handle: &ModelHandle<T>) -> &T { fn read_model<T: Entity>(&self, handle: &ModelHandle<T>) -> &T {
self.window_context.read_model(handle) self.window_context.read_model(handle)
} }
} }
impl<V: View> UpdateModel for ViewContext<'_, '_, '_, V> { impl<V: View> UpdateModel for ViewContext<'_, '_, V> {
fn update_model<T: Entity, O>( fn update_model<T: Entity, O>(
&mut self, &mut self,
handle: &ModelHandle<T>, handle: &ModelHandle<T>,
@ -3493,13 +3488,13 @@ impl<V: View> UpdateModel for ViewContext<'_, '_, '_, V> {
} }
} }
impl<V: View> ReadView for ViewContext<'_, '_, '_, V> { impl<V: View> ReadView for ViewContext<'_, '_, V> {
fn read_view<T: View>(&self, handle: &ViewHandle<T>) -> &T { fn read_view<T: View>(&self, handle: &ViewHandle<T>) -> &T {
self.window_context.read_view(handle) self.window_context.read_view(handle)
} }
} }
impl<V: View> UpdateView for ViewContext<'_, '_, '_, V> { impl<V: View> UpdateView for ViewContext<'_, '_, V> {
type Output<S> = S; type Output<S> = S;
fn update_view<T, S>( fn update_view<T, S>(
@ -3514,13 +3509,13 @@ impl<V: View> UpdateView for ViewContext<'_, '_, '_, V> {
} }
} }
pub struct EventContext<'a, 'b, 'c, 'd, V: View> { pub struct EventContext<'a, 'b, 'c, V: View> {
view_context: &'d mut ViewContext<'a, 'b, 'c, V>, view_context: &'c mut ViewContext<'a, 'b, V>,
pub(crate) handled: bool, pub(crate) handled: bool,
} }
impl<'a, 'b, 'c, 'd, V: View> EventContext<'a, 'b, 'c, 'd, V> { impl<'a, 'b, 'c, V: View> EventContext<'a, 'b, 'c, V> {
pub(crate) fn new(view_context: &'d mut ViewContext<'a, 'b, 'c, V>) -> Self { pub(crate) fn new(view_context: &'c mut ViewContext<'a, 'b, V>) -> Self {
EventContext { EventContext {
view_context, view_context,
handled: true, handled: true,
@ -3532,21 +3527,21 @@ impl<'a, 'b, 'c, 'd, V: View> EventContext<'a, 'b, 'c, 'd, V> {
} }
} }
impl<'a, 'b, 'c, 'd, V: View> Deref for EventContext<'a, 'b, 'c, 'd, V> { impl<'a, 'b, 'c, V: View> Deref for EventContext<'a, 'b, 'c, V> {
type Target = ViewContext<'a, 'b, 'c, V>; type Target = ViewContext<'a, 'b, V>;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.view_context &self.view_context
} }
} }
impl<V: View> DerefMut for EventContext<'_, '_, '_, '_, V> { impl<V: View> DerefMut for EventContext<'_, '_, '_, V> {
fn deref_mut(&mut self) -> &mut Self::Target { fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.view_context &mut self.view_context
} }
} }
impl<V: View> UpdateModel for EventContext<'_, '_, '_, '_, V> { impl<V: View> UpdateModel for EventContext<'_, '_, '_, V> {
fn update_model<T: Entity, O>( fn update_model<T: Entity, O>(
&mut self, &mut self,
handle: &ModelHandle<T>, handle: &ModelHandle<T>,
@ -3556,13 +3551,13 @@ impl<V: View> UpdateModel for EventContext<'_, '_, '_, '_, V> {
} }
} }
impl<V: View> ReadView for EventContext<'_, '_, '_, '_, V> { impl<V: View> ReadView for EventContext<'_, '_, '_, V> {
fn read_view<W: View>(&self, handle: &crate::ViewHandle<W>) -> &W { fn read_view<W: View>(&self, handle: &crate::ViewHandle<W>) -> &W {
self.view_context.read_view(handle) self.view_context.read_view(handle)
} }
} }
impl<V: View> UpdateView for EventContext<'_, '_, '_, '_, V> { impl<V: View> UpdateView for EventContext<'_, '_, '_, V> {
type Output<S> = S; type Output<S> = S;
fn update_view<T, S>( fn update_view<T, S>(
@ -3577,7 +3572,7 @@ impl<V: View> UpdateView for EventContext<'_, '_, '_, '_, V> {
} }
} }
impl<V: View> UpgradeModelHandle for EventContext<'_, '_, '_, '_, V> { impl<V: View> UpgradeModelHandle for EventContext<'_, '_, '_, V> {
fn upgrade_model_handle<T: Entity>( fn upgrade_model_handle<T: Entity>(
&self, &self,
handle: &WeakModelHandle<T>, handle: &WeakModelHandle<T>,
@ -3594,7 +3589,7 @@ impl<V: View> UpgradeModelHandle for EventContext<'_, '_, '_, '_, V> {
} }
} }
impl<V: View> UpgradeViewHandle for EventContext<'_, '_, '_, '_, V> { impl<V: View> UpgradeViewHandle for EventContext<'_, '_, '_, V> {
fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> { fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> {
self.view_context.upgrade_view_handle(handle) self.view_context.upgrade_view_handle(handle)
} }
@ -4106,7 +4101,7 @@ impl AnyViewHandle {
self.view_type self.view_type
} }
pub fn debug_json<'a, 'b>(&self, cx: &'b WindowContext<'a, 'b>) -> serde_json::Value { pub fn debug_json<'a, 'b>(&self, cx: &'b WindowContext<'a>) -> serde_json::Value {
cx.views cx.views
.get(&(self.window_id, self.view_id)) .get(&(self.window_id, self.view_id))
.map_or_else(|| serde_json::Value::Null, |view| view.debug_json(cx)) .map_or_else(|| serde_json::Value::Null, |view| view.debug_json(cx))

26
crates/gpui/src/app/window.rs
View file

@ -111,15 +111,15 @@ impl Window {
} }
} }
pub struct WindowContext<'a: 'b, 'b> { pub struct WindowContext<'a> {
pub(crate) app_context: Reference<'a, AppContext>, pub(crate) app_context: Reference<'a, AppContext>,
pub(crate) window: Reference<'b, Window>, pub(crate) window: Reference<'a, Window>,
pub(crate) window_id: usize, pub(crate) window_id: usize,
pub(crate) refreshing: bool, pub(crate) refreshing: bool,
pub(crate) removed: bool, pub(crate) removed: bool,
} }
impl Deref for WindowContext<'_, '_> { impl Deref for WindowContext<'_> {
type Target = AppContext; type Target = AppContext;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
@ -127,19 +127,19 @@ impl Deref for WindowContext<'_, '_> {
} }
} }
impl DerefMut for WindowContext<'_, '_> { impl DerefMut for WindowContext<'_> {
fn deref_mut(&mut self) -> &mut Self::Target { fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.app_context &mut self.app_context
} }
} }
impl ReadModel for WindowContext<'_, '_> { impl ReadModel for WindowContext<'_> {
fn read_model<T: Entity>(&self, handle: &ModelHandle<T>) -> &T { fn read_model<T: Entity>(&self, handle: &ModelHandle<T>) -> &T {
self.app_context.read_model(handle) self.app_context.read_model(handle)
} }
} }
impl UpdateModel for WindowContext<'_, '_> { impl UpdateModel for WindowContext<'_> {
fn update_model<T: Entity, R>( fn update_model<T: Entity, R>(
&mut self, &mut self,
handle: &ModelHandle<T>, handle: &ModelHandle<T>,
@ -149,13 +149,13 @@ impl UpdateModel for WindowContext<'_, '_> {
} }
} }
impl ReadView for WindowContext<'_, '_> { impl ReadView for WindowContext<'_> {
fn read_view<W: View>(&self, handle: &crate::ViewHandle<W>) -> &W { fn read_view<W: View>(&self, handle: &crate::ViewHandle<W>) -> &W {
self.app_context.read_view(handle) self.app_context.read_view(handle)
} }
} }
impl UpdateView for WindowContext<'_, '_> { impl UpdateView for WindowContext<'_> {
type Output<S> = S; type Output<S> = S;
fn update_view<T, S>( fn update_view<T, S>(
@ -179,7 +179,7 @@ impl UpdateView for WindowContext<'_, '_> {
} }
} }
impl UpgradeModelHandle for WindowContext<'_, '_> { impl UpgradeModelHandle for WindowContext<'_> {
fn upgrade_model_handle<T: Entity>( fn upgrade_model_handle<T: Entity>(
&self, &self,
handle: &WeakModelHandle<T>, handle: &WeakModelHandle<T>,
@ -196,7 +196,7 @@ impl UpgradeModelHandle for WindowContext<'_, '_> {
} }
} }
impl UpgradeViewHandle for WindowContext<'_, '_> { impl UpgradeViewHandle for WindowContext<'_> {
fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> { fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> {
self.app_context.upgrade_view_handle(handle) self.app_context.upgrade_view_handle(handle)
} }
@ -206,10 +206,10 @@ impl UpgradeViewHandle for WindowContext<'_, '_> {
} }
} }
impl<'a: 'b, 'b> WindowContext<'a, 'b> { impl<'a> WindowContext<'a> {
pub fn mutable( pub fn mutable(
app_context: &'a mut AppContext, app_context: &'a mut AppContext,
window: &'b mut Window, window: &'a mut Window,
window_id: usize, window_id: usize,
) -> Self { ) -> Self {
Self { Self {
@ -221,7 +221,7 @@ impl<'a: 'b, 'b> WindowContext<'a, 'b> {
} }
} }
pub fn immutable(app_context: &'a AppContext, window: &'b Window, window_id: usize) -> Self { pub fn immutable(app_context: &'a AppContext, window: &'a Window, window_id: usize) -> Self {
Self { Self {
app_context: Reference::Immutable(app_context), app_context: Reference::Immutable(app_context),
window: Reference::Immutable(window), window: Reference::Immutable(window),