From 30e4ea1a4cda4429a9fa3b85c1e3781eb00e5ff9 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 17 Feb 2022 17:26:03 +0100
Subject: [PATCH] Fix warnings

---
 crates/language/src/language.rs |  6 +++---
 crates/lsp/src/lsp.rs           | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 79a0a70edb..73de5af12c 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -11,9 +11,7 @@ use collections::HashSet;
 use gpui::AppContext;
 use highlight_map::HighlightMap;
 use lazy_static::lazy_static;
-use lsp::FakeLanguageServer;
 use parking_lot::Mutex;
-use postage::prelude::Stream;
 use serde::Deserialize;
 use std::{cell::RefCell, ops::Range, path::Path, str, sync::Arc};
 use theme::SyntaxTheme;
@@ -237,6 +235,8 @@ impl Language {
         if let Some(config) = &self.config.language_server {
             #[cfg(any(test, feature = "test-support"))]
             if let Some(fake_config) = &config.fake_config {
+                use postage::prelude::Stream;
+
                 let (server, mut fake_server) = lsp::LanguageServer::fake_with_capabilities(
                     fake_config.capabilities.clone(),
                     cx.background().clone(),
@@ -408,7 +408,7 @@ impl LanguageServerConfig {
 
     pub fn set_fake_initializer(
         &mut self,
-        initializer: impl 'static + Send + Sync + Fn(&mut FakeLanguageServer),
+        initializer: impl 'static + Send + Sync + Fn(&mut lsp::FakeLanguageServer),
     ) {
         self.fake_config.as_mut().unwrap().initializer = Some(Box::new(initializer));
     }
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 60103d80b8..0281e8cd8b 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -1,5 +1,5 @@
 use anyhow::{anyhow, Context, Result};
-use futures::{channel::mpsc, io::BufWriter, AsyncRead, AsyncWrite};
+use futures::{io::BufWriter, AsyncRead, AsyncWrite};
 use gpui::{executor, Task};
 use parking_lot::{Mutex, RwLock};
 use postage::{barrier, oneshot, prelude::Stream, sink::Sink, watch};
@@ -485,8 +485,8 @@ impl Drop for Subscription {
 pub struct FakeLanguageServer {
     handlers:
         Arc<Mutex<HashMap<&'static str, Box<dyn Send + Sync + FnMut(usize, &[u8]) -> Vec<u8>>>>>,
-    outgoing_tx: mpsc::UnboundedSender<Vec<u8>>,
-    incoming_rx: mpsc::UnboundedReceiver<Vec<u8>>,
+    outgoing_tx: futures::channel::mpsc::UnboundedSender<Vec<u8>>,
+    incoming_rx: futures::channel::mpsc::UnboundedReceiver<Vec<u8>>,
 }
 
 #[cfg(any(test, feature = "test-support"))]
@@ -527,8 +527,8 @@ impl FakeLanguageServer {
     ) -> Self {
         use futures::StreamExt as _;
 
-        let (incoming_tx, incoming_rx) = mpsc::unbounded();
-        let (outgoing_tx, mut outgoing_rx) = mpsc::unbounded();
+        let (incoming_tx, incoming_rx) = futures::channel::mpsc::unbounded();
+        let (outgoing_tx, mut outgoing_rx) = futures::channel::mpsc::unbounded();
         let this = Self {
             outgoing_tx: outgoing_tx.clone(),
             incoming_rx,
@@ -612,12 +612,15 @@ impl FakeLanguageServer {
         }
     }
 
-    pub fn handle_request<T, F>(&mut self, mut handler: F) -> mpsc::UnboundedReceiver<()>
+    pub fn handle_request<T, F>(
+        &mut self,
+        mut handler: F,
+    ) -> futures::channel::mpsc::UnboundedReceiver<()>
     where
         T: 'static + request::Request,
         F: 'static + Send + Sync + FnMut(T::Params) -> T::Result,
     {
-        let (responded_tx, responded_rx) = mpsc::unbounded();
+        let (responded_tx, responded_rx) = futures::channel::mpsc::unbounded();
         self.handlers.lock().insert(
             T::METHOD,
             Box::new(move |id, params| {