Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 12:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Naming

Browse source
This commit is contained in:
Aleksey Kladov 2020-06-28 22:35:18 +02:00
parent 309b21f378
commit eddb744d90
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/flycheck/src/lib.rs
View file

@ -50,7 +50,7 @@ impl fmt::Display for FlycheckConfig {
#[derive(Debug)] #[derive(Debug)]
pub struct FlycheckHandle { pub struct FlycheckHandle {
// XXX: drop order is significant // XXX: drop order is significant
cmd_send: Sender<Restart>, sender: Sender<Restart>,
thread: jod_thread::JoinHandle, thread: jod_thread::JoinHandle,
} }
@ -60,16 +60,15 @@ impl FlycheckHandle {
config: FlycheckConfig, config: FlycheckConfig,
workspace_root: PathBuf, workspace_root: PathBuf,
) -> FlycheckHandle { ) -> FlycheckHandle {
let (cmd_send, cmd_recv) = unbounded::<Restart>(); let actor = FlycheckActor::new(sender, config, workspace_root);
let thread = jod_thread::spawn(move || { let (sender, receiver) = unbounded::<Restart>();
FlycheckActor::new(sender, config, workspace_root).run(cmd_recv); let thread = jod_thread::spawn(move || actor.run(receiver));
}); FlycheckHandle { sender, thread }
FlycheckHandle { cmd_send, thread }
} }
/// Schedule a re-start of the cargo check worker. /// Schedule a re-start of the cargo check worker.
pub fn update(&self) { 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())), 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) { while let Some(event) = self.next_event(&inbox) {
match event { match event {
Event::Restart(Restart) => { Event::Restart(Restart) => {

8
crates/vfs-notify/src/lib.rs
View file

@ -10,7 +10,7 @@ mod include;
use std::convert::{TryFrom, TryInto}; use std::convert::{TryFrom, TryInto};
use crossbeam_channel::{select, unbounded, Receiver}; use crossbeam_channel::{select, unbounded, Receiver, Sender};
use notify::{RecommendedWatcher, RecursiveMode, Watcher}; use notify::{RecommendedWatcher, RecursiveMode, Watcher};
use paths::{AbsPath, AbsPathBuf}; use paths::{AbsPath, AbsPathBuf};
use rustc_hash::FxHashSet; use rustc_hash::FxHashSet;
@ -22,8 +22,8 @@ use crate::include::Include;
#[derive(Debug)] #[derive(Debug)]
pub struct NotifyHandle { pub struct NotifyHandle {
// Relative order of fields below is significant. // Relative order of fields below is significant.
sender: crossbeam_channel::Sender<Message>, sender: Sender<Message>,
_thread: jod_thread::JoinHandle, thread: jod_thread::JoinHandle,
} }
#[derive(Debug)] #[derive(Debug)]
@ -37,7 +37,7 @@ impl loader::Handle for NotifyHandle {
let actor = NotifyActor::new(sender); let actor = NotifyActor::new(sender);
let (sender, receiver) = unbounded::<Message>(); let (sender, receiver) = unbounded::<Message>();
let thread = jod_thread::spawn(move || actor.run(receiver)); let thread = jod_thread::spawn(move || actor.run(receiver));
NotifyHandle { sender, _thread: thread } NotifyHandle { sender, thread }
} }
fn set_config(&mut self, config: loader::Config) { fn set_config(&mut self, config: loader::Config) {
self.sender.send(Message::Config(config)).unwrap() self.sender.send(Message::Config(config)).unwrap()