fix: better errors for collections

Author: mitinarseny

Cargo.toml

@@ -12,11 +12,11 @@ categories = ["encoding"]
 license-file = "LICENSE.txt"
 
 [workspace.dependencies]
-tlbits = { path = "./crates/bits", version = "0.7.1" }
-tlb = { path = "./crates/tlb", version = "0.7.1" }
-tlb-ton = { path = "./crates/tlb-ton", version = "0.7.1" }
-ton-contracts = { path = "./crates/contracts", version = "0.7.1" }
-toner = { path = "./crates/toner", version = "0.7.1" }
+tlbits = { path = "./crates/bits", version = "0.7.2" }
+tlb = { path = "./crates/tlb", version = "0.7.2" }
+tlb-ton = { path = "./crates/tlb-ton", version = "0.7.2" }
+ton-contracts = { path = "./crates/contracts", version = "0.7.2" }
+toner = { path = "./crates/toner", version = "0.7.2" }
 
 anyhow = "1"
 arbitrary = "1.4"

crates/bits/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tlbits"
-version = "0.7.1"
+version = "0.7.2"
 edition.workspace = true
 rust-version.workspace = true
 repository.workspace = true

crates/bits/src/as/len.rs

@@ -8,6 +8,7 @@ use std::{
 use bitvec::{boxed::BitBox, order::Msb0, slice::BitSlice, vec::BitVec, view::AsBits};
 
 use crate::{
+    Context,
     r#as::{BorrowCow, Same},
     de::{BitReader, BitReaderExt, BitUnpackAs},
     ser::{BitPackAs, BitWriter, BitWriterExt},
@@ -39,7 +40,8 @@ impl<As: ?Sized, const BITS: usize> VarLen<As, BITS> {
     {
         let iter = source.into_iter();
         writer
-            .pack_as::<_, NBits<BITS>>(iter.len(), ())?
+            .pack_as::<_, NBits<BITS>>(iter.len(), ())
+            .context("length")?
             .pack_many_as::<_, <&'a As as IntoIterator>::Item>(iter, args)?;
         Ok(())
     }
@@ -56,7 +58,7 @@ impl<As: ?Sized, const BITS: usize> VarLen<As, BITS> {
         As::Item: BitUnpackAs<'de, <T as IntoIterator>::Item>,
         <As::Item as BitUnpackAs<'de, <T as IntoIterator>::Item>>::Args: Clone,
     {
-        let len: usize = reader.unpack_as::<_, NBits<BITS>>(())?;
+        let len: usize = reader.unpack_as::<_, NBits<BITS>>(()).context("length")?;
         reader
             .unpack_iter_as::<_, As::Item>(args)
             .take(len)
@@ -77,7 +79,8 @@ impl<const BITS: usize> BitPackAs<BitSlice<u8, Msb0>> for VarLen<Same, BITS> {
         W: BitWriter + ?Sized,
     {
         writer
-            .pack_as::<_, NBits<BITS>>(source.len(), ())?
+            .pack_as::<_, NBits<BITS>>(source.len(), ())
+            .context("length")?
             .write_bitslice(source)
     }
 }
@@ -133,7 +136,7 @@ impl<'de: 'a, 'a, const BITS: usize> BitUnpackAs<'de, Cow<'a, BitSlice<u8, Msb0>
     where
         R: BitReader<'de> + ?Sized,
     {
-        let len = reader.unpack_as::<_, NBits<BITS>>(())?;
+        let len = reader.unpack_as::<_, NBits<BITS>>(()).context("length")?;
         reader.unpack_as::<_, BorrowCow>(len)
     }
 }
@@ -175,7 +178,8 @@ impl<const BITS: usize> BitPackAs<[u8]> for VarLen<Same, BITS> {
         W: BitWriter + ?Sized,
     {
         writer
-            .pack_as::<_, NBits<BITS>>(source.len(), ())?
+            .pack_as::<_, NBits<BITS>>(source.len(), ())
+            .context("length")?
             .write_bitslice(source.as_bits())
     }
 }
@@ -201,7 +205,7 @@ impl<'de: 'a, 'a, const BITS: usize> BitUnpackAs<'de, Cow<'a, [u8]>> for VarLen<
     where
         R: BitReader<'de> + ?Sized,
     {
-        let len: usize = reader.unpack_as::<_, NBits<BITS>>(())?;
+        let len: usize = reader.unpack_as::<_, NBits<BITS>>(()).context("length")?;
         reader.unpack_as::<_, BorrowCow>(len)
     }
 }
@@ -609,7 +613,7 @@ impl<'de: 'a, 'a, const BITS: usize> BitUnpackAs<'de, Cow<'a, str>> for VarLen<S
     where
         R: BitReader<'de> + ?Sized,
     {
-        let len: usize = reader.unpack_as::<_, NBits<BITS>>(())?;
+        let len: usize = reader.unpack_as::<_, NBits<BITS>>(()).context("length")?;
         reader.unpack_as::<_, BorrowCow>(len)
     }
 }

crates/contracts/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ton-contracts"
-version = "0.7.1"
+version = "0.7.2"
 edition.workspace = true
 rust-version.workspace = true
 repository.workspace = true

crates/tlb-ton/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tlb-ton"
-version = "0.7.1"
+version = "0.7.2"
 edition.workspace = true
 rust-version.workspace = true
 repository.workspace = true

crates/tlb/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tlb"
-version = "0.7.1"
+version = "0.7.2"
 edition.workspace = true
 rust-version.workspace = true
 repository.workspace = true

crates/toner/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "toner"
-version = "0.7.1"
+version = "0.7.2"
 edition.workspace = true
 rust-version.workspace = true
 repository.workspace = true