From f971f7fbeb51c0f382a1551c316145e7a8db5c3b Mon Sep 17 00:00:00 2001 From: keith Date: Wed, 29 Jan 2020 16:19:18 -0800 Subject: [PATCH] minor quit changes --- src/bridge/mod.rs | 21 ++++++++------------- src/window.rs | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/bridge/mod.rs b/src/bridge/mod.rs index 3dec52c..c6c68c3 100644 --- a/src/bridge/mod.rs +++ b/src/bridge/mod.rs @@ -7,10 +7,9 @@ use std::sync::Arc; use std::process::Stdio; use rmpv::Value; -use nvim_rs::{create::tokio as create, UiAttachOptions, Neovim}; -use nvim_rs::compat::tokio::Compat; +use nvim_rs::{create::tokio as create, UiAttachOptions}; use tokio::runtime::Runtime; -use tokio::process::{Command, ChildStdin}; +use tokio::process::Command; use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender}; pub use events::*; @@ -62,7 +61,11 @@ async fn start_process(mut receiver: UnboundedReceiver) { tokio::spawn(async move { match io_handler.await { Err(join_error) => eprintln!("Error joining IO loop: '{}'", join_error), - Ok(Err(error)) => eprintln!("Error: '{}'", error), + Ok(Err(error)) => { + if !error.is_channel_closed() { + eprintln!("Error: '{}'", error); + } + }, Ok(Ok(())) => {} }; std::process::exit(0); @@ -93,14 +96,6 @@ async fn start_process(mut receiver: UnboundedReceiver) { command.execute(&nvim).await; }); } - // resize_list.into_iter().last().map(|resize_command| tokio::spawn() - // if let Some(resize_command) = { - // tokio::spawn(resize_command.execute(&nvim)); - // } - - // for ui_command in other_commands.into_iter() { - // tokio::spawn(ui_command.execute(&nvim)); - // } } else { break; } @@ -115,7 +110,7 @@ pub struct Bridge { impl Bridge { pub fn new() -> Bridge { - let mut runtime = Runtime::new().unwrap(); + let runtime = Runtime::new().unwrap(); let (sender, receiver) = unbounded_channel::(); runtime.spawn(async move { diff --git a/src/window.rs b/src/window.rs index 5a3fa4a..1b07690 100644 --- a/src/window.rs +++ b/src/window.rs @@ -4,7 +4,7 @@ use std::time::{Duration, Instant}; use image::{load_from_memory, GenericImageView, Pixel}; use skulpin::{CoordinateSystem, RendererBuilder, PresentMode}; use skulpin::skia_safe::icu; -use skulpin::winit::dpi::{LogicalSize, PhysicalSize}; +use skulpin::winit::dpi::LogicalSize; use skulpin::winit::event::{ElementState, Event, MouseScrollDelta, StartCause, WindowEvent}; use skulpin::winit::event_loop::{ControlFlow, EventLoop}; use skulpin::winit::window::{Icon, WindowBuilder};