From f40ff0ac85bb56c7b2706276e627f676983436c0 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 1 Jun 2023 14:37:36 -0700
Subject: [PATCH] Fix ambiguous glob export warnings in rust 1.70 (#2553)

This fixes a warning that is introduced when upgrading to Rust 1.70.

Release Notes:

- N/A
---
 crates/editor/src/editor.rs              | 4 +++-
 crates/gpui/src/elements/uniform_list.rs | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 291d5cd329..35cbc17146 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -31,7 +31,9 @@ use copilot::Copilot;
 pub use display_map::DisplayPoint;
 use display_map::*;
 pub use editor_settings::EditorSettings;
-pub use element::*;
+pub use element::{
+    Cursor, EditorElement, HighlightedRange, HighlightedRangeLine, LineWithInvisibles,
+};
 use futures::FutureExt;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
diff --git a/crates/gpui/src/elements/uniform_list.rs b/crates/gpui/src/elements/uniform_list.rs
index 9ccd57b291..8344914da0 100644
--- a/crates/gpui/src/elements/uniform_list.rs
+++ b/crates/gpui/src/elements/uniform_list.rs
@@ -36,7 +36,7 @@ struct StateInner {
     scroll_to: Option<ScrollTarget>,
 }
 
-pub struct LayoutState<V: View> {
+pub struct UniformListLayoutState<V: View> {
     scroll_max: f32,
     item_height: f32,
     items: Vec<AnyElement<V>>,
@@ -152,7 +152,7 @@ impl<V: View> UniformList<V> {
 }
 
 impl<V: View> Element<V> for UniformList<V> {
-    type LayoutState = LayoutState<V>;
+    type LayoutState = UniformListLayoutState<V>;
     type PaintState = ();
 
     fn layout(
@@ -169,7 +169,7 @@ impl<V: View> Element<V> for UniformList<V> {
 
         let no_items = (
             constraint.min,
-            LayoutState {
+            UniformListLayoutState {
                 item_height: 0.,
                 scroll_max: 0.,
                 items: Default::default(),
@@ -263,7 +263,7 @@ impl<V: View> Element<V> for UniformList<V> {
 
         (
             size,
-            LayoutState {
+            UniformListLayoutState {
                 item_height,
                 scroll_max,
                 items,