diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-28 22:43:18 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-28 22:43:18 +0100 |
commit | 11f31ae4c3a38831609e4591e751ce10c4e38daf (patch) | |
tree | 75cc520452cfae4ad77c1ad88a37fd43efe38b81 /crates/vfs-notify/src | |
parent | f3cd82cabf6ab6ab2d41abfedc77504fbf6f1361 (diff) | |
parent | 5cdd8d442ef5a573f4af07e68dce7720ca603aba (diff) |
Merge #5114
5114: Cleanup cargo process handling in flycheck r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/vfs-notify/src')
-rw-r--r-- | crates/vfs-notify/src/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
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; | |||
10 | 10 | ||
11 | use std::convert::{TryFrom, TryInto}; | 11 | use std::convert::{TryFrom, TryInto}; |
12 | 12 | ||
13 | use crossbeam_channel::{select, unbounded, Receiver}; | 13 | use crossbeam_channel::{select, unbounded, Receiver, Sender}; |
14 | use notify::{RecommendedWatcher, RecursiveMode, Watcher}; | 14 | use notify::{RecommendedWatcher, RecursiveMode, Watcher}; |
15 | use paths::{AbsPath, AbsPathBuf}; | 15 | use paths::{AbsPath, AbsPathBuf}; |
16 | use rustc_hash::FxHashSet; | 16 | use rustc_hash::FxHashSet; |
@@ -22,8 +22,8 @@ use crate::include::Include; | |||
22 | #[derive(Debug)] | 22 | #[derive(Debug)] |
23 | pub struct NotifyHandle { | 23 | pub struct NotifyHandle { |
24 | // Relative order of fields below is significant. | 24 | // Relative order of fields below is significant. |
25 | sender: crossbeam_channel::Sender<Message>, | 25 | sender: Sender<Message>, |
26 | _thread: jod_thread::JoinHandle, | 26 | thread: jod_thread::JoinHandle, |
27 | } | 27 | } |
28 | 28 | ||
29 | #[derive(Debug)] | 29 | #[derive(Debug)] |
@@ -37,7 +37,7 @@ impl loader::Handle for NotifyHandle { | |||
37 | let actor = NotifyActor::new(sender); | 37 | let actor = NotifyActor::new(sender); |
38 | let (sender, receiver) = unbounded::<Message>(); | 38 | let (sender, receiver) = unbounded::<Message>(); |
39 | let thread = jod_thread::spawn(move || actor.run(receiver)); | 39 | let thread = jod_thread::spawn(move || actor.run(receiver)); |
40 | NotifyHandle { sender, _thread: thread } | 40 | NotifyHandle { sender, thread } |
41 | } | 41 | } |
42 | fn set_config(&mut self, config: loader::Config) { | 42 | fn set_config(&mut self, config: loader::Config) { |
43 | self.sender.send(Message::Config(config)).unwrap() | 43 | self.sender.send(Message::Config(config)).unwrap() |