Skip to content

Commit

Permalink
encode: implement Display for EncodeBuilder
Browse files Browse the repository at this point in the history
Add implementation of core::fmt::Display for EncodeBuilder which tries
to avoid memory allocations when encoding sensibly small values
(specifically, shorter than 96 bytes).
  • Loading branch information
mina86 committed Jun 17, 2023
1 parent 2b0d73b commit c2f3e02
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 2 deletions.
39 changes: 37 additions & 2 deletions src/encode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,11 @@ impl<'a, I: AsRef<[u8]>> EncodeBuilder<'a, I> {
/// # Ok::<(), bs58::encode::Error>(())
/// ```
pub fn onto(self, mut output: impl EncodeTarget) -> Result<usize> {

Check failure on line 401 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / clippy / cargo +stable lints clippy

mismatched types

Check failure on line 401 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / docsrs / cargo +nightly doc --cfg docsrs

mismatched types

Check failure on line 401 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / test / cargo +stable test

mismatched types
self.ref_onto(self, output);

Check failure on line 402 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / clippy / cargo +stable lints clippy

the trait bound `encode::EncodeBuilder<'_, I>: encode::EncodeTarget` is not satisfied

Check failure on line 402 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / clippy / cargo +stable lints clippy

this method takes 1 argument but 2 arguments were supplied

Check failure on line 402 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / docsrs / cargo +nightly doc --cfg docsrs

the trait bound `EncodeBuilder<'_, I>: EncodeTarget` is not satisfied

Check failure on line 402 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / docsrs / cargo +nightly doc --cfg docsrs

this method takes 1 argument but 2 arguments were supplied

Check failure on line 402 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / test / cargo +stable test

the trait bound `EncodeBuilder<'_, I>: EncodeTarget` is not satisfied

Check failure on line 402 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / test / cargo +stable test

this method takes 1 argument but 2 arguments were supplied
}

/// Same as [`Self::onto`] but does not consume `self`.
fn ref_onto(&self, mut output: impl EncodeTarget) -> Result<usize> {
let input = self.input.as_ref();
match self.check {
Check::Disabled => output.encode_with(max_encoded_len(input.len()), |output| {
Expand All @@ -422,11 +427,41 @@ impl<'a, I: AsRef<[u8]>> EncodeBuilder<'a, I> {
}
}

#[cfg(feature = "alloc")]
impl<'a, I: AsRef<[u8]>> core::fmt::Display for EncodeBuilder<'a, I> {
fn fmt(&self, fmt: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
// If input is short enough, encode it into a buffer on stack to avoid
// allocation. 96 bytes length limit should be plenty and cover all
// sane cases; base58 is typically used for things like encryption keys
// and hashes which are often no more than 32-bytes long.
const LEN_LIMIT: usize = 96;

#[cfg(any(feature = "check", feature = "cb58"))]
const MAX_LEN: usize = LEN_LIMIT + CHECKSUM_LEN + 1;
#[cfg(not(any(feature = "check", feature = "cb58")))]
const MAX_LEN: usize = LEN_LIMIT;
let mut buf = [0u8; max_encoded_len(MAX_LEN)];
let mut vec = Vec::new();

let output = if self.input.as_ref().len() <= LEN_LIMIT {
let len = self.ref_onto(&mut buf[..]).unwrap();
&buf[..len]
} else {
self.ref_onto(&mut vec).unwrap();
vec.as_slice()
};

// SAFETY: we know that alphabet can only include ASCII characters
// thus our result is an ASCII string.
fmt.write_str(unsafe { std::str::from_utf8_unchecked(output) })

Check failure on line 456 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / clippy / cargo +stable lints clippy

usage of an `unsafe` block

Check failure on line 456 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / docsrs / cargo +nightly doc --cfg docsrs

usage of an `unsafe` block

Check failure on line 456 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / test / cargo +stable test

usage of an `unsafe` block

Check failure on line 456 in src/encode.rs

View workflow job for this annotation

GitHub Actions / pull_request / coverage / codecov

usage of an `unsafe` block
}
}

/// Return maximum possible encoded length of a buffer with given length.
///
/// Assumes that the `len` already includes version and checksum bytes if those
/// are
fn max_encoded_len(len: usize) -> usize {
/// are part of the encoding.
const fn max_encoded_len(len: usize) -> usize {
// log_2(256) / log_2(58) ≈ 1.37. Assume 1.5 for easier calculation.
len + (len + 1) / 2
}
Expand Down
4 changes: 4 additions & 0 deletions tests/encode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ fn test_encode() {
assert_eq!((PREFIX, s.as_bytes()), vec.split_at(3));
}
}

// Test Display implementation
assert_eq!(s, format!("{}", bs58::encode(val)));
assert_eq!(s, bs58::encode(val).to_string());
}
}

Expand Down

0 comments on commit c2f3e02

Please sign in to comment.