Cherry-pick f57a6d6 f784983 332990b a79b088 1c48f20

console_backend/Cargo.toml

@@ -32,7 +32,7 @@ directories = "4"
 anyhow = { version = "1", features = ["backtrace"] }
 serde_yaml = "0.8.24"
 clap = { version = "3.2.5", features = ["derive"] }
-indexmap = { version = "1.8.2", features = ["serde"] }
+indexmap = { version = "1.9.1", features = ["serde"] }
 serde_json = { version = "1" }
 crossbeam = "0.8"
 rand = "0.8.5"
@@ -41,7 +41,7 @@ parking_lot = "0.12.1"
 regex = { version = "1.5.6" }
 rust-ini = "0.18.0"
 sbp = { version = "4.4.0", features = ["json", "link", "swiftnav"] }
-sbp-settings = "0.6.12"
+sbp-settings = "0.6.13"
 env_logger = { version = "0.9", optional = true }
 mimalloc = { version = "0.1", default-features = false }
 indicatif = { version = "0.16", optional = true }

console_backend/src/server.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::borrow_deref_ref)] // Waiting on this to merge: https://github.com/rust-lang/rust-clippy/issues/8971
 use crossbeam::channel;
 use pyo3::exceptions;
 use pyo3::prelude::*;

console_backend/src/shared_state.rs

@@ -727,7 +727,7 @@ enum FlowControlRemote {
     Hardware,
 }
 
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ConnectionHistory {
     addresses: IndexSet<Address>,
     files: IndexSet<String>,

console_backend/src/solution_tab.rs

@@ -16,7 +16,7 @@ use crate::shared_state::SharedState;
 use crate::types::{Deque, Dops, GnssModes, GpsTime, PosLLH, UtcDateTime, VelNED};
 use crate::utils::*;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum LatLonUnits {
     Degrees,
     Meters,

console_backend/src/types.rs

@@ -269,7 +269,7 @@ impl Clone for ArcBool {
 }
 
 // Main Tab Types.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum RealtimeDelay {
     On,
     Off,
@@ -1479,7 +1479,7 @@ impl Event for BaselineNED {
 }
 
 // Solution Velocity Tab Types.
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum VelocityUnits {
     Mps,
     Mph,

console_backend/src/update_tab.rs

@@ -220,14 +220,9 @@ fn update_frontend(client_sender: BoxedClientSender, mut update_tab_context: Upd
     status.set_fw_version_current(&packet.current_firmware_version);
     status.set_fw_version_latest(&packet.latest_firmware_version);
     status.set_fw_local_filename(&packet.firmware_filename);
-    status.set_fileio_local_filepath(&packet.fileio_local_filepath.to_string_lossy().to_string());
-    status.set_fileio_destination_filepath(
-        &packet
-            .fileio_destination_filepath
-            .to_string_lossy()
-            .to_string(),
-    );
-    status.set_directory(&packet.firmware_directory.to_string_lossy().to_string());
+    status.set_fileio_local_filepath(&packet.fileio_local_filepath.to_string_lossy());
+    status.set_fileio_destination_filepath(&packet.fileio_destination_filepath.to_string_lossy());
+    status.set_directory(&packet.firmware_directory.to_string_lossy());
     status.set_downloading(packet.downloading);
     status.set_upgrading(packet.upgrading);
     status.set_fw_text(&packet.fw_log);

console_backend/src/utils.rs

@@ -101,7 +101,7 @@ pub fn refresh_connection_frontend(client_sender: &BoxedClientSender, shared_sta
         .init_available_ports(ports.len() as u32);
 
     for (i, serialportinfo) in ports.iter().enumerate() {
-        available_ports.set(i as u32, &(*serialportinfo));
+        available_ports.set(i as u32, serialportinfo);
     }
 
     let mut available_baudrates = connection_status

installers/macOS/Info.plist

@@ -32,4 +32,4 @@
     <key>CFBundleVersion</key>
     <string>@@VERSION@@</string>
 </dict>
-</plist>
+</plist>