Add support for heapless 0.9 and heapless-bytes 0.5

Author: sosthene-nitrokey

Cargo.toml

@@ -15,24 +15,29 @@ categories = ["development-tools", "embedded"]
 delog = "0.1.0-alpha.3"
 heapless-bytes-v0-3 = { package = "heapless-bytes", version = "0.3", optional = true }
 heapless-bytes-v0-4 = { package = "heapless-bytes", version = "0.4", optional = true }
+heapless-bytes-v0-5 = { package = "heapless-bytes", version = "0.5", optional = true }
 heapless-v0-7 = { package = "heapless", version = "0.7", optional = true }
 heapless-v0-8 = { package = "heapless", version = "0.8", optional = true }
+heapless-v0-9 = { package = "heapless", version = "0.9", optional = true }
 serde = { version = "1", default-features = false }
 
 [dev-dependencies]
-heapless-v0-8 = { package = "heapless", version = "0.8", features = ["serde"] }
-heapless-bytes-v0-4 = { package = "heapless-bytes", version = "0.4" }
+heapless-v0-9 = { package = "heapless", version = "0.9", features = ["serde"] }
+heapless-bytes-v0-5 = { package = "heapless-bytes", version = "0.5" }
 serde = { version = "1", default-features = false, features = ["derive"] }
 serde_bytes = "0.11.12"
 
 [features]
 heapless-bytes-v0-3 = ["dep:heapless-bytes-v0-3", "heapless-v0-7"]
 heapless-bytes-v0-4 = ["dep:heapless-bytes-v0-4"]
+heapless-bytes-v0-5 = ["dep:heapless-bytes-v0-5", "heapless-v0-9"]
 heapless-v0-7 = ["dep:heapless-v0-7"]
 heapless-v0-8 = ["dep:heapless-v0-8"]
+heapless-v0-9 = ["dep:heapless-v0-9"]
 
 log-all = []
 log-none = []
+log-trace = []
 log-info = []
 log-debug = []
 log-warn = []

src/de.rs

@@ -1056,26 +1056,26 @@ mod tests {
     }
 
     #[cfg_attr(
-        not(feature = "heapless-bytes-v0-4"),
-        ignore = "Enable heapless-bytes-v0-4 feature"
+        not(feature = "heapless-bytes-v0-5"),
+        ignore = "Enable heapless-bytes-v0-5 feature"
     )]
     #[test]
     fn de_bytes() {
-        #[cfg(feature = "heapless-bytes-v0-4")]
+        #[cfg(feature = "heapless-bytes-v0-5")]
         {
             let mut buf = [0u8; 64];
 
             let slice = b"thank you postcard!";
-            let bytes = heapless_bytes_v0_4::Bytes::<64>::try_from(slice).unwrap();
+            let bytes = heapless_bytes_v0_5::Bytes::<64>::try_from(slice).unwrap();
             let ser = cbor_serialize(&bytes, &mut buf).unwrap();
             println!("serialized bytes = {:?}", ser);
-            let de: heapless_bytes_v0_4::Bytes<64> = from_bytes(&buf).unwrap();
+            let de: heapless_bytes_v0_5::Bytes<64> = from_bytes(&buf).unwrap();
             println!("deserialized bytes = {:?}", &de);
             assert_eq!(&de, slice);
         }
-        #[cfg(not(feature = "heapless-bytes-v0-4"))]
+        #[cfg(not(feature = "heapless-bytes-v0-5"))]
         {
-            panic!("This test must be run with the heapless-v0-4 feature")
+            panic!("This test must be run with the heapless-v0-5 feature")
         }
     }
 
@@ -1084,10 +1084,10 @@ mod tests {
         let mut buf = [0u8; 64];
 
         let string_slice = "thank you postcard, for blazing the path 🐝";
-        let mut string = heapless_v0_8::String::<64>::new();
+        let mut string = heapless_v0_9::String::<64>::new();
         string.push_str(string_slice).unwrap();
         let _n = cbor_serialize(&string, &mut buf);
-        let de: heapless_v0_8::String<64> = from_bytes(&buf).unwrap();
+        let de: heapless_v0_9::String<64> = from_bytes(&buf).unwrap();
         assert_eq!(de, string_slice);
     }
 

src/ser.rs

@@ -47,6 +47,17 @@ impl<const N: usize> Writer for heapless_bytes_v0_4::Bytes<N> {
     }
 }
 
+#[cfg(feature = "heapless-bytes-v0-5")]
+impl<S: heapless_bytes_v0_5::BytesStorage + ?Sized, LenT: heapless_v0_9::LenType> Writer
+    for heapless_bytes_v0_5::BytesInner<LenT, S>
+{
+    type Error = Error;
+    fn write_all(&mut self, buf: &[u8]) -> Result<()> {
+        self.extend_from_slice(buf)
+            .or(Err(Error::SerializeBufferFull))
+    }
+}
+
 #[cfg(feature = "heapless-v0-7")]
 impl<const N: usize> Writer for heapless_v0_7::Vec<u8, N> {
     type Error = Error;
@@ -65,7 +76,18 @@ impl<const N: usize> Writer for heapless_v0_8::Vec<u8, N> {
     }
 }
 
-impl<'a, T: Writer> Writer for &'a mut T {
+#[cfg(feature = "heapless-v0-9")]
+impl<S: heapless_v0_9::vec::VecStorage<u8> + ?Sized, LenT: heapless_v0_9::LenType> Writer
+    for heapless_v0_9::vec::VecInner<u8, LenT, S>
+{
+    type Error = Error;
+    fn write_all(&mut self, buf: &[u8]) -> Result<()> {
+        self.extend_from_slice(buf)
+            .or(Err(Error::SerializeBufferFull))
+    }
+}
+
+impl<'a, T: Writer + ?Sized> Writer for &'a mut T {
     type Error = T::Error;
     fn write_all(&mut self, buf: &[u8]) -> Result<(), Self::Error> {
         (**self).write_all(buf)