From 6355187a186b1a59576ebd6728eba45d2b99f6ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 13:34:41 +0000 Subject: [PATCH 1/6] Bump capnpc from 0.14.8 to 0.14.9 Bumps [capnpc](https://github.com/capnproto/capnproto-rust) from 0.14.8 to 0.14.9. - [Release notes](https://github.com/capnproto/capnproto-rust/releases) - [Commits](https://github.com/capnproto/capnproto-rust/compare/capnpc-v0.14.8...capnpc-v0.14.9) --- updated-dependencies: - dependency-name: capnpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ca993aee..2f16910b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -238,9 +238,9 @@ checksum = "21d5d7da973146f1720672faa44f1523cc8f923636190ca1a931c7bc8834de68" [[package]] name = "capnpc" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7ed9b80f792ac01a8b328ccbc509c2bd756fb5dec18af0163e7963dde23c0b5" +checksum = "bdc9f1dc84666d4ff007b1a16c8f97db80764a624625979be05d869bcff43aaa" dependencies = [ "capnp", ] From b501dba448eb6733ec2440d2b8af57fbace5fa6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 13:33:23 +0000 Subject: [PATCH 2/6] Bump capnp from 0.14.7 to 0.14.8 Bumps [capnp](https://github.com/capnproto/capnproto-rust) from 0.14.7 to 0.14.8. - [Release notes](https://github.com/capnproto/capnproto-rust/releases) - [Commits](https://github.com/capnproto/capnproto-rust/compare/capnp-v0.14.7...capnp-v0.14.8) --- updated-dependencies: - dependency-name: capnp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f16910b5..e44f43ebb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -232,9 +232,9 @@ dependencies = [ [[package]] name = "capnp" -version = "0.14.6" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d5d7da973146f1720672faa44f1523cc8f923636190ca1a931c7bc8834de68" +checksum = "82efa3b0ab5e7e32b786334b052560ec0094135f906975d7481651b9ecf31a6a" [[package]] name = "capnpc" From 747d2c32a0ff5f22e8d820c9dc902b6fa1335919 Mon Sep 17 00:00:00 2001 From: John-Michael Burke <43353147+john-michaelburke@users.noreply.github.com> Date: Tue, 16 Aug 2022 19:00:24 -0700 Subject: [PATCH 3/6] Fix lint errors. (#702) --- console_backend/src/server.rs | 1 + console_backend/src/shared_state.rs | 2 +- console_backend/src/solution_tab.rs | 2 +- console_backend/src/types.rs | 4 ++-- console_backend/src/update_tab.rs | 11 +++-------- console_backend/src/utils.rs | 2 +- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/console_backend/src/server.rs b/console_backend/src/server.rs index 1e3de382a..e5fed624b 100644 --- a/console_backend/src/server.rs +++ b/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::*; diff --git a/console_backend/src/shared_state.rs b/console_backend/src/shared_state.rs index 431c2bb7e..1a15411af 100644 --- a/console_backend/src/shared_state.rs +++ b/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
, files: IndexSet, diff --git a/console_backend/src/solution_tab.rs b/console_backend/src/solution_tab.rs index 937cbee4c..32dcdefe7 100644 --- a/console_backend/src/solution_tab.rs +++ b/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, diff --git a/console_backend/src/types.rs b/console_backend/src/types.rs index 4a3e0aefa..2beee375b 100644 --- a/console_backend/src/types.rs +++ b/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, diff --git a/console_backend/src/update_tab.rs b/console_backend/src/update_tab.rs index b4e05087d..04a103826 100644 --- a/console_backend/src/update_tab.rs +++ b/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); diff --git a/console_backend/src/utils.rs b/console_backend/src/utils.rs index 7d321cea4..95722338c 100644 --- a/console_backend/src/utils.rs +++ b/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 From 288f416f7b86d66a85e25c83aa1ba27e47acb865 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 13:56:01 +0000 Subject: [PATCH 4/6] Bump indexmap from 1.8.2 to 1.9.1 Bumps [indexmap](https://github.com/bluss/indexmap) from 1.8.2 to 1.9.1. - [Release notes](https://github.com/bluss/indexmap/releases) - [Changelog](https://github.com/bluss/indexmap/blob/master/RELEASES.md) - [Commits](https://github.com/bluss/indexmap/compare/1.8.2...1.9.1) --- updated-dependencies: - dependency-name: indexmap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 14 ++++++++++---- console_backend/Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e44f43ebb..386b81417 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1081,6 +1081,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" + [[package]] name = "heck" version = "0.4.0" @@ -1130,12 +1136,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.1", "serde", ] @@ -1767,7 +1773,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b476c5fc0aad16f8b8d74e7df9da1813731fae300f7a923713c4c591905ff50" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] diff --git a/console_backend/Cargo.toml b/console_backend/Cargo.toml index ac1845dde..275f756ec 100644 --- a/console_backend/Cargo.toml +++ b/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" From 46f996848ead6d0784251a637e8a7370e3edee39 Mon Sep 17 00:00:00 2001 From: John-Michael Burke <43353147+john-michaelburke@users.noreply.github.com> Date: Tue, 16 Aug 2022 21:40:33 -0700 Subject: [PATCH 5/6] Uprev libsettings-rs 0.6.13. (#701) --- Cargo.lock | 43 +++++++++++++++++++++++++++----------- console_backend/Cargo.toml | 2 +- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 386b81417..36f079908 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -456,7 +456,7 @@ dependencies = [ "serde", "serde-pickle", "serde_json", - "serde_yaml", + "serde_yaml 0.8.26", "serial_test", "serialport", "strum", @@ -1315,9 +1315,9 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "lock_api" @@ -2311,9 +2311,9 @@ dependencies = [ [[package]] name = "sbp-settings" -version = "0.6.12" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb7f171f1e41fd8ab94042eae61c628b63a433432094f7411dabe20ef075141" +checksum = "0caf65b8d551b1dd0f240cb3b00ee42501d282a58f51553f339d4a7bd9b84762" dependencies = [ "crossbeam-channel", "crossbeam-utils", @@ -2322,7 +2322,7 @@ dependencies = [ "parking_lot 0.12.1", "sbp", "serde", - "serde_yaml", + "serde_yaml 0.9.2", ] [[package]] @@ -2411,9 +2411,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.137" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" dependencies = [ "serde_derive", ] @@ -2443,9 +2443,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" dependencies = [ "proc-macro2", "quote", @@ -2465,9 +2465,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.24" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ "indexmap", "ryu", @@ -2475,6 +2475,19 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "serde_yaml" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826f989c0f374733af6c286f4822f293bc738def07e2782dc1cbb899960a504a" +dependencies = [ + "indexmap", + "itoa 1.0.1", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "serial_test" version = "0.7.0" @@ -2919,6 +2932,12 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514672a55d7380da379785a4d70ca8386c8883ff7eaae877be4d2081cebe73d8" +[[package]] +name = "unsafe-libyaml" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0" + [[package]] name = "untrusted" version = "0.7.1" diff --git a/console_backend/Cargo.toml b/console_backend/Cargo.toml index 275f756ec..a9616a20c 100644 --- a/console_backend/Cargo.toml +++ b/console_backend/Cargo.toml @@ -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 } From fd4f5c0b86fdf6e4bd4699154e4f9510de3c793b Mon Sep 17 00:00:00 2001 From: John Michael Burke Date: Wed, 17 Aug 2022 11:26:35 -0700 Subject: [PATCH 6/6] Add missing newline to plist. --- installers/macOS/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/macOS/Info.plist b/installers/macOS/Info.plist index 67ff63106..ba28d3334 100644 --- a/installers/macOS/Info.plist +++ b/installers/macOS/Info.plist @@ -32,4 +32,4 @@ CFBundleVersion @@VERSION@@ - \ No newline at end of file +