From eb19071d84993a56acbb29ef81f64d3d137fd865 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 26 Oct 2023 15:44:39 +0200
Subject: [PATCH] ui2: Clean up `take`s

---
 crates/ui2/src/components/list.rs    | 6 +++---
 crates/ui2/src/components/modal.rs   | 6 +++---
 crates/ui2/src/components/palette.rs | 4 ++--
 crates/ui2/src/elements/details.rs   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/crates/ui2/src/components/list.rs b/crates/ui2/src/components/list.rs
index c629f6b89c39ea0bbe4499bcba55a4055bcfa209..bfd650b390dde8e5f784ac3945ceb5aec13bc048 100644
--- a/crates/ui2/src/components/list.rs
+++ b/crates/ui2/src/components/list.rs
@@ -250,7 +250,7 @@ impl<S: 'static> ListItem<S> {
 pub struct ListEntry {
     disclosure_control_style: DisclosureControlVisibility,
     indent_level: u32,
-    label: Option<Label>,
+    label: Label,
     left_content: Option<LeftContent>,
     variant: ListItemVariant,
     size: ListEntrySize,
@@ -264,7 +264,7 @@ impl ListEntry {
         Self {
             disclosure_control_style: DisclosureControlVisibility::default(),
             indent_level: 0,
-            label: Some(label),
+            label,
             variant: ListItemVariant::default(),
             left_content: None,
             size: ListEntrySize::default(),
@@ -412,7 +412,7 @@ impl ListEntry {
                     .relative()
                     .children(self.disclosure_control(cx))
                     .children(left_content)
-                    .children(self.label.take()),
+                    .child(self.label),
             )
     }
 }
diff --git a/crates/ui2/src/components/modal.rs b/crates/ui2/src/components/modal.rs
index a83d11468864706ca1328ed4df6d8017285eba23..0ed1b0c72f84977117f740374b37a7f8b5472e2b 100644
--- a/crates/ui2/src/components/modal.rs
+++ b/crates/ui2/src/components/modal.rs
@@ -38,7 +38,7 @@ impl<S: 'static> Modal<S> {
         self
     }
 
-    fn render(mut self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Component<S> {
+    fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Component<S> {
         let theme = theme(cx);
 
         v_stack()
@@ -68,8 +68,8 @@ impl<S: 'static> Modal<S> {
                             .border_color(theme.border)
                             .p_1()
                             .justify_end()
-                            .children(self.secondary_action.take())
-                            .children(self.primary_action.take()),
+                            .children(self.secondary_action)
+                            .children(self.primary_action),
                     )
                 },
             )
diff --git a/crates/ui2/src/components/palette.rs b/crates/ui2/src/components/palette.rs
index 254afd94c42f553f946ea3b08b197fde4e624fa1..c2b7ba7e6c8fbac0fda25244914c1e0c43894384 100644
--- a/crates/ui2/src/components/palette.rs
+++ b/crates/ui2/src/components/palette.rs
@@ -131,7 +131,7 @@ impl PaletteItem {
         self
     }
 
-    fn render<S: 'static>(mut self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Component<S> {
+    fn render<S: 'static>(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Component<S> {
         div()
             .flex()
             .flex_row()
@@ -142,7 +142,7 @@ impl PaletteItem {
                     .child(Label::new(self.label.clone()))
                     .children(self.sublabel.clone().map(|sublabel| Label::new(sublabel))),
             )
-            .children(self.keybinding.take())
+            .children(self.keybinding)
     }
 }
 
diff --git a/crates/ui2/src/elements/details.rs b/crates/ui2/src/elements/details.rs
index e39b8b9e1a145fbe42522aaeaf93c27768728e83..2191829731338a3e8bf13f6a933af1a705e3de21 100644
--- a/crates/ui2/src/elements/details.rs
+++ b/crates/ui2/src/elements/details.rs
@@ -26,7 +26,7 @@ impl<S: 'static> Details<S> {
         self
     }
 
-    fn render(mut self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Component<S> {
+    fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Component<S> {
         let theme = theme(cx);
 
         v_stack()
@@ -37,7 +37,7 @@ impl<S: 'static> Details<S> {
             .size_full()
             .child(self.text)
             .children(self.meta.map(|m| m))
-            .children(self.actions.take().map(|a| a))
+            .children(self.actions.map(|a| a))
     }
 }