From 308b6a066a559494a7b55174130523202fa4402d Mon Sep 17 00:00:00 2001 From: dadiorchen Date: Wed, 23 Apr 2025 18:40:52 +0000 Subject: [PATCH] fix: the hashbrown is too old for new rust --- src/Cargo.lock | 61 +++++++++----------------------- src/control_interface/Cargo.toml | 2 +- src/datalogger/Cargo.toml | 2 +- 3 files changed, 19 insertions(+), 46 deletions(-) diff --git a/src/Cargo.lock b/src/Cargo.lock index eb7d073..98eb96a 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -1,17 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", -] +version = 4 [[package]] name = "allocator-api2" @@ -36,12 +25,6 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - [[package]] name = "control_interface" version = "0.1.0" @@ -64,7 +47,6 @@ dependencies = [ "bitfield-struct", "bitflags", "control_interface", - "ds18b20", "embedded-hal 1.0.0", "hashbrown", "one-wire-bus", @@ -74,16 +56,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "ds18b20" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9cd37ace0416c30c2874cd67135508de493e34135c67878b01e13aba91b53ce" -dependencies = [ - "embedded-hal 0.2.7", - "one-wire-bus", -] - [[package]] name = "embedded-alloc" version = "0.5.0" @@ -110,14 +82,27 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ - "ahash", "allocator-api2", + "equivalent", + "foldhash", ] [[package]] @@ -147,12 +132,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - [[package]] name = "one-wire-bus" version = "0.1.1" @@ -254,12 +233,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - [[package]] name = "void" version = "1.0.2" diff --git a/src/control_interface/Cargo.toml b/src/control_interface/Cargo.toml index c52d586..ed61466 100644 --- a/src/control_interface/Cargo.toml +++ b/src/control_interface/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -hashbrown = "0.14" +hashbrown = "0.15.2" embedded-alloc = "0.5.0" rtt-target = "0.4.0" diff --git a/src/datalogger/Cargo.toml b/src/datalogger/Cargo.toml index e809e29..cd1066e 100644 --- a/src/datalogger/Cargo.toml +++ b/src/datalogger/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] rriv_board = { path = "../../board/rriv_board" } control_interface = { path = "../../src/control_interface" } -hashbrown = "0.14" +hashbrown = "0.15.2" serde_json = { version = "1.0.104", default-features = false, features = ["alloc"] } serde = { version = "1.0", default-features = false, features = ["derive"] } rtt-target = "0.4.0"