From eddb744d9038306d020ac46d12a373508e9d3268 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 28 Jun 2020 22:35:18 +0200
Subject: Naming

---
 crates/flycheck/src/lib.rs   | 15 +++++++--------
 crates/vfs-notify/src/lib.rs |  8 ++++----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs
index 0d68fcd4d..073bcc9ae 100644
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs
@@ -50,7 +50,7 @@ impl fmt::Display for FlycheckConfig {
 #[derive(Debug)]
 pub struct FlycheckHandle {
     // XXX: drop order is significant
-    cmd_send: Sender<Restart>,
+    sender: Sender<Restart>,
     thread: jod_thread::JoinHandle,
 }
 
@@ -60,16 +60,15 @@ impl FlycheckHandle {
         config: FlycheckConfig,
         workspace_root: PathBuf,
     ) -> FlycheckHandle {
-        let (cmd_send, cmd_recv) = unbounded::<Restart>();
-        let thread = jod_thread::spawn(move || {
-            FlycheckActor::new(sender, config, workspace_root).run(cmd_recv);
-        });
-        FlycheckHandle { cmd_send, thread }
+        let actor = FlycheckActor::new(sender, config, workspace_root);
+        let (sender, receiver) = unbounded::<Restart>();
+        let thread = jod_thread::spawn(move || actor.run(receiver));
+        FlycheckHandle { sender, thread }
     }
 
     /// Schedule a re-start of the cargo check worker.
     pub fn update(&self) {
-        self.cmd_send.send(Restart).unwrap();
+        self.sender.send(Restart).unwrap();
     }
 }
 
@@ -125,7 +124,7 @@ impl FlycheckActor {
             recv(check_chan.unwrap_or(&never())) -> msg => Some(Event::CheckEvent(msg.ok())),
         }
     }
-    fn run(&mut self, inbox: Receiver<Restart>) {
+    fn run(mut self, inbox: Receiver<Restart>) {
         while let Some(event) = self.next_event(&inbox) {
             match event {
                 Event::Restart(Restart) => {
diff --git a/crates/vfs-notify/src/lib.rs b/crates/vfs-notify/src/lib.rs
index 25ba8d798..b1ea298ae 100644
--- a/crates/vfs-notify/src/lib.rs
+++ b/crates/vfs-notify/src/lib.rs
@@ -10,7 +10,7 @@ mod include;
 
 use std::convert::{TryFrom, TryInto};
 
-use crossbeam_channel::{select, unbounded, Receiver};
+use crossbeam_channel::{select, unbounded, Receiver, Sender};
 use notify::{RecommendedWatcher, RecursiveMode, Watcher};
 use paths::{AbsPath, AbsPathBuf};
 use rustc_hash::FxHashSet;
@@ -22,8 +22,8 @@ use crate::include::Include;
 #[derive(Debug)]
 pub struct NotifyHandle {
     // Relative order of fields below is significant.
-    sender: crossbeam_channel::Sender<Message>,
-    _thread: jod_thread::JoinHandle,
+    sender: Sender<Message>,
+    thread: jod_thread::JoinHandle,
 }
 
 #[derive(Debug)]
@@ -37,7 +37,7 @@ impl loader::Handle for NotifyHandle {
         let actor = NotifyActor::new(sender);
         let (sender, receiver) = unbounded::<Message>();
         let thread = jod_thread::spawn(move || actor.run(receiver));
-        NotifyHandle { sender, _thread: thread }
+        NotifyHandle { sender, thread }
     }
     fn set_config(&mut self, config: loader::Config) {
         self.sender.send(Message::Config(config)).unwrap()
-- 
cgit v1.2.3