summaryrefslogtreecommitdiffstats
path: root/src/tests/e2e/remote_runner.rs
diff options
context:
space:
mode:
authordanieleades <33452915+danieleades@users.noreply.github.com>2021-12-29 08:16:54 +0000
committerGitHub <noreply@github.com>2021-12-29 09:16:54 +0100
commita62a23a1c73a3e316bc42b9b87ab54748cb27d91 (patch)
tree151462816b83b09f022e7890581670496369f58a /src/tests/e2e/remote_runner.rs
parented251d3e23146c49c64699f7cb4e6c69fbec0116 (diff)
fix(clippy): ensure clippy runs on all targets (#972)
* ensure clippy runs on all targets * use 'AtomicBool' instead of 'Mutex<bool>' * remove unused import * remove 'mem::drop' no-ops * remove loop that never loops
Diffstat (limited to 'src/tests/e2e/remote_runner.rs')
-rw-r--r--src/tests/e2e/remote_runner.rs11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tests/e2e/remote_runner.rs b/src/tests/e2e/remote_runner.rs
index feaeecdac..66d622fad 100644
--- a/src/tests/e2e/remote_runner.rs
+++ b/src/tests/e2e/remote_runner.rs
@@ -1,3 +1,4 @@
+use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex};
use zellij_tile::data::Palette;
@@ -135,8 +136,8 @@ fn read_from_channel(
last_snapshot: &Arc<Mutex<String>>,
cursor_coordinates: &Arc<Mutex<(usize, usize)>>,
pane_geom: &PaneGeom,
-) -> (Arc<Mutex<bool>>, std::thread::JoinHandle<()>) {
- let should_keep_running = Arc::new(Mutex::new(true));
+) -> (Arc<AtomicBool>, std::thread::JoinHandle<()>) {
+ let should_keep_running = Arc::new(AtomicBool::new(true));
let thread = std::thread::Builder::new()
.name("read_thread".into())
.spawn({
@@ -151,7 +152,7 @@ fn read_from_channel(
move || {
let mut should_sleep = false;
loop {
- if !*should_keep_running.lock().unwrap() {
+ if !should_keep_running.load(Ordering::SeqCst) {
break;
}
if should_sleep {
@@ -307,7 +308,7 @@ pub struct RemoteRunner {
panic_on_no_retries_left: bool,
last_snapshot: Arc<Mutex<String>>,
cursor_coordinates: Arc<Mutex<(usize, usize)>>, // x, y
- reader_thread: (Arc<Mutex<bool>>, std::thread::JoinHandle<()>),
+ reader_thread: (Arc<AtomicBool>, std::thread::JoinHandle<()>),
pub test_timed_out: bool,
}
@@ -606,6 +607,6 @@ impl Drop for RemoteRunner {
fn drop(&mut self) {
let _ = self.channel.lock().unwrap().close();
let reader_thread_running = &mut self.reader_thread.0;
- *reader_thread_running.lock().unwrap() = false;
+ reader_thread_running.store(false, Ordering::SeqCst);
}
}