From ef89ceae4d833515d39680801e1be2ea1087d7c5 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 30 Aug 2021 17:51:26 +0200 Subject: [PATCH] Take &mut self in `View::render` Co-Authored-By: Nathan Sobo --- gpui/examples/text.rs | 2 +- gpui/src/app.rs | 36 ++++++++++++++++++------------------ gpui/src/elements/list.rs | 2 +- server/src/rpc.rs | 2 +- zed/src/chat_panel.rs | 2 +- zed/src/editor.rs | 2 +- zed/src/file_finder.rs | 2 +- zed/src/project_browser.rs | 2 +- zed/src/theme_selector.rs | 2 +- zed/src/workspace.rs | 2 +- zed/src/workspace/pane.rs | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gpui/examples/text.rs b/gpui/examples/text.rs index b76d31622d..123481b991 100644 --- a/gpui/examples/text.rs +++ b/gpui/examples/text.rs @@ -28,7 +28,7 @@ impl gpui::View for TextView { "View" } - fn render(&self, _: &mut gpui::RenderContext) -> gpui::ElementBox { + fn render(&mut self, _: &mut gpui::RenderContext) -> gpui::ElementBox { TextElement.boxed() } } diff --git a/gpui/src/app.rs b/gpui/src/app.rs index c15268c102..edfed5af1d 100644 --- a/gpui/src/app.rs +++ b/gpui/src/app.rs @@ -40,7 +40,7 @@ pub trait Entity: 'static { pub trait View: Entity + Sized { fn ui_name() -> &'static str; - fn render(&self, cx: &mut RenderContext<'_, Self>) -> ElementBox; + fn render(&mut self, cx: &mut RenderContext<'_, Self>) -> ElementBox; fn on_focus(&mut self, _: &mut ViewContext) {} fn on_blur(&mut self, _: &mut ViewContext) {} fn keymap_context(&self, _: &AppContext) -> keymap::Context { @@ -817,7 +817,7 @@ impl MutableAppContext { titlebar_height: f32, refreshing: bool, ) -> Result { - let view = self + let mut view = self .cx .views .remove(&(window_id, view_id)) @@ -1863,7 +1863,7 @@ pub trait AnyView { fn release(&mut self, cx: &mut MutableAppContext); fn ui_name(&self) -> &'static str; fn render<'a>( - &self, + &mut self, window_id: usize, view_id: usize, titlebar_height: f32, @@ -1896,7 +1896,7 @@ where } fn render<'a>( - &self, + &mut self, window_id: usize, view_id: usize, titlebar_height: f32, @@ -3368,7 +3368,7 @@ mod tests { } impl super::View for View { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } @@ -3432,7 +3432,7 @@ mod tests { } impl super::View for View { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { let mouse_down_count = self.mouse_down_count.clone(); EventHandler::new(Empty::new().boxed()) .on_mouse_down(move |_| { @@ -3494,7 +3494,7 @@ mod tests { "View" } - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } } @@ -3534,7 +3534,7 @@ mod tests { } impl super::View for View { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } @@ -3590,7 +3590,7 @@ mod tests { } impl super::View for View { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } @@ -3640,7 +3640,7 @@ mod tests { } impl super::View for View { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } @@ -3684,7 +3684,7 @@ mod tests { } impl super::View for View { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } @@ -3731,7 +3731,7 @@ mod tests { } impl super::View for View { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } @@ -3789,7 +3789,7 @@ mod tests { } impl View for ViewA { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } @@ -3807,7 +3807,7 @@ mod tests { } impl View for ViewB { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } @@ -3903,7 +3903,7 @@ mod tests { } impl super::View for View { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } @@ -4038,7 +4038,7 @@ mod tests { "test view" } - fn render(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } } @@ -4083,7 +4083,7 @@ mod tests { "test view" } - fn render(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } } @@ -4106,7 +4106,7 @@ mod tests { "test view" } - fn render(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { Empty::new().boxed() } } diff --git a/gpui/src/elements/list.rs b/gpui/src/elements/list.rs index bfbb6a7b73..5c1a3495e3 100644 --- a/gpui/src/elements/list.rs +++ b/gpui/src/elements/list.rs @@ -510,7 +510,7 @@ mod tests { "TestView" } - fn render(&self, _: &mut RenderContext<'_, Self>) -> ElementBox { + fn render(&mut self, _: &mut RenderContext<'_, Self>) -> ElementBox { unimplemented!() } } diff --git a/server/src/rpc.rs b/server/src/rpc.rs index 5a0199b725..8a7f2d43af 100644 --- a/server/src/rpc.rs +++ b/server/src/rpc.rs @@ -1776,7 +1776,7 @@ mod tests { "empty view" } - fn render(&self, _: &mut gpui::RenderContext) -> gpui::ElementBox { + fn render(&mut self, _: &mut gpui::RenderContext) -> gpui::ElementBox { gpui::Element::boxed(gpui::elements::Empty) } } diff --git a/zed/src/chat_panel.rs b/zed/src/chat_panel.rs index e94f5712e5..20b6b52525 100644 --- a/zed/src/chat_panel.rs +++ b/zed/src/chat_panel.rs @@ -220,7 +220,7 @@ impl View for ChatPanel { "ChatPanel" } - fn render(&self, cx: &mut RenderContext) -> ElementBox { + fn render(&mut self, cx: &mut RenderContext) -> ElementBox { let theme = &self.settings.borrow().theme; Container::new( Flex::column() diff --git a/zed/src/editor.rs b/zed/src/editor.rs index e076c22ae4..64aa3ed430 100644 --- a/zed/src/editor.rs +++ b/zed/src/editor.rs @@ -2522,7 +2522,7 @@ impl Entity for Editor { } impl View for Editor { - fn render<'a>(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { EditorElement::new(self.handle.clone()).boxed() } diff --git a/zed/src/file_finder.rs b/zed/src/file_finder.rs index 464b7e3589..c31d617201 100644 --- a/zed/src/file_finder.rs +++ b/zed/src/file_finder.rs @@ -79,7 +79,7 @@ impl View for FileFinder { "FileFinder" } - fn render(&self, _: &mut RenderContext) -> ElementBox { + fn render(&mut self, _: &mut RenderContext) -> ElementBox { let settings = self.settings.borrow(); Align::new( diff --git a/zed/src/project_browser.rs b/zed/src/project_browser.rs index 5793b75618..796441c704 100644 --- a/zed/src/project_browser.rs +++ b/zed/src/project_browser.rs @@ -13,7 +13,7 @@ impl View for ProjectBrowser { "ProjectBrowser" } - fn render(&self, _: &mut gpui::RenderContext<'_, Self>) -> gpui::ElementBox { + fn render(&mut self, _: &mut gpui::RenderContext<'_, Self>) -> gpui::ElementBox { Empty::new().boxed() } } diff --git a/zed/src/theme_selector.rs b/zed/src/theme_selector.rs index a20ea8f758..e1e4a84c8a 100644 --- a/zed/src/theme_selector.rs +++ b/zed/src/theme_selector.rs @@ -269,7 +269,7 @@ impl View for ThemeSelector { "ThemeSelector" } - fn render(&self, cx: &mut RenderContext) -> ElementBox { + fn render(&mut self, cx: &mut RenderContext) -> ElementBox { let settings = self.settings.borrow(); Align::new( diff --git a/zed/src/workspace.rs b/zed/src/workspace.rs index 4d6e0b6b75..8fd1d60010 100644 --- a/zed/src/workspace.rs +++ b/zed/src/workspace.rs @@ -944,7 +944,7 @@ impl View for Workspace { "Workspace" } - fn render(&self, cx: &mut RenderContext) -> ElementBox { + fn render(&mut self, cx: &mut RenderContext) -> ElementBox { let settings = self.settings.borrow(); Container::new( Flex::column() diff --git a/zed/src/workspace/pane.rs b/zed/src/workspace/pane.rs index 34f44253f3..5d78b9a20e 100644 --- a/zed/src/workspace/pane.rs +++ b/zed/src/workspace/pane.rs @@ -369,7 +369,7 @@ impl View for Pane { "Pane" } - fn render(&self, cx: &mut RenderContext) -> ElementBox { + fn render(&mut self, cx: &mut RenderContext) -> ElementBox { if let Some(active_item) = self.active_item() { Flex::column() .with_child(self.render_tabs(cx))