From 4ab02c5c0e02cfa9a62d81469e992e58d3a88b04 Mon Sep 17 00:00:00 2001
From: John Michael Burke <johnmichael.burke@swift-nav.com>
Date: Wed, 21 Jul 2021 10:31:33 -0700
Subject: [PATCH] Formatting and lint.

---
 console_backend/src/connection.rs    | 12 +++---------
 console_backend/src/server.rs        | 20 ++++++++++----------
 console_backend/src/types.rs         |  5 ++++-
 console_backend/tests/mem_benches.rs |  4 +---
 src/main/python/main.py              |  2 +-
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/console_backend/src/connection.rs b/console_backend/src/connection.rs
index 7140c12af..b7b43bfb0 100644
--- a/console_backend/src/connection.rs
+++ b/console_backend/src/connection.rs
@@ -389,9 +389,7 @@ mod tests {
         backup_file(bfilename.clone());
         let shared_state = SharedState::new();
         let (client_send_, client_receive) = mpsc::channel::<Vec<u8>>();
-        let client_send = ClientSender {
-            inner: client_send_,
-        };
+        let client_send = ClientSender::new(client_send_);
         let connection_state = ConnectionState::new(client_send, shared_state.clone());
         let filename = TEST_SHORT_FILEPATH.to_string();
         receive_thread(client_receive);
@@ -417,9 +415,7 @@ mod tests {
         backup_file(bfilename.clone());
         let shared_state = SharedState::new();
         let (client_send_, client_receive) = mpsc::channel::<Vec<u8>>();
-        let client_send = ClientSender {
-            inner: client_send_,
-        };
+        let client_send = ClientSender::new(client_send_);
         let connection_state = ConnectionState::new(client_send, shared_state.clone());
         let filename = TEST_SHORT_FILEPATH.to_string();
         receive_thread(client_receive);
@@ -449,9 +445,7 @@ mod tests {
         backup_file(bfilename.clone());
         let shared_state = SharedState::new();
         let (client_send_, client_receive) = mpsc::channel::<Vec<u8>>();
-        let client_send = ClientSender {
-            inner: client_send_,
-        };
+        let client_send = ClientSender::new(client_send_);
         let connection_state = ConnectionState::new(client_send.clone(), shared_state.clone());
         let filename = TEST_FILEPATH.to_string();
         let expected_duration = Duration::from_secs_f64(SERVER_STATE_CONNECTION_LOOP_TIMEOUT_SEC)
diff --git a/console_backend/src/server.rs b/console_backend/src/server.rs
index 26acc953f..dd1a10855 100644
--- a/console_backend/src/server.rs
+++ b/console_backend/src/server.rs
@@ -11,8 +11,7 @@ use std::{
     path::PathBuf,
     str::FromStr,
     sync::mpsc,
-    thread,
-    time,
+    thread, time,
 };
 
 use crate::cli_options::*;
@@ -119,7 +118,10 @@ fn handle_cli(opt: CliOptions, connection_state: &ConnectionState, shared_state:
 impl Server {
     #[new]
     pub fn __new__() -> Self {
-        Server { client_recv: None, client_sender: None }
+        Server {
+            client_recv: None,
+            client_sender: None,
+        }
     }
 
     #[text_signature = "($self, /)"]
@@ -127,27 +129,25 @@ impl Server {
         let result = py.allow_threads(move || loop {
             if let Some(client_recv) = &self.client_recv {
                 match client_recv.recv_timeout(time::Duration::from_millis(1)) {
-                    Ok(buf) => {
-                        break Some(buf)
-                    }
+                    Ok(buf) => break Some(buf),
                     Err(err) => {
                         use std::sync::mpsc::RecvTimeoutError;
                         if matches!(err, RecvTimeoutError::Timeout) {
                             if self.client_sender.as_ref().unwrap().connected.get() {
-                                continue
+                                continue;
                             } else {
                                 eprintln!("shutting down");
-                                break None
+                                break None;
                             }
                         } else {
                             eprintln!("client recv disconnected");
-                            break None
+                            break None;
                         }
                     }
                 }
             } else {
                 eprintln!("no client receive endpoint");
-                break None
+                break None;
             }
         });
         result.map(|result| PyBytes::new(py, &result).into())
diff --git a/console_backend/src/types.rs b/console_backend/src/types.rs
index 6e53ecb64..9f75d73e1 100644
--- a/console_backend/src/types.rs
+++ b/console_backend/src/types.rs
@@ -122,7 +122,10 @@ pub struct ClientSender {
 }
 impl ClientSender {
     pub fn new(inner: sync::mpsc::Sender<Vec<u8>>) -> Self {
-        Self { inner, connected: ArcBool::new_with(true) }
+        Self {
+            inner,
+            connected: ArcBool::new_with(true),
+        }
     }
 }
 impl CapnProtoSender for ClientSender {
diff --git a/console_backend/tests/mem_benches.rs b/console_backend/tests/mem_benches.rs
index 44ecf268c..da329ca15 100644
--- a/console_backend/tests/mem_benches.rs
+++ b/console_backend/tests/mem_benches.rs
@@ -94,9 +94,7 @@ mod mem_bench_impl {
                 .send(client_recv)
                 .expect("sending client recv handle should succeed");
 
-            let client_send = ClientSender {
-                inner: client_send_,
-            };
+            let client_send = ClientSender::new(client_send_);
             let shared_state = SharedState::new();
             shared_state.set_running(true, client_send.clone());
             let conn = Connection::file(
diff --git a/src/main/python/main.py b/src/main/python/main.py
index e8953183d..f0cc65ec0 100644
--- a/src/main/python/main.py
+++ b/src/main/python/main.py
@@ -604,4 +604,4 @@ def handle_cli_arguments(args: argparse.Namespace, globals_: QObject):
     endpoint_main.shutdown()
     server_thread.join()
 
-    sys.exit()
\ No newline at end of file
+    sys.exit()