From 6696dbcc65300d7ec5d8a0efcb94812da905239f Mon Sep 17 00:00:00 2001 From: Richard Brodie Date: Tue, 21 Feb 2023 11:35:34 +0100 Subject: [PATCH] chore: bump hash32 crate and remove custom Hash32 derive --- Cargo.toml | 2 +- src/mac/frame/header.rs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 534ccff..b7f944d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ keywords = ["WPAN"] [features] [dependencies] -hash32 = "0.2.1" +hash32 = "0.3" hash32-derive = "0.1" byte = "0.2.4" defmt = { version = ">=0.2.0,<0.4", optional = true } diff --git a/src/mac/frame/header.rs b/src/mac/frame/header.rs index a8bf7f0..b26f755 100644 --- a/src/mac/frame/header.rs +++ b/src/mac/frame/header.rs @@ -6,7 +6,6 @@ use byte::{check_len, BytesExt, TryRead, TryWrite, LE}; use cipher::{consts::U16, BlockCipher, NewBlockCipher}; -use hash32_derive::Hash32; pub use super::frame_control::{AddressMode, FrameType, FrameVersion}; use super::DecodeError; @@ -317,7 +316,7 @@ where /// /// let pan_id = PanId(0x0123); /// ``` -#[derive(Clone, Copy, Debug, Eq, Hash, Hash32, PartialEq)] +#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "defmt", derive(defmt::Format))] pub struct PanId(pub u16); @@ -356,7 +355,7 @@ impl TryRead<'_> for PanId { /// /// let short_address = ShortAddress(0x0123); /// ``` -#[derive(Clone, Copy, Debug, Eq, Hash, Hash32, PartialEq)] +#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] @@ -398,7 +397,7 @@ impl TryRead<'_> for ShortAddress { /// /// let ext_address = ExtendedAddress(0x0123456789abcdef); /// ``` -#[derive(Clone, Copy, Debug, Eq, Hash, Hash32, PartialEq)] +#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]