From ff3de1af75bcafb4464a2f439455d535f3d90e45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 01:06:51 +0000 Subject: [PATCH 1/3] Bump the all-dependencies group with 8 updates Bumps the all-dependencies group with 8 updates: | Package | From | To | | --- | --- | --- | | [opencv](https://github.com/twistedfall/opencv-rust) | `0.88.1` | `0.88.6` | | [tokio](https://github.com/tokio-rs/tokio) | `1.34.0` | `1.35.1` | | [anyhow](https://github.com/dtolnay/anyhow) | `1.0.75` | `1.0.79` | | [async-trait](https://github.com/dtolnay/async-trait) | `0.1.74` | `0.1.76` | | [futures](https://github.com/rust-lang/futures-rs) | `0.3.29` | `0.3.30` | | [serde](https://github.com/serde-rs/serde) | `1.0.193` | `1.0.195` | | [graphviz-rust](https://github.com/besok/graphviz-rust) | `0.6.6` | `0.7.0` | | [reqwest](https://github.com/seanmonstar/reqwest) | `0.11.22` | `0.11.23` | Updates `opencv` from 0.88.1 to 0.88.6 - [Changelog](https://github.com/twistedfall/opencv-rust/blob/master/CHANGES.md) - [Commits](https://github.com/twistedfall/opencv-rust/compare/v0.88.1...v0.88.6) Updates `tokio` from 1.34.0 to 1.35.1 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.34.0...tokio-1.35.1) Updates `anyhow` from 1.0.75 to 1.0.79 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.75...1.0.79) Updates `async-trait` from 0.1.74 to 0.1.76 - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.74...0.1.76) Updates `futures` from 0.3.29 to 0.3.30 - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.29...0.3.30) Updates `serde` from 1.0.193 to 1.0.195 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.193...v1.0.195) Updates `graphviz-rust` from 0.6.6 to 0.7.0 - [Changelog](https://github.com/besok/graphviz-rust/blob/master/CHANGELOG.md) - [Commits](https://github.com/besok/graphviz-rust/commits) Updates `reqwest` from 0.11.22 to 0.11.23 - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.22...v0.11.23) --- updated-dependencies: - dependency-name: opencv dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: futures dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: graphviz-rust dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies ... Signed-off-by: dependabot[bot] --- Cargo.lock | 104 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 16 ++++----- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 68506f061b4..3b4099b1b93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,9 +60,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "assert_approx_eq" @@ -72,13 +72,13 @@ checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -429,9 +429,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -444,9 +444,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -454,15 +454,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -471,38 +471,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -551,9 +551,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "graphviz-rust" -version = "0.6.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27dafd1ac303e0dfb347a3861d9ac440859bab26ec2f534bbceb262ea492a1e0" +checksum = "f3f7a4f4b8db9d330c49744d0f98ce7c9a37e3e32a0d247a90338119b2040184" dependencies = [ "dot-generator", "dot-structures", @@ -957,9 +957,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opencv" -version = "0.88.1" +version = "0.88.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0285c64387094632ad1e8a12d7b1c494c63590eb41175eb5b61e5d5d506a03e4" +checksum = "edc7d90a679ddd02190fc621ee1592b96b299122fac4b65aa669143317bd4b6a" dependencies = [ "cc", "dunce", @@ -976,9 +976,9 @@ dependencies = [ [[package]] name = "opencv-binding-generator" -version = "0.80.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49ee21f650559a42d43aff2843677e81b94d44a7076f69693883f03aecc1325" +checksum = "d9f66d4e88785bc4748e65aeaffcaa457d1b0df4e6cd0a5dbe15b5bd53514fb0" dependencies = [ "clang", "clang-sys", @@ -1011,7 +1011,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1121,7 +1121,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1161,18 +1161,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1247,9 +1247,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ "base64", "bytes", @@ -1354,22 +1354,22 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1525,7 +1525,7 @@ dependencies = [ "quote", "reqwest", "serde", - "syn 2.0.39", + "syn 2.0.48", "tar", "tokio", "tokio-serial", @@ -1547,9 +1547,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -1618,7 +1618,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1655,9 +1655,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -1680,7 +1680,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1888,7 +1888,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -1922,7 +1922,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index c19451d7491..ff4b1290634 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,20 +26,20 @@ logging = [] graphing = ["dep:graphviz-rust", "dep:quote", "dep:syn", "dep:proc-macro2"] [dependencies] -opencv = { version = "0.88.1", default-features = false, features = ["dnn", "imgcodecs", "imgproc", "videoio"] } # Vision processing +opencv = { version = "0.88.6", default-features = false, features = ["dnn", "imgcodecs", "imgproc", "videoio"] } # Vision processing tokio-serial = "5.4.1" # Async serial comms -tokio = { version = "1.34.0", features = ["full"] } # Async runtime -anyhow = "1.0.75" # Error handling +tokio = { version = "1.35.1", features = ["full"] } # Async runtime +anyhow = "1.0.79" # Error handling itertools = "0.12.0" # Enhance iterators num-traits = "0.2.17" # Numeric generics derive-getters = "0.3.0" # Getter macro -async-trait = "0.1.74" # Async fns in trait definitions -futures = { version = "0.3.29", default-features = false, features = ["std"] }# Futures utilities +async-trait = "0.1.76" # Async fns in trait definitions +futures = { version = "0.3.30", default-features = false, features = ["std"] }# Futures utilities toml = "0.8.8" # Configuration file -serde = { version = "1.0.193", features = ["derive"] } # Config serial handling +serde = { version = "1.0.195", features = ["derive"] } # Config serial handling bytes = "1.5.0" # Byte buffering uuid = { version = "1.6.1", features = ["v4", "fast-rng"] } # Unique IDs -graphviz-rust = { version = "0.6.6", optional = true } # Drawing graphs +graphviz-rust = { version = "0.7.0", optional = true } # Drawing graphs paste = { version = "1.0.14", optional = true } # Concat identifiers [build-dependencies] @@ -49,7 +49,7 @@ proc-macro2 = { version = "1.0.70", optional = true } [dev-dependencies] assert_approx_eq = "1.1.0" # Floating point eq -reqwest = "0.11.22" # Downloading godot sim +reqwest = "0.11.23" # Downloading godot sim [target.'cfg(target_os = "linux")'.dev-dependencies] flate2 = "1.0.28" # Decompressing gz From 753879c3816cf1a1091d864a11ceda918004036b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 01:21:25 +0000 Subject: [PATCH 2/3] Bump the all-dependencies group with 8 updates Bumps the all-dependencies group with 8 updates: | Package | From | To | | --- | --- | --- | | [opencv](https://github.com/twistedfall/opencv-rust) | `0.88.1` | `0.88.6` | | [tokio](https://github.com/tokio-rs/tokio) | `1.34.0` | `1.35.1` | | [anyhow](https://github.com/dtolnay/anyhow) | `1.0.75` | `1.0.79` | | [async-trait](https://github.com/dtolnay/async-trait) | `0.1.74` | `0.1.76` | | [futures](https://github.com/rust-lang/futures-rs) | `0.3.29` | `0.3.30` | | [serde](https://github.com/serde-rs/serde) | `1.0.193` | `1.0.195` | | [graphviz-rust](https://github.com/besok/graphviz-rust) | `0.6.6` | `0.7.0` | | [reqwest](https://github.com/seanmonstar/reqwest) | `0.11.22` | `0.11.23` | Updates `opencv` from 0.88.1 to 0.88.6 - [Changelog](https://github.com/twistedfall/opencv-rust/blob/master/CHANGES.md) - [Commits](https://github.com/twistedfall/opencv-rust/compare/v0.88.1...v0.88.6) Updates `tokio` from 1.34.0 to 1.35.1 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.34.0...tokio-1.35.1) Updates `anyhow` from 1.0.75 to 1.0.79 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.75...1.0.79) Updates `async-trait` from 0.1.74 to 0.1.76 - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.74...0.1.76) Updates `futures` from 0.3.29 to 0.3.30 - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.29...0.3.30) Updates `serde` from 1.0.193 to 1.0.195 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.193...v1.0.195) Updates `graphviz-rust` from 0.6.6 to 0.7.0 - [Changelog](https://github.com/besok/graphviz-rust/blob/master/CHANGELOG.md) - [Commits](https://github.com/besok/graphviz-rust/commits) Updates `reqwest` from 0.11.22 to 0.11.23 - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.22...v0.11.23) --- updated-dependencies: - dependency-name: opencv dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: futures dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: graphviz-rust dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies ... Signed-off-by: dependabot[bot] --- Cargo.lock | 104 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 16 ++++----- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 68506f061b4..3b4099b1b93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,9 +60,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "assert_approx_eq" @@ -72,13 +72,13 @@ checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -429,9 +429,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -444,9 +444,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -454,15 +454,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -471,38 +471,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -551,9 +551,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "graphviz-rust" -version = "0.6.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27dafd1ac303e0dfb347a3861d9ac440859bab26ec2f534bbceb262ea492a1e0" +checksum = "f3f7a4f4b8db9d330c49744d0f98ce7c9a37e3e32a0d247a90338119b2040184" dependencies = [ "dot-generator", "dot-structures", @@ -957,9 +957,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opencv" -version = "0.88.1" +version = "0.88.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0285c64387094632ad1e8a12d7b1c494c63590eb41175eb5b61e5d5d506a03e4" +checksum = "edc7d90a679ddd02190fc621ee1592b96b299122fac4b65aa669143317bd4b6a" dependencies = [ "cc", "dunce", @@ -976,9 +976,9 @@ dependencies = [ [[package]] name = "opencv-binding-generator" -version = "0.80.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49ee21f650559a42d43aff2843677e81b94d44a7076f69693883f03aecc1325" +checksum = "d9f66d4e88785bc4748e65aeaffcaa457d1b0df4e6cd0a5dbe15b5bd53514fb0" dependencies = [ "clang", "clang-sys", @@ -1011,7 +1011,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1121,7 +1121,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1161,18 +1161,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1247,9 +1247,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ "base64", "bytes", @@ -1354,22 +1354,22 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1525,7 +1525,7 @@ dependencies = [ "quote", "reqwest", "serde", - "syn 2.0.39", + "syn 2.0.48", "tar", "tokio", "tokio-serial", @@ -1547,9 +1547,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -1618,7 +1618,7 @@ checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1655,9 +1655,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -1680,7 +1680,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1888,7 +1888,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -1922,7 +1922,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index c19451d7491..ff4b1290634 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,20 +26,20 @@ logging = [] graphing = ["dep:graphviz-rust", "dep:quote", "dep:syn", "dep:proc-macro2"] [dependencies] -opencv = { version = "0.88.1", default-features = false, features = ["dnn", "imgcodecs", "imgproc", "videoio"] } # Vision processing +opencv = { version = "0.88.6", default-features = false, features = ["dnn", "imgcodecs", "imgproc", "videoio"] } # Vision processing tokio-serial = "5.4.1" # Async serial comms -tokio = { version = "1.34.0", features = ["full"] } # Async runtime -anyhow = "1.0.75" # Error handling +tokio = { version = "1.35.1", features = ["full"] } # Async runtime +anyhow = "1.0.79" # Error handling itertools = "0.12.0" # Enhance iterators num-traits = "0.2.17" # Numeric generics derive-getters = "0.3.0" # Getter macro -async-trait = "0.1.74" # Async fns in trait definitions -futures = { version = "0.3.29", default-features = false, features = ["std"] }# Futures utilities +async-trait = "0.1.76" # Async fns in trait definitions +futures = { version = "0.3.30", default-features = false, features = ["std"] }# Futures utilities toml = "0.8.8" # Configuration file -serde = { version = "1.0.193", features = ["derive"] } # Config serial handling +serde = { version = "1.0.195", features = ["derive"] } # Config serial handling bytes = "1.5.0" # Byte buffering uuid = { version = "1.6.1", features = ["v4", "fast-rng"] } # Unique IDs -graphviz-rust = { version = "0.6.6", optional = true } # Drawing graphs +graphviz-rust = { version = "0.7.0", optional = true } # Drawing graphs paste = { version = "1.0.14", optional = true } # Concat identifiers [build-dependencies] @@ -49,7 +49,7 @@ proc-macro2 = { version = "1.0.70", optional = true } [dev-dependencies] assert_approx_eq = "1.1.0" # Floating point eq -reqwest = "0.11.22" # Downloading godot sim +reqwest = "0.11.23" # Downloading godot sim [target.'cfg(target_os = "linux")'.dev-dependencies] flate2 = "1.0.28" # Decompressing gz From 17c828430c63c24e1b79fb47d7ee779587f195ee Mon Sep 17 00:00:00 2001 From: Bennett Petzold Date: Mon, 8 Jan 2024 20:27:45 -0500 Subject: [PATCH 3/3] Fix compiler errors/warnings --- src/comms/meb/mod.rs | 5 ++--- src/missions/graph.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/comms/meb/mod.rs b/src/comms/meb/mod.rs index 640169a2503..f4811386538 100644 --- a/src/comms/meb/mod.rs +++ b/src/comms/meb/mod.rs @@ -1,5 +1,4 @@ use anyhow::Result; -use itertools::Itertools; use tokio::io::AsyncReadExt; use tokio_serial::{DataBits, Parity, SerialStream, StopBits}; @@ -14,8 +13,8 @@ pub struct MainElectronicsBoard { impl MainElectronicsBoard { pub async fn new(read_connection: T) -> Self - where - T: 'static + AsyncReadExt + Unpin + Send, + where + T: 'static + AsyncReadExt + Unpin + Send, { Self { statuses: Statuses::new(read_connection).await, diff --git a/src/missions/graph.rs b/src/missions/graph.rs index 4e4df8fb9b3..53c63590e02 100644 --- a/src/missions/graph.rs +++ b/src/missions/graph.rs @@ -44,7 +44,7 @@ pub fn dot_file(act: &T) -> String { } #[cfg(feature = "graphing")] -pub fn draw_svg(act: &T) -> std::io::Result { +pub fn draw_svg(act: &T) -> std::io::Result> { exec( parse(&dot_file(act)).unwrap(), &mut PrinterContext::default(),