From f798be6e273d6744663a6988afc01a3463a4c5bd Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 25 Aug 2023 10:25:21 -0700
Subject: [PATCH] Fix rust 1.72 warnings about shadowed glob re-exports

---
 crates/language/src/buffer.rs        | 2 +-
 crates/language/src/language.rs      | 2 +-
 crates/lsp/src/lsp.rs                | 2 +-
 crates/project/src/project_tests.rs  | 2 +-
 crates/project/src/worktree.rs       | 4 ++--
 crates/project/src/worktree_tests.rs | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 7569925256f098c2c4c63128213b696c1ae7dc88..d5586af5ef8fd9088685a6934c16ea62169d953f 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -14,7 +14,7 @@ use crate::{
     CodeLabel, LanguageScope, Outline,
 };
 use anyhow::{anyhow, Result};
-use clock::ReplicaId;
+pub use clock::ReplicaId;
 use fs::LineEnding;
 use futures::FutureExt as _;
 use gpui::{fonts::HighlightStyle, AppContext, Entity, ModelContext, Task};
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 82245d67ca0487adb33aac8ec124f658948c3509..7a9e6b83ceb48584211792239fe2a802ec2e886f 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -18,7 +18,7 @@ use futures::{
     FutureExt, TryFutureExt as _,
 };
 use gpui::{executor::Background, AppContext, AsyncAppContext, Task};
-use highlight_map::HighlightMap;
+pub use highlight_map::HighlightMap;
 use lazy_static::lazy_static;
 use lsp::{CodeActionKind, LanguageServerBinary};
 use parking_lot::{Mutex, RwLock};
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index e0ae64d8069c08b12e11b8b12155892dc974ae0d..7cba03955280dbed1cd98fd9a7b61a1b526c440f 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -77,7 +77,7 @@ pub enum Subscription {
 }
 
 #[derive(Serialize, Deserialize)]
-struct Request<'a, T> {
+pub struct Request<'a, T> {
     jsonrpc: &'static str,
     id: usize,
     method: &'a str,
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 259c10ca057c8bb29ad5b2d805107eb982239441..a504900c83e9178f9ee6cbcf6a66e77a8fa44c0d 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -1,4 +1,4 @@
-use crate::{search::PathMatcher, worktree::WorktreeHandle, Event, *};
+use crate::{search::PathMatcher, worktree::WorktreeModelHandle, Event, *};
 use fs::{FakeFs, LineEnding, RealFs};
 use futures::{future, StreamExt};
 use gpui::{executor::Deterministic, test::subscribe, AppContext};
diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs
index c128de79107118e421fa306f743716ca38e051f2..e6e0f37cc74b317c5d9de9adda90f9820c230777 100644
--- a/crates/project/src/worktree.rs
+++ b/crates/project/src/worktree.rs
@@ -4030,7 +4030,7 @@ struct UpdateIgnoreStatusJob {
     scan_queue: Sender<ScanJob>,
 }
 
-pub trait WorktreeHandle {
+pub trait WorktreeModelHandle {
     #[cfg(any(test, feature = "test-support"))]
     fn flush_fs_events<'a>(
         &self,
@@ -4038,7 +4038,7 @@ pub trait WorktreeHandle {
     ) -> futures::future::LocalBoxFuture<'a, ()>;
 }
 
-impl WorktreeHandle for ModelHandle<Worktree> {
+impl WorktreeModelHandle for ModelHandle<Worktree> {
     // When the worktree's FS event stream sometimes delivers "redundant" events for FS changes that
     // occurred before the worktree was constructed. These events can cause the worktree to perform
     // extra directory scans, and emit extra scan-state notifications.
diff --git a/crates/project/src/worktree_tests.rs b/crates/project/src/worktree_tests.rs
index 6f5b3635096e334b57357f633370782f6a2a965a..4253f45b0ce912412b0f9716474f92d0f875f026 100644
--- a/crates/project/src/worktree_tests.rs
+++ b/crates/project/src/worktree_tests.rs
@@ -1,5 +1,5 @@
 use crate::{
-    worktree::{Event, Snapshot, WorktreeHandle},
+    worktree::{Event, Snapshot, WorktreeModelHandle},
     Entry, EntryKind, PathChange, Worktree,
 };
 use anyhow::Result;