diff --git a/Cargo.lock b/Cargo.lock index 5ca993aee..36f079908 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -232,15 +232,15 @@ 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" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7ed9b80f792ac01a8b328ccbc509c2bd756fb5dec18af0163e7963dde23c0b5" +checksum = "bdc9f1dc84666d4ff007b1a16c8f97db80764a624625979be05d869bcff43aaa" dependencies = [ "capnp", ] @@ -456,7 +456,7 @@ dependencies = [ "serde", "serde-pickle", "serde_json", - "serde_yaml", + "serde_yaml 0.8.26", "serial_test", "serialport", "strum", @@ -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", ] @@ -1309,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" @@ -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]] @@ -2305,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", @@ -2316,7 +2322,7 @@ dependencies = [ "parking_lot 0.12.1", "sbp", "serde", - "serde_yaml", + "serde_yaml 0.9.2", ] [[package]] @@ -2405,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", ] @@ -2437,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", @@ -2459,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", @@ -2469,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" @@ -2913,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 ac1845dde..a9616a20c 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" @@ -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 } 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