Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Rust docs #4

Merged
merged 2 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ categories = ["encoding"]
license-file = "LICENSE.txt"

[workspace.dependencies]
tlb = { path = "./crates/tlb", version = "0.2.20" }
tlbits = { path = "./crates/bits", version = "0.2.20" }
tlb-ton = { path = "./crates/tlb-ton", version = "0.2.20" }
ton-contracts = { path = "./crates/contracts", version = "0.2.20" }
toner = { path = "./crates/toner", version = "0.2.20" }
tlb = { path = "./crates/tlb", version = "0.2.21" }
tlbits = { path = "./crates/bits", version = "0.2.21" }
tlb-ton = { path = "./crates/tlb-ton", version = "0.2.21" }
ton-contracts = { path = "./crates/contracts", version = "0.2.21" }
toner = { path = "./crates/toner", version = "0.2.21" }

anyhow = "1"
base64 = "0.21"
Expand Down
2 changes: 1 addition & 1 deletion crates/bits/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tlbits"
version = "0.2.20"
version = "0.2.21"
edition.workspace = true
repository.workspace = true
license-file.workspace = true
Expand Down
3 changes: 3 additions & 0 deletions crates/bits/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Binary [TL-B](https://docs.ton.org/develop/data-formats/tl-b-language) **de**/**ser**ialization
[![docs.rs](https://img.shields.io/docsrs/tlbits)](https://docs.rs/tlbits/latest/tlbits)
[![crates.io](https://img.shields.io/crates/v/tlbits)](https://crates.io/crates/tlbits)
5 changes: 5 additions & 0 deletions crates/bits/src/adapters.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
//! Adapters for [`BitReader`](crate::de::BitReader) / [`BitWriter`](crate::ser::BitWriter)
use impl_tools::autoimpl;

/// Adapter that maps an error using given closure
#[autoimpl(Deref using self.inner)]
pub struct MapErr<T, F> {
pub(crate) inner: T,
pub(crate) f: F,
}

/// `tee`-like adapter for mirroring data read/written
#[autoimpl(Deref using self.inner)]
pub struct Tee<T, W> {
pub(crate) inner: T,
Expand All @@ -24,6 +27,7 @@ impl<T, W> Tee<T, W> {
}
}

/// Adapter for counting the number of bits read/written.
#[autoimpl(Deref using self.inner)]
pub struct BitCounter<T> {
pub(crate) inner: T,
Expand All @@ -36,6 +40,7 @@ impl<T> BitCounter<T> {
Self { inner, counter: 0 }
}

/// Return total number of recorded bits
#[inline]
pub const fn bit_count(&self) -> usize {
self.counter
Expand Down
3 changes: 3 additions & 0 deletions crates/bits/src/as/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ use crate::{

use super::Same;

/// Adapter to implement **de**/**ser**ialize with dynamic args for types
/// that do not require args for seralization.
pub struct NoArgs<Args, As: ?Sized = Same>(PhantomData<(Args, As)>);

impl<T, As, Args> BitPackAsWithArgs<T> for NoArgs<Args, As>
Expand Down Expand Up @@ -39,6 +41,7 @@ where
}
}

/// Adapter to implement **de**/**ser**ialize with [`Default`] args.
pub struct DefaultArgs<As: ?Sized = Same>(PhantomData<As>);

impl<T, As> BitPackAs<T> for DefaultArgs<As>
Expand Down
4 changes: 4 additions & 0 deletions crates/bits/src/as/bits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use crate::{
ser::{r#as::BitPackAs, BitPack, BitWriter, BitWriterExt},
};

/// **Ser**ialize value by taking a reference to [`BitSlice`] on it.
pub struct AsBitSlice;

impl<T> BitPackAs<T> for AsBitSlice
Expand All @@ -20,6 +21,7 @@ where
}
}

/// **Ser**ialize value by taking a reference to `[u8]` on it.
pub struct AsBytes;

impl<T> BitPackAs<T> for AsBytes
Expand All @@ -35,8 +37,10 @@ where
}
}

/// **De**/**ser**ialize value from/into exactly `N` bits.
pub struct NBits<const BITS: usize>;

/// **De**/**ser**ialize bytes by prefixing its length with `N`-bit integer.
pub struct VarBytes<const BITS_FOR_BYTES_LEN: usize>;

impl<const BITS_FOR_BYTES_LEN: usize, T> BitPackAs<T> for VarBytes<BITS_FOR_BYTES_LEN>
Expand Down
23 changes: 22 additions & 1 deletion crates/bits/src/as/default.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,32 @@
use core::marker::PhantomData;

use crate::de::{r#as::BitUnpackAs, BitReader, BitReaderExt};
use crate::{
de::{r#as::BitUnpackAs, BitReader, BitReaderExt},
ser::{r#as::BitPackAs, BitWriter, BitWriterExt},
};

use super::Same;

/// **De**/**ser**ialize [`Default`] on `None` values
pub struct DefaultOnNone<As: ?Sized = Same>(PhantomData<As>);

impl<T, As> BitPackAs<Option<T>> for DefaultOnNone<As>
where
T: Default,
As: BitPackAs<T>,
{
fn pack_as<W>(source: &Option<T>, mut writer: W) -> Result<(), W::Error>
where
W: BitWriter,
{
match source {
Some(v) => writer.pack_as::<_, &As>(v)?,
None => writer.pack_as::<_, As>(T::default())?,
};
Ok(())
}
}

impl<T, As> BitUnpackAs<T> for DefaultOnNone<As>
where
T: Default,
Expand Down
89 changes: 89 additions & 0 deletions crates/bits/src/as/from_into.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ use crate::{
Error,
};

/// Serialize value by converting it to/from a proxy type
/// with serialization support.
///
/// See [`TryFromInto`] for more generalized version of this adapter
/// which uses [`TryFrom`] trait instead
pub struct FromInto<T>(PhantomData<T>);

impl<T, As> BitPackAs<T> for FromInto<As>
Expand Down Expand Up @@ -74,6 +79,11 @@ where
}
}

/// Serialize a reference value by converting it to/from a proxy type
/// with serialization support.
///
/// See [`TryFromIntoRef`] for more generalized version of this adapter
/// which uses [`TryFrom`] trait instead
pub struct FromIntoRef<T>(PhantomData<T>);

impl<T, As> BitPackAs<T> for FromIntoRef<As>
Expand Down Expand Up @@ -134,6 +144,11 @@ where
}
}

/// Serialize value by converting it to/from a proxy type
/// with serialization support.
///
/// **Note:** [`FromInto`] is more specialized version of this adapter
/// which the infailable [`Into`] trait instead.
pub struct TryFromInto<T>(PhantomData<T>);

impl<T, As> BitPackAs<T> for TryFromInto<As>
Expand Down Expand Up @@ -207,3 +222,77 @@ where
.map_err(Error::custom)
}
}

/// Serialize a reference value by converting it to/from a proxy type
/// with serialization support.
///
/// **Note:** [`FromIntoRef`] is more specialized version of this adapter
/// which the infailable [`Into`] trait instead.
pub struct TryFromIntoRef<T>(PhantomData<T>);

impl<T, As> BitPackAs<T> for TryFromIntoRef<As>
where
for<'a> &'a T: TryInto<As>,
for<'a> <&'a T as TryInto<As>>::Error: Display,
As: BitPack,
{
#[inline]
fn pack_as<W>(source: &T, writer: W) -> Result<(), W::Error>
where
W: BitWriter,
{
source.try_into().map_err(Error::custom)?.pack(writer)
}
}

impl<T, As> BitPackAsWithArgs<T> for TryFromIntoRef<As>
where
for<'a> &'a T: TryInto<As>,
for<'a> <&'a T as TryInto<As>>::Error: Display,
As: BitPackWithArgs,
{
type Args = As::Args;

#[inline]
fn pack_as_with<W>(source: &T, writer: W, args: Self::Args) -> Result<(), W::Error>
where
W: BitWriter,
{
source
.try_into()
.map_err(Error::custom)?
.pack_with(writer, args)
}
}

impl<T, As> BitUnpackAs<T> for TryFromIntoRef<As>
where
As: TryInto<T> + BitUnpack,
<As as TryInto<T>>::Error: Display,
{
#[inline]
fn unpack_as<R>(reader: R) -> Result<T, R::Error>
where
R: BitReader,
{
As::unpack(reader)?.try_into().map_err(Error::custom)
}
}

impl<T, As> BitUnpackAsWithArgs<T> for TryFromIntoRef<As>
where
As: TryInto<T> + BitUnpackWithArgs,
<As as TryInto<T>>::Error: Display,
{
type Args = As::Args;

#[inline]
fn unpack_as_with<R>(reader: R, args: Self::Args) -> Result<T, R::Error>
where
R: BitReader,
{
As::unpack_with(reader, args)?
.try_into()
.map_err(Error::custom)
}
}
24 changes: 22 additions & 2 deletions crates/bits/src/as/integer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl<const BITS: usize> BitPackAs<BigUint> for NBits<BITS> {
let bytes = source.to_bytes_be();
let mut bits = bytes.as_bits::<Msb0>();
bits = &bits[bits.len() - used_bits..];
writer.with_bits(bits)?;
writer.pack(bits)?;
Ok(())
}
}
Expand Down Expand Up @@ -70,7 +70,7 @@ impl<const BITS: usize> BitPackAs<BigInt> for NBits<BITS> {
let bytes = source.to_signed_bytes_be();
let mut bits = bytes.as_bits::<Msb0>();
bits = &bits[bits.len() - used_bits..];
writer.with_bits(bits)?;
writer.pack(bits)?;
Ok(())
}
}
Expand All @@ -89,6 +89,14 @@ impl<const BITS: usize> BitUnpackAs<BigInt> for NBits<BITS> {
}
}

/// Adapter for [`Var[U]Integer n`](https://docs.ton.org/develop/data-formats/msg-tlb#varuinteger-n)
/// where `n` is *constant*.
///
/// ```tlb
/// var_uint$_ {n:#} len:(#< n) value:(uint (len * 8)) = VarUInteger n;
/// var_int$_ {n:#} len:(#< n) value:(int (len * 8)) = VarInteger n;
/// ```
/// See [`VarNBits`] for *dynamic* version.
pub struct VarInt<const BITS_FOR_BYTES_LEN: usize>;

impl<const BITS_FOR_BYTES_LEN: usize> BitPackAs<BigUint> for VarInt<BITS_FOR_BYTES_LEN> {
Expand Down Expand Up @@ -153,6 +161,12 @@ impl<const BITS_FOR_BYTES_LEN: usize> BitUnpackAs<BigInt> for VarInt<BITS_FOR_BY
}
}

/// Adapter for [`Var[U]Integer (n * 8)`](https://docs.ton.org/develop/data-formats/msg-tlb#varuinteger-n) where `n` is *dynamic*.
/// ```tlb
/// var_uint$_ {n:#} len:(#< n) value:(uint (len * 8)) = VarUInteger n;
/// var_int$_ {n:#} len:(#< n) value:(int (len * 8)) = VarInteger n;
/// ```
/// See [`VarInt`] for *constant* version.
pub struct VarNBits;

impl<T> BitPackAsWithArgs<T> for VarNBits
Expand Down Expand Up @@ -207,6 +221,12 @@ where
}
}

/// Adapter for [`Var[U]Integer n`](https://docs.ton.org/develop/data-formats/msg-tlb#varuinteger-n) where `n` is *dynamic*.
/// ```tlb
/// var_uint$_ {n:#} len:(#< n) value:(uint (len * 8)) = VarUInteger n;
/// var_int$_ {n:#} len:(#< n) value:(int (len * 8)) = VarInteger n;
/// ```
/// See [`VarInt`] for *constant* version.
pub struct VarNBytes;

impl<T> BitPackAsWithArgs<T> for VarNBytes
Expand Down
Loading
Loading