refactor(compress): expose dictionary entropy leaf from Rust

The dictionary entropy-header loader was already implemented in Rust, but C
kept a private bridge declaration and retained `ZSTD_loadCEntropy` as a
forwarding wrapper. Export the original ABI name from Rust and retain a
crate-local `ZSTD_rust_loadCEntropy` alias for existing Rust callers. Remove
only the bridge declaration and forwarding body; dictionary-content
orchestration, callbacks, and private C layouts remain unchanged.

Test Plan:
- `cc -std=c99 -Ilib -Ilib/common -Ilib/compress -Ilib/decompress -Ilib/dict -fsyntax-only lib/compress/zstd_compress.c` -- passed.
- `git diff --check` -- passed.
- `cargo +nightly fmt --manifest-path rust/Cargo.toml --all -- --check` -- passed.
- `git diff --cached --check` -- passed.
- Cargo build/test, make, and other heavy checks were intentionally not run per
  the requested lightweight-only scope.
This commit is contained in:
2026-07-20 13:15:57 +02:00
parent ca9e383771
commit 66a163a78c
2 changed files with 4 additions and 13 deletions
-10
View File
@@ -2139,8 +2139,6 @@ void ZSTD_rust_storeLastLiterals(SeqStore_t* seqStorePtr,
void ZSTD_rust_validateSeqStore(const SeqStore_t* seqStore, U32 minMatch); void ZSTD_rust_validateSeqStore(const SeqStore_t* seqStore, U32 minMatch);
U32 ZSTD_rust_resolveRepcodeToRawOffset(const U32 rep[ZSTD_REP_NUM], U32 ZSTD_rust_resolveRepcodeToRawOffset(const U32 rep[ZSTD_REP_NUM],
U32 offBase, U32 ll0); U32 offBase, U32 ll0);
size_t ZSTD_rust_loadCEntropy(ZSTD_compressedBlockState_t* bs, void* workspace,
const void* dict, size_t dictSize);
/* Rust owns dictionary-content orchestration and policy. The callbacks below /* Rust owns dictionary-content orchestration and policy. The callbacks below
* keep configuration-sensitive match-state, LDM, workspace, and matchfinder * keep configuration-sensitive match-state, LDM, workspace, and matchfinder
* operations private to C. */ * operations private to C. */
@@ -6231,14 +6229,6 @@ static void ZSTD_loadDictionaryContent_assertInvalidStrategy(void* opaque)
} }
/* Dictionary entropy-header loading and content orchestration live in Rust;
* this keeps the original internal symbol available to C callers. */
size_t ZSTD_loadCEntropy(ZSTD_compressedBlockState_t* bs, void* workspace,
const void* const dict, size_t dictSize)
{
return ZSTD_rust_loadCEntropy(bs, workspace, dict, dictSize);
}
/* Package only scalar policy inputs and opaque private-operation callbacks for /* Package only scalar policy inputs and opaque private-operation callbacks for
* the Rust dictionary-content orchestrator. */ * the Rust dictionary-content orchestrator. */
static size_t ZSTD_loadDictionaryContent_callback( static size_t ZSTD_loadDictionaryContent_callback(
+4 -3
View File
@@ -5,8 +5,7 @@
//! Dictionary entropy-header loading. //! Dictionary entropy-header loading.
//! //!
//! This is the Rust leaf for `ZSTD_dictNCountRepeat()` and //! This is the Rust leaf for `ZSTD_dictNCountRepeat()` and
//! `ZSTD_loadCEntropy()` in `lib/compress/zstd_compress.c`. C retains the //! `ZSTD_loadCEntropy()` in `lib/compress/zstd_compress.c`. C keeps the
//! original symbols through thin compatibility shims and keeps the
//! configuration-sensitive dictionary-content operations on its side. //! configuration-sensitive dictionary-content operations on its side.
use crate::bits::ZSTD_highbit32; use crate::bits::ZSTD_highbit32;
@@ -2256,7 +2255,7 @@ unsafe fn read_and_build_fse_table(
/// truncated entropy headers are converted to `ZSTD_error_dictionaryCorrupted` /// truncated entropy headers are converted to `ZSTD_error_dictionaryCorrupted`
/// just as the C `RETURN_ERROR_IF(..., dictionary_corrupted, ...)` paths do. /// just as the C `RETURN_ERROR_IF(..., dictionary_corrupted, ...)` paths do.
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn ZSTD_rust_loadCEntropy( pub unsafe extern "C" fn ZSTD_loadCEntropy(
bs: *mut ZSTD_compressedBlockState_t, bs: *mut ZSTD_compressedBlockState_t,
workspace: *mut c_void, workspace: *mut c_void,
dict: *const c_void, dict: *const c_void,
@@ -2401,6 +2400,8 @@ pub unsafe extern "C" fn ZSTD_rust_loadCEntropy(
offset offset
} }
pub(crate) use ZSTD_loadCEntropy as ZSTD_rust_loadCEntropy;
/// Rust-owned dispatch for C's `ZSTD_compress_insertDictionary()`. /// Rust-owned dispatch for C's `ZSTD_compress_insertDictionary()`.
/// ///
/// The callback is the only operation that still crosses back into C. It /// The callback is the only operation that still crosses back into C. It