From 5b254b03df3e3d108f0cfead80b0d46087eec895 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 13 Nov 2023 11:10:00 -0500
Subject: [PATCH 1/2] Move `Sized` bound to `StyledExt` trait

---
 crates/ui2/src/styled_ext.rs | 42 ++++++++----------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/crates/ui2/src/styled_ext.rs b/crates/ui2/src/styled_ext.rs
index 06352fa44b..3d6af476a4 100644
--- a/crates/ui2/src/styled_ext.rs
+++ b/crates/ui2/src/styled_ext.rs
@@ -12,31 +12,22 @@ fn elevated<E: Styled, V: 'static>(this: E, cx: &mut ViewContext<V>, index: Elev
 }
 
 /// Extends [`Styled`](gpui::Styled) with Zed specific styling methods.
-pub trait StyledExt: Styled {
+pub trait StyledExt: Styled + Sized {
     /// Horizontally stacks elements.
     ///
     /// Sets `flex()`, `flex_row()`, `items_center()`
-    fn h_flex(self) -> Self
-    where
-        Self: Sized,
-    {
+    fn h_flex(self) -> Self {
         self.flex().flex_row().items_center()
     }
 
     /// Vertically stacks elements.
     ///
     /// Sets `flex()`, `flex_col()`
-    fn v_flex(self) -> Self
-    where
-        Self: Sized,
-    {
+    fn v_flex(self) -> Self {
         self.flex().flex_col()
     }
 
-    fn text_ui_size(self, size: UITextSize) -> Self
-    where
-        Self: Sized,
-    {
+    fn text_ui_size(self, size: UITextSize) -> Self {
         let size = size.rems();
 
         self.text_size(size)
@@ -49,10 +40,7 @@ pub trait StyledExt: Styled {
     /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
     ///
     /// Use [`text_ui_sm`] for regular-sized text.
-    fn text_ui(self) -> Self
-    where
-        Self: Sized,
-    {
+    fn text_ui(self) -> Self {
         let size = UITextSize::default().rems();
 
         self.text_size(size)
@@ -65,10 +53,7 @@ pub trait StyledExt: Styled {
     /// Note: The absolute size of this text will change based on a user's `ui_scale` setting.
     ///
     /// Use [`text_ui`] for regular-sized text.
-    fn text_ui_sm(self) -> Self
-    where
-        Self: Sized,
-    {
+    fn text_ui_sm(self) -> Self {
         let size = UITextSize::Small.rems();
 
         self.text_size(size)
@@ -79,10 +64,7 @@ pub trait StyledExt: Styled {
     /// Sets `bg()`, `rounded_lg()`, `border()`, `border_color()`, `shadow()`
     ///
     /// Example Elements: Title Bar, Panel, Tab Bar, Editor
-    fn elevation_1<V: 'static>(self, cx: &mut ViewContext<V>) -> Self
-    where
-        Self: Styled + Sized,
-    {
+    fn elevation_1<V: 'static>(self, cx: &mut ViewContext<V>) -> Self {
         elevated(self, cx, ElevationIndex::Surface)
     }
 
@@ -91,10 +73,7 @@ pub trait StyledExt: Styled {
     /// Sets `bg()`, `rounded_lg()`, `border()`, `border_color()`, `shadow()`
     ///
     /// Examples: Notifications, Palettes, Detached/Floating Windows, Detached/Floating Panels
-    fn elevation_2<V: 'static>(self, cx: &mut ViewContext<V>) -> Self
-    where
-        Self: Styled + Sized,
-    {
+    fn elevation_2<V: 'static>(self, cx: &mut ViewContext<V>) -> Self {
         elevated(self, cx, ElevationIndex::ElevatedSurface)
     }
 
@@ -109,10 +88,7 @@ pub trait StyledExt: Styled {
     /// Sets `bg()`, `rounded_lg()`, `border()`, `border_color()`, `shadow()`
     ///
     /// Examples: Settings Modal, Channel Management, Wizards/Setup UI, Dialogs
-    fn elevation_4<V: 'static>(self, cx: &mut ViewContext<V>) -> Self
-    where
-        Self: Styled + Sized,
-    {
+    fn elevation_4<V: 'static>(self, cx: &mut ViewContext<V>) -> Self {
         elevated(self, cx, ElevationIndex::ModalSurface)
     }
 }

From 3654dd8da011256994c63fb97980ce1b735d23b3 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 13 Nov 2023 11:10:08 -0500
Subject: [PATCH 2/2] Remove unnecessary `map`

---
 crates/ui2/src/components/list.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ui2/src/components/list.rs b/crates/ui2/src/components/list.rs
index 57143e1f0c..5c42975b17 100644
--- a/crates/ui2/src/components/list.rs
+++ b/crates/ui2/src/components/list.rs
@@ -401,7 +401,7 @@ impl List {
         v_stack()
             .w_full()
             .py_1()
-            .children(self.header.map(|header| header))
+            .children(self.header)
             .child(list_content)
     }
 }