Remove UpgradeViewHandle trait

Co-authored-by: Nathan Sobo <nathan@zed.dev>

crates/gpui/src/app.rs

@@ -121,8 +121,8 @@ pub trait View: Entity + Sized {
     }
 }
 
-pub trait AccessAppContext {
+pub trait BorrowAppContext {
-    fn read<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T;
+    fn read_with<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T;
     fn update<T, F: FnOnce(&mut AppContext) -> T>(&mut self, f: F) -> T;
 }
 
@@ -411,9 +411,9 @@ impl AsyncAppContext {
     }
 }
 
-impl AccessAppContext for AsyncAppContext {
+impl BorrowAppContext for AsyncAppContext {
-    fn read<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
+    fn read_with<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
-        self.0.borrow().read(f)
+        self.0.borrow().read_with(f)
     }
 
     fn update<T, F: FnOnce(&mut AppContext) -> T>(&mut self, f: F) -> T {
@@ -448,16 +448,6 @@ impl UpgradeModelHandle for AsyncAppContext {
     }
 }
 
-impl UpgradeViewHandle for AsyncAppContext {
-    fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> {
-        self.0.borrow_mut().upgrade_view_handle(handle)
-    }
-
-    fn upgrade_any_view_handle(&self, handle: &AnyWeakViewHandle) -> Option<AnyViewHandle> {
-        self.0.borrow_mut().upgrade_any_view_handle(handle)
-    }
-}
-
 impl ReadModelWith for AsyncAppContext {
     fn read_model_with<E: Entity, T>(
         &self,
@@ -1470,6 +1460,31 @@ impl AppContext {
         }
     }
 
+    fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> {
+        if self.ref_counts.lock().is_entity_alive(handle.view_id) {
+            Some(ViewHandle::new(
+                handle.window_id,
+                handle.view_id,
+                &self.ref_counts,
+            ))
+        } else {
+            None
+        }
+    }
+
+    fn upgrade_any_view_handle(&self, handle: &AnyWeakViewHandle) -> Option<AnyViewHandle> {
+        if self.ref_counts.lock().is_entity_alive(handle.view_id) {
+            Some(AnyViewHandle::new(
+                handle.window_id,
+                handle.view_id,
+                handle.view_type,
+                self.ref_counts.clone(),
+            ))
+        } else {
+            None
+        }
+    }
+
     fn remove_dropped_entities(&mut self) {
         loop {
             let (dropped_models, dropped_views, dropped_element_states) =
@@ -2104,8 +2119,8 @@ impl AppContext {
     }
 }
 
-impl AccessAppContext for AppContext {
+impl BorrowAppContext for AppContext {
-    fn read<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
+    fn read_with<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
         f(self)
     }
 
@@ -2168,33 +2183,6 @@ impl UpgradeModelHandle for AppContext {
     }
 }
 
-impl UpgradeViewHandle for AppContext {
-    fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> {
-        if self.ref_counts.lock().is_entity_alive(handle.view_id) {
-            Some(ViewHandle::new(
-                handle.window_id,
-                handle.view_id,
-                &self.ref_counts,
-            ))
-        } else {
-            None
-        }
-    }
-
-    fn upgrade_any_view_handle(&self, handle: &AnyWeakViewHandle) -> Option<AnyViewHandle> {
-        if self.ref_counts.lock().is_entity_alive(handle.view_id) {
-            Some(AnyViewHandle::new(
-                handle.window_id,
-                handle.view_id,
-                handle.view_type,
-                self.ref_counts.clone(),
-            ))
-        } else {
-            None
-        }
-    }
-}
-
 #[derive(Debug)]
 pub enum ParentId {
     View(usize),
@@ -3452,9 +3440,9 @@ impl<'a, 'b, V: View> ViewContext<'a, 'b, V> {
     }
 }
 
-impl<V> AccessAppContext for ViewContext<'_, '_, V> {
+impl<V> BorrowAppContext for ViewContext<'_, '_, V> {
-    fn read<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
+    fn read_with<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
-        self.window_context.read(f)
+        self.window_context.read_with(f)
     }
 
     fn update<T, F: FnOnce(&mut AppContext) -> T>(&mut self, f: F) -> T {
@@ -3479,16 +3467,6 @@ impl<V> UpgradeModelHandle for ViewContext<'_, '_, V> {
     }
 }
 
-impl<V> UpgradeViewHandle for ViewContext<'_, '_, V> {
-    fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> {
-        self.window_context.upgrade_view_handle(handle)
-    }
-
-    fn upgrade_any_view_handle(&self, handle: &AnyWeakViewHandle) -> Option<AnyViewHandle> {
-        self.window_context.upgrade_any_view_handle(handle)
-    }
-}
-
 impl<V: View> UpdateModel for ViewContext<'_, '_, V> {
     fn update_model<T: Entity, O>(
         &mut self,
@@ -3588,16 +3566,6 @@ impl<V: View> UpgradeModelHandle for EventContext<'_, '_, '_, V> {
     }
 }
 
-impl<V: View> UpgradeViewHandle for EventContext<'_, '_, '_, V> {
-    fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> {
-        self.view_context.upgrade_view_handle(handle)
-    }
-
-    fn upgrade_any_view_handle(&self, handle: &AnyWeakViewHandle) -> Option<AnyViewHandle> {
-        self.view_context.upgrade_any_view_handle(handle)
-    }
-}
-
 pub(crate) enum Reference<'a, T> {
     Immutable(&'a T),
     Mutable(&'a mut T),
@@ -4282,13 +4250,13 @@ impl<V: View> WeakViewHandle<V> {
         self.any_handle
     }
 
-    pub fn upgrade(&self, cx: &impl AccessAppContext) -> Option<ViewHandle<V>> {
+    pub fn upgrade(&self, cx: &impl BorrowAppContext) -> Option<ViewHandle<V>> {
-        cx.read(|cx| cx.upgrade_view_handle(self))
+        cx.read_with(|cx| cx.upgrade_view_handle(self))
     }
 
     pub fn update<T>(
         &self,
-        cx: &mut impl AccessAppContext,
+        cx: &mut impl BorrowAppContext,
         update: impl FnOnce(&mut V, &mut ViewContext<V>) -> T,
     ) -> Option<T> {
         cx.update(|cx| {
@@ -4342,8 +4310,8 @@ impl AnyWeakViewHandle {
         self.view_id
     }
 
-    pub fn upgrade(&self, cx: &impl UpgradeViewHandle) -> Option<AnyViewHandle> {
+    pub fn upgrade(&self, cx: &impl BorrowAppContext) -> Option<AnyViewHandle> {
-        cx.upgrade_any_view_handle(self)
+        cx.read_with(|cx| cx.upgrade_any_view_handle(self))
     }
 }
 

crates/gpui/src/app/window.rs

@@ -13,11 +13,10 @@ use crate::{
     },
     text_layout::TextLayoutCache,
     util::post_inc,
-    AccessAppContext, Action, AnyModelHandle, AnyView, AnyViewHandle, AnyWeakModelHandle,
+    Action, AnyModelHandle, AnyView, AnyViewHandle, AnyWeakModelHandle, AppContext,
-    AnyWeakViewHandle, AppContext, Effect, Element, Entity, Handle, ModelContext, ModelHandle,
+    BorrowAppContext, Effect, Element, Entity, Handle, ModelContext, ModelHandle, MouseRegion,
-    MouseRegion, MouseRegionId, ParentId, SceneBuilder, Subscription, UpdateModel, UpdateView,
+    MouseRegionId, ParentId, SceneBuilder, Subscription, UpdateModel, UpdateView,
-    UpgradeModelHandle, View, ViewContext, ViewHandle, WeakModelHandle, WeakViewHandle,
+    UpgradeModelHandle, View, ViewContext, ViewHandle, WeakModelHandle, WindowInvalidation,
-    WindowInvalidation,
 };
 use anyhow::{anyhow, bail, Result};
 use collections::{HashMap, HashSet};
@@ -133,9 +132,9 @@ impl DerefMut for WindowContext<'_> {
     }
 }
 
-impl AccessAppContext for WindowContext<'_> {
+impl BorrowAppContext for WindowContext<'_> {
-    fn read<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
+    fn read_with<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
-        self.app_context.read(f)
+        self.app_context.read_with(f)
     }
 
     fn update<T, F: FnOnce(&mut AppContext) -> T>(&mut self, f: F) -> T {
@@ -194,16 +193,6 @@ impl UpgradeModelHandle for WindowContext<'_> {
     }
 }
 
-impl UpgradeViewHandle for WindowContext<'_> {
-    fn upgrade_view_handle<T: View>(&self, handle: &WeakViewHandle<T>) -> Option<ViewHandle<T>> {
-        self.app_context.upgrade_view_handle(handle)
-    }
-
-    fn upgrade_any_view_handle(&self, handle: &AnyWeakViewHandle) -> Option<AnyViewHandle> {
-        self.app_context.upgrade_any_view_handle(handle)
-    }
-}
-
 impl<'a> WindowContext<'a> {
     pub fn mutable(
         app_context: &'a mut AppContext,