Merge branch 'pre-merge' into clean-up-doc-elements

crates/editor2/src/editor.rs

@@ -9291,9 +9291,7 @@ impl FocusableView for Editor {
 }
 
 impl Render for Editor {
-    type Output = EditorElement;
-
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Output {
+    fn render<'a>(&mut self, cx: &mut ViewContext<'a, Self>) -> impl 'static + Element {
         let settings = ThemeSettings::get_global(cx);
         let text_style = match self.mode {
             EditorMode::SingleLine | EditorMode::AutoHeight { .. } => TextStyle {

crates/editor2/src/items.rs

@@ -7,7 +7,7 @@ use anyhow::{anyhow, Context as _, Result};
 use collections::HashSet;
 use futures::future::try_join_all;
 use gpui::{
-    div, point, AnyElement, AppContext, AsyncWindowContext, Context, Div, Entity, EntityId,
+    div, point, AnyElement, AppContext, AsyncWindowContext, Context, Entity, EntityId,
     EventEmitter, IntoElement, Model, ParentElement, Pixels, Render, SharedString, Styled,
     Subscription, Task, View, ViewContext, VisualContext, WeakView, WindowContext,
 };
@@ -1193,9 +1193,7 @@ impl CursorPosition {
 }
 
 impl Render for CursorPosition {
-    type Output = Div;
-
-    fn render(&mut self, _: &mut ViewContext<Self>) -> Self::Output {
+    fn render(&mut self, _: &mut ViewContext<Self>) -> impl Element {
         div().when_some(self.position, |el, position| {
             let mut text = format!(
                 "{}{FILE_ROW_COLUMN_DELIMITER}{}",