diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs index 8d8b5dbdb39a8ee41ccefae348471f92d58ec69a..7e11c56687612a730ad545d68cf414e98168e429 100644 --- a/crates/assistant/src/assistant_panel.rs +++ b/crates/assistant/src/assistant_panel.rs @@ -2756,7 +2756,7 @@ impl ConversationEditor { impl EventEmitter for ConversationEditor {} impl Render for ConversationEditor { - fn render(&mut self, cx: &mut ViewContext) -> impl Element { + fn render(&mut self, cx: &mut ViewContext) -> impl IntoElement { div() .key_context("ConversationEditor") .capture_action(cx.listener(ConversationEditor::cancel_last_assist)) @@ -2840,7 +2840,7 @@ struct InlineAssistant { impl EventEmitter for InlineAssistant {} impl Render for InlineAssistant { - fn render(&mut self, cx: &mut ViewContext) -> impl Element { + fn render(&mut self, cx: &mut ViewContext) -> impl IntoElement { let measurements = *self.measurements.lock(); h_flex() .w_full() diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs index 9f0144529f6a5633e24e937482dcee6f90ec83e7..a6095039876d1b5df89e3802c5412ba6ae60f013 100644 --- a/crates/collab_ui/src/collab_panel.rs +++ b/crates/collab_ui/src/collab_panel.rs @@ -2961,7 +2961,7 @@ struct DraggedChannelView { } impl Render for DraggedChannelView { - fn render(&mut self, cx: &mut ViewContext) -> impl Element { + fn render(&mut self, cx: &mut ViewContext) -> impl IntoElement { let ui_font = ThemeSettings::get_global(cx).ui_font.family.clone(); h_flex() .font_family(ui_font) diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs index 28f89f8f330919c2ca6fefcf1567bd6e681750a1..f0357463c48b7d586d2e504f517c167f72e91876 100644 --- a/crates/diagnostics/src/diagnostics.rs +++ b/crates/diagnostics/src/diagnostics.rs @@ -87,7 +87,7 @@ struct DiagnosticGroupState { impl EventEmitter for ProjectDiagnosticsEditor {} impl Render for ProjectDiagnosticsEditor { - fn render(&mut self, cx: &mut ViewContext) -> impl Element { + fn render(&mut self, cx: &mut ViewContext) -> impl IntoElement { let child = if self.path_states.is_empty() { div() .bg(cx.theme().colors().editor_background) diff --git a/crates/gpui/src/interactive.rs b/crates/gpui/src/interactive.rs index c92b58bebcdbf61ce6136f0c086d42c767e2d172..81ec52bfc71abe4b6e45eadc48f7de2d9401f5e5 100644 --- a/crates/gpui/src/interactive.rs +++ b/crates/gpui/src/interactive.rs @@ -440,8 +440,8 @@ impl PlatformInput { mod test { use crate::{ - self as gpui, div, Element, FocusHandle, InteractiveElement, IntoElement, KeyBinding, - Keystroke, ParentElement, Render, TestAppContext, VisualContext, + self as gpui, div, FocusHandle, InteractiveElement, IntoElement, KeyBinding, Keystroke, + ParentElement, Render, TestAppContext, VisualContext, }; struct TestView { @@ -453,7 +453,7 @@ mod test { actions!(test, [TestAction]); impl Render for TestView { - fn render(&mut self, cx: &mut gpui::ViewContext) -> impl Element { + fn render(&mut self, cx: &mut gpui::ViewContext) -> impl IntoElement { div().id("testview").child( div() .key_context("parent") diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index 2bd15192afc4b0647170cc337245a290c6ffb5e1..fe4acccc86f4a4b5efb25bd3314c38f241514b23 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -1899,7 +1899,7 @@ impl Render for ProjectPanel { } impl Render for DraggedProjectEntryView { - fn render(&mut self, cx: &mut ViewContext) -> impl Element { + fn render(&mut self, cx: &mut ViewContext) -> impl IntoElement { let settings = ProjectPanelSettings::get_global(cx); let ui_font = ThemeSettings::get_global(cx).ui_font.family.clone(); h_flex()