From ed233d583f6091a0193bd2b9731618f2c4e2b442 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 26 Oct 2023 15:59:18 +0200
Subject: [PATCH] ui2: Remove `ElementExt` trait

---
 crates/ui2/src/element_ext.rs | 25 -------------------------
 crates/ui2/src/lib.rs         |  2 --
 crates/ui2/src/prelude.rs     |  4 ++--
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 crates/ui2/src/element_ext.rs

diff --git a/crates/ui2/src/element_ext.rs b/crates/ui2/src/element_ext.rs
deleted file mode 100644
index bbdf6ded42f2ed9b9de7f97220045881b24ca721..0000000000000000000000000000000000000000
--- a/crates/ui2/src/element_ext.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use gpui2::Element;
-
-pub trait ElementExt<V: 'static>: Element<V> {
-    // fn when(mut self, condition: bool, then: impl FnOnce(Self) -> Self) -> Self
-    // where
-    //     Self: Sized,
-    // {
-    //     if condition {
-    //         self = then(self);
-    //     }
-    //     self
-    // }
-
-    // fn when_some<T, U>(mut self, option: Option<T>, then: impl FnOnce(Self, T) -> U) -> U
-    // where
-    //     Self: Sized,
-    // {
-    //     if let Some(value) = option {
-    //         self = then(self, value);
-    //     }
-    //     self
-    // }
-}
-
-impl<S: 'static, E: Element<S>> ElementExt<S> for E {}
diff --git a/crates/ui2/src/lib.rs b/crates/ui2/src/lib.rs
index d13271ce05be777d5b2227d2e04c99e22d3b0f38..689e9c537235677f9476506980381dc36020fc3c 100644
--- a/crates/ui2/src/lib.rs
+++ b/crates/ui2/src/lib.rs
@@ -18,7 +18,6 @@
 #![allow(dead_code, unused_variables)]
 
 mod components;
-mod element_ext;
 mod elements;
 mod elevation;
 pub mod prelude;
@@ -27,7 +26,6 @@ mod static_data;
 mod theme;
 
 pub use components::*;
-pub use element_ext::*;
 pub use elements::*;
 pub use prelude::*;
 pub use static_data::*;
diff --git a/crates/ui2/src/prelude.rs b/crates/ui2/src/prelude.rs
index 8098d3e40b34a7e869a6c148b03dba8531ca6ae4..b8143b6e504024f4814b8e6bb5da48a2aa40806c 100644
--- a/crates/ui2/src/prelude.rs
+++ b/crates/ui2/src/prelude.rs
@@ -1,11 +1,11 @@
 pub use gpui2::{
-    div, Element, ElementId, Component, ParentElement, SharedString, StatefulInteractive,
+    div, Component, Element, ElementId, ParentElement, SharedString, StatefulInteractive,
     StatelessInteractive, Styled, ViewContext, WindowContext,
 };
 
 pub use crate::elevation::*;
 use crate::settings::user_settings;
-pub use crate::{old_theme, theme, ButtonVariant, ElementExt, Theme};
+pub use crate::{old_theme, theme, ButtonVariant, Theme};
 
 use gpui2::{rems, Hsla, Rems};
 use strum::EnumIter;