From 9581279919413bd55a8ecc719d1baccf66c3e044 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 12 Oct 2023 10:27:50 -0400
Subject: [PATCH] Fix some merge errors

---
 crates/gpui3/src/elements/text.rs | 2 +-
 crates/gpui3/src/taffy.rs         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/gpui3/src/elements/text.rs b/crates/gpui3/src/elements/text.rs
index 9d696ade17..57525b1de4 100644
--- a/crates/gpui3/src/elements/text.rs
+++ b/crates/gpui3/src/elements/text.rs
@@ -27,7 +27,7 @@ impl<V: 'static + Send + Sync> IntoAnyElement<V> for &'static str {
 
 // TODO: Figure out how to pass `String` to `child` without this.
 // This impl doesn't exist in the `gpui2` crate.
-impl<S: 'static> IntoAnyElement<S> for String {
+impl<S: 'static + Send + Sync> IntoAnyElement<S> for String {
     fn into_any(self) -> AnyElement<S> {
         Text {
             text: ArcCow::from(self),
diff --git a/crates/gpui3/src/taffy.rs b/crates/gpui3/src/taffy.rs
index 47075cb0e3..e11a53ebe5 100644
--- a/crates/gpui3/src/taffy.rs
+++ b/crates/gpui3/src/taffy.rs
@@ -67,7 +67,7 @@ impl TaffyLayoutEngine {
             .into()
     }
 
-    fn count_all_children(&self, parent: LayoutId) -> Result<u32> {
+    fn count_all_children(&self, parent: LayoutId) -> anyhow::Result<u32> {
         let mut count = 0;
 
         for child in self.taffy.children(parent.0)? {
@@ -81,7 +81,7 @@ impl TaffyLayoutEngine {
         Ok(count)
     }
 
-    fn max_depth(&self, depth: u32, parent: LayoutId) -> Result<u32> {
+    fn max_depth(&self, depth: u32, parent: LayoutId) -> anyhow::Result<u32> {
         println!(
             "{parent:?} at depth {depth} has {} children",
             self.taffy.child_count(parent.0)?
@@ -96,7 +96,7 @@ impl TaffyLayoutEngine {
         Ok(depth + 1 + max_child_depth)
     }
 
-    fn get_edges(&self, parent: LayoutId) -> Result<Vec<(LayoutId, LayoutId)>> {
+    fn get_edges(&self, parent: LayoutId) -> anyhow::Result<Vec<(LayoutId, LayoutId)>> {
         let mut edges = Vec::new();
 
         for child in self.taffy.children(parent.0)? {