From 4131c50cfd1ed232a37f9555a3641f2c27246d57 Mon Sep 17 00:00:00 2001
From: LoipesMas <46327403+LoipesMas@users.noreply.github.com>
Date: Sat, 4 Dec 2021 15:37:01 +0100
Subject: [PATCH] Fix compiler warnings on non-Windows

---
 src/bridge/handler.rs | 7 ++++---
 src/bridge/mod.rs     | 8 ++++++--
 src/main.rs           | 1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/bridge/handler.rs b/src/bridge/handler.rs
index f059d9f..5edb16a 100644
--- a/src/bridge/handler.rs
+++ b/src/bridge/handler.rs
@@ -9,8 +9,7 @@ use tokio::task;
 
 use super::events::{parse_redraw_event, RedrawEvent};
 #[cfg(windows)]
-use super::ui_commands::ParallelCommand;
-use super::ui_commands::UiCommand;
+use super::ui_commands::{ParallelCommand, UiCommand};
 use crate::bridge::TxWrapper;
 use crate::channel_utils::*;
 use crate::error_handling::ResultPanicExplanation;
@@ -18,16 +17,18 @@ use crate::settings::SETTINGS;
 
 #[derive(Clone)]
 pub struct NeovimHandler {
+    #[cfg(windows)]
     ui_command_sender: Arc<Mutex<LoggingTx<UiCommand>>>,
     redraw_event_sender: Arc<Mutex<LoggingTx<RedrawEvent>>>,
 }
 
 impl NeovimHandler {
     pub fn new(
-        ui_command_sender: LoggingTx<UiCommand>,
+        #[cfg(windows)] ui_command_sender: LoggingTx<UiCommand>,
         redraw_event_sender: LoggingTx<RedrawEvent>,
     ) -> NeovimHandler {
         NeovimHandler {
+            #[cfg(windows)]
             ui_command_sender: Arc::new(Mutex::new(ui_command_sender)),
             redraw_event_sender: Arc::new(Mutex::new(redraw_event_sender)),
         }
diff --git a/src/bridge/mod.rs b/src/bridge/mod.rs
index eb83cd5..ca61906 100644
--- a/src/bridge/mod.rs
+++ b/src/bridge/mod.rs
@@ -154,11 +154,14 @@ fn connection_mode() -> ConnectionMode {
 }
 
 async fn start_neovim_runtime(
-    ui_command_sender: LoggingTx<UiCommand>,
+    #[cfg(windows)] ui_command_sender: LoggingTx<UiCommand>,
     ui_command_receiver: UnboundedReceiver<UiCommand>,
     redraw_event_sender: LoggingTx<RedrawEvent>,
 ) {
+    #[cfg(windows)]
     let handler = NeovimHandler::new(ui_command_sender.clone(), redraw_event_sender.clone());
+    #[cfg(not(windows))]
+    let handler = NeovimHandler::new(redraw_event_sender.clone());
     let (nvim, io_handler) = match connection_mode() {
         ConnectionMode::Child => create::new_child_cmd(&mut create_nvim_command(), handler).await,
         ConnectionMode::RemoteTcp(address) => create::new_tcp(address, handler).await,
@@ -291,12 +294,13 @@ pub struct Bridge {
 }
 
 pub fn start_bridge(
-    ui_command_sender: LoggingTx<UiCommand>,
+    #[cfg(windows)] ui_command_sender: LoggingTx<UiCommand>,
     ui_command_receiver: UnboundedReceiver<UiCommand>,
     redraw_event_sender: LoggingTx<RedrawEvent>,
 ) -> Bridge {
     let runtime = Runtime::new().unwrap();
     runtime.spawn(start_neovim_runtime(
+        #[cfg(windows)]
         ui_command_sender,
         ui_command_receiver,
         redraw_event_sender,
diff --git a/src/main.rs b/src/main.rs
index 783171c..7892d7e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -160,6 +160,7 @@ fn main() {
 
     // We need to keep the bridge reference around to prevent the tokio runtime from getting freed
     let _bridge = start_bridge(
+        #[cfg(windows)]
         logging_ui_command_sender.clone(),
         ui_command_receiver,
         logging_redraw_event_sender,