@@ -2756,7 +2756,7 @@ impl ConversationEditor {
impl EventEmitter<ConversationEditorEvent> for ConversationEditor {}
impl Render for ConversationEditor {
- fn render(&mut self, cx: &mut ViewContext<Self>) -> impl Element {
+ fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
div()
.key_context("ConversationEditor")
.capture_action(cx.listener(ConversationEditor::cancel_last_assist))
@@ -2840,7 +2840,7 @@ struct InlineAssistant {
impl EventEmitter<InlineAssistantEvent> for InlineAssistant {}
impl Render for InlineAssistant {
- fn render(&mut self, cx: &mut ViewContext<Self>) -> impl Element {
+ fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
let measurements = *self.measurements.lock();
h_flex()
.w_full()
@@ -2961,7 +2961,7 @@ struct DraggedChannelView {
}
impl Render for DraggedChannelView {
- fn render(&mut self, cx: &mut ViewContext<Self>) -> impl Element {
+ fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
let ui_font = ThemeSettings::get_global(cx).ui_font.family.clone();
h_flex()
.font_family(ui_font)
@@ -87,7 +87,7 @@ struct DiagnosticGroupState {
impl EventEmitter<EditorEvent> for ProjectDiagnosticsEditor {}
impl Render for ProjectDiagnosticsEditor {
- fn render(&mut self, cx: &mut ViewContext<Self>) -> impl Element {
+ fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
let child = if self.path_states.is_empty() {
div()
.bg(cx.theme().colors().editor_background)
@@ -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<Self>) -> impl Element {
+ fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> impl IntoElement {
div().id("testview").child(
div()
.key_context("parent")
@@ -1899,7 +1899,7 @@ impl Render for ProjectPanel {
}
impl Render for DraggedProjectEntryView {
- fn render(&mut self, cx: &mut ViewContext<Self>) -> impl Element {
+ fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
let settings = ProjectPanelSettings::get_global(cx);
let ui_font = ThemeSettings::get_global(cx).ui_font.family.clone();
h_flex()