Use the send method
This commit is contained in:
parent
285285d3fd
commit
f7c4716dbf
@ -119,14 +119,12 @@ fn run(mut self, inbox: Receiver<Message>) {
|
|||||||
self.watched_dir_entries.clear();
|
self.watched_dir_entries.clear();
|
||||||
self.watched_file_entries.clear();
|
self.watched_file_entries.clear();
|
||||||
|
|
||||||
self.sender
|
self.send(loader::Message::Progress {
|
||||||
.send(loader::Message::Progress {
|
|
||||||
n_total,
|
n_total,
|
||||||
n_done: LoadingProgress::Started,
|
n_done: LoadingProgress::Started,
|
||||||
config_version,
|
config_version,
|
||||||
dir: None,
|
dir: None,
|
||||||
})
|
});
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let (entry_tx, entry_rx) = unbounded();
|
let (entry_tx, entry_rx) = unbounded();
|
||||||
let (watch_tx, watch_rx) = unbounded();
|
let (watch_tx, watch_rx) = unbounded();
|
||||||
@ -142,31 +140,25 @@ fn run(mut self, inbox: Receiver<Message>) {
|
|||||||
entry,
|
entry,
|
||||||
do_watch,
|
do_watch,
|
||||||
|file| {
|
|file| {
|
||||||
self.sender
|
self.send(loader::Message::Progress {
|
||||||
.send(loader::Message::Progress {
|
|
||||||
n_total,
|
n_total,
|
||||||
n_done: LoadingProgress::Progress(
|
n_done: LoadingProgress::Progress(
|
||||||
processed
|
processed.load(std::sync::atomic::Ordering::Relaxed),
|
||||||
.load(std::sync::atomic::Ordering::Relaxed),
|
|
||||||
),
|
),
|
||||||
dir: Some(file),
|
dir: Some(file),
|
||||||
config_version,
|
config_version,
|
||||||
})
|
});
|
||||||
.unwrap()
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
self.sender.send(loader::Message::Loaded { files }).unwrap();
|
self.send(loader::Message::Loaded { files });
|
||||||
self.sender
|
self.send(loader::Message::Progress {
|
||||||
.send(loader::Message::Progress {
|
|
||||||
n_total,
|
n_total,
|
||||||
n_done: LoadingProgress::Progress(
|
n_done: LoadingProgress::Progress(
|
||||||
processed.fetch_add(1, std::sync::atomic::Ordering::AcqRel)
|
processed.fetch_add(1, std::sync::atomic::Ordering::AcqRel) + 1,
|
||||||
+ 1,
|
|
||||||
),
|
),
|
||||||
config_version,
|
config_version,
|
||||||
dir: None,
|
dir: None,
|
||||||
})
|
});
|
||||||
.unwrap();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
drop(watch_tx);
|
drop(watch_tx);
|
||||||
|
Loading…
Reference in New Issue
Block a user