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

We are std. #67

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
11 changes: 10 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@ keywords = ["zstd", "zstandard", "decompression"]
categories = ["compression"]

[dependencies]
byteorder = { version = "1.5", default-features = false }
twox-hash = { version = "1.6", default-features = false, optional = true }

# Internal feature, only used when building as part of libstd, not part of the
# stable interface of this crate.
compiler_builtins = { version = "0.1.2", optional = true }
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-alloc" }

[dev-dependencies]
criterion = "0.5"
rand = { version = "0.8.5", features = ["small_rng"] }
Expand All @@ -25,6 +30,10 @@ default = ["hash", "std"]
hash = ["dep:twox-hash"]
std = []

# Internal feature, only used when building as part of libstd, not part of the
# stable interface of this crate.
rustc-dep-of-std = ["dep:compiler_builtins", "dep:core", "dep:alloc"]

[[bench]]
name = "reversedbitreader_bench"
harness = false
Expand Down
57 changes: 18 additions & 39 deletions src/decoding/bit_reader_reverse.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pub use super::bit_reader::GetBitsError;
use byteorder::ByteOrder;
use byteorder::LittleEndian;
use crate::io::Read;

/// Zstandard encodes some types of data in a way that the data must be read
/// back to front to decode it properly. `BitReaderReversed` provides a
Expand Down Expand Up @@ -53,7 +52,9 @@ impl<'s> BitReaderReversed<'s> {
#[inline(always)]
fn refill_fast(&mut self, byte_idx: usize, retain_bytes: u8, want_to_read_bits: u8) {
let load_from_byte_idx = byte_idx - 7 + retain_bytes as usize;
let refill = LittleEndian::read_u64(&self.source[load_from_byte_idx..]);
let mut tmp_bytes = [0; 8];
let _ = (&self.source[load_from_byte_idx..]).read_exact(&mut tmp_bytes);
let refill = u64::from_le_bytes(tmp_bytes);
self.bit_container = refill;
self.bits_in_container += want_to_read_bits;
self.idx -= want_to_read_bits as isize;
Expand All @@ -63,42 +64,20 @@ impl<'s> BitReaderReversed<'s> {
fn refill_slow(&mut self, byte_idx: usize, want_to_read_bits: u8) {
let can_read_bits = isize::min(want_to_read_bits as isize, self.idx);
let can_read_bytes = can_read_bits / 8;

match can_read_bytes {
8 => {
self.bit_container = LittleEndian::read_u64(&self.source[byte_idx - 7..]);
self.bits_in_container += 64;
self.idx -= 64;
}
6..=7 => {
self.bit_container <<= 48;
self.bits_in_container += 48;
self.bit_container |= LittleEndian::read_u48(&self.source[byte_idx - 5..]);
self.idx -= 48;
}
4..=5 => {
self.bit_container <<= 32;
self.bits_in_container += 32;
self.bit_container |=
u64::from(LittleEndian::read_u32(&self.source[byte_idx - 3..]));
self.idx -= 32;
}
2..=3 => {
self.bit_container <<= 16;
self.bits_in_container += 16;
self.bit_container |=
u64::from(LittleEndian::read_u16(&self.source[byte_idx - 1..]));
self.idx -= 16;
}
1 => {
self.bit_container <<= 8;
self.bits_in_container += 8;
self.bit_container |= u64::from(self.source[byte_idx]);
self.idx -= 8;
}
_ => {
panic!("This cannot be reached");
}
let mut tmp_bytes = [0u8; 8];
let offset @ 1..=8 = can_read_bytes as usize else {
unreachable!()
};
let bits_read = offset * 8;

let _ = (&self.source[byte_idx - (offset - 1)..]).read_exact(&mut tmp_bytes[0..offset]);
self.bits_in_container += bits_read as u8;
self.idx -= bits_read as isize;
if offset < 8 {
self.bit_container <<= bits_read;
self.bit_container |= u64::from_le_bytes(tmp_bytes);
} else {
self.bit_container = u64::from_le_bytes(tmp_bytes);
}
}

Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#[cfg(feature = "std")]
extern crate std;

#[cfg(not(feature = "rustc-dep-of-std"))]
extern crate alloc;

#[cfg(feature = "std")]
Expand Down
Loading