sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use scoped thread API in directory diff frontend 

Just a code cleanup. As the minimum Rust version is now 1.63.0, we don't need
to manage the spawned thread manually.
syntactic_context
Yuya Nishihara 2023-11-30 11:14:37 +07:00 committed by Wilfred Hughes
parent 80998a8935
commit 44578368ab
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main.rs
Unescape Escape View File

@ -71,9 +71,10 @@ use crate::parse::syntax;
#[global_allocator] #[global_allocator]
static GLOBAL: MiMalloc = MiMalloc; static GLOBAL: MiMalloc = MiMalloc;
use std::path::Path;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc; use std::sync::Arc;
use std::{env, path::Path}; use std::{env, thread};
use humansize::{format_size, BINARY}; use humansize::{format_size, BINARY};
use owo_colors::OwoColorize; use owo_colors::OwoColorize;
@ -279,28 +280,26 @@ fn main() {
// parallel, but print the results serially // parallel, but print the results serially
// (to prevent display interleaving). // (to prevent display interleaving).
// https://github.com/rayon-rs/rayon/issues/210#issuecomment-551319338 // https://github.com/rayon-rs/rayon/issues/210#issuecomment-551319338
let (send, recv) = std::sync::mpsc::sync_channel(1); thread::scope(|s| {
let (send, recv) = std::sync::mpsc::sync_channel(1);
let encountered_changes = encountered_changes.clone(); let encountered_changes = encountered_changes.clone();
let print_options = display_options.clone(); let print_options = display_options.clone();
let printing_thread = std::thread::spawn(move || { s.spawn(move || {
for diff_result in recv.into_iter() { for diff_result in recv.into_iter() {
print_diff_result(&print_options, &diff_result); print_diff_result(&print_options, &diff_result);
if diff_result.has_reportable_change() { if diff_result.has_reportable_change() {
encountered_changes.store(true, Ordering::Relaxed); encountered_changes.store(true, Ordering::Relaxed);
}
} }
} });
});
diff_iter
.try_for_each_with(send, |s, diff_result| s.send(diff_result))
.expect("Receiver should be connected");
printing_thread diff_iter
.join() .try_for_each_with(send, |s, diff_result| s.send(diff_result))
.expect("Printing thread should not panic"); .expect("Receiver should be connected");
});
} }
} }
_ => { _ => {