diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv index e2741b0c..d6bc6b88 100644 --- a/Cargo.lock.msrv +++ b/Cargo.lock.msrv @@ -409,7 +409,7 @@ dependencies = [ "rand", "regex", "wasm-bindgen-test", - "xz", + "xz-core", "xz-sys", ] @@ -502,7 +502,7 @@ name = "perf-probe" version = "0.1.0" dependencies = [ "liblzma-sys", - "xz", + "xz-core", "xz-sys", ] @@ -820,9 +820,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" +version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ "wit-bindgen", ] @@ -966,12 +966,12 @@ dependencies = [ [[package]] name = "wit-bindgen" -version = "0.51.0" +version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] -name = "xz" +name = "xz-core" version = "0.1.0" dependencies = [ "libc", @@ -984,7 +984,7 @@ name = "xz-sys" version = "0.1.0" dependencies = [ "libc", - "xz", + "xz-core", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c2e7e9dc..e0ef0d70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,10 +17,10 @@ rust-version = "1.88" exclude = [".github/"] [workspace] -members = ["systest", "xz", "xz-sys", "perf-probe"] +members = ["systest", "xz-core", "xz-sys", "perf-probe"] [dependencies] -xz = { path = "xz", optional = true } +xz-core = { path = "xz-core", optional = true } xz-sys = { path = "xz-sys", optional = true } liblzma-sys = { path = "liblzma-sys", version = "0.4.5", optional = true, default-features = false } num_cpus = { version = "1.16.0", optional = true } @@ -48,8 +48,8 @@ liblzma-sys = { path = "liblzma-sys" } wasm-bindgen-test = "0.3" [features] -default = ["xz"] -xz = ["dep:xz"] +default = ["xz-core"] +xz-core = ["dep:xz-core"] xz-sys = ["dep:xz-sys"] liblzma-sys = ["dep:liblzma-sys"] static = ["liblzma-sys?/static"] diff --git a/benches/backend_comparison.rs b/benches/backend_comparison.rs index 41d97506..1230c2ae 100644 --- a/benches/backend_comparison.rs +++ b/benches/backend_comparison.rs @@ -5,21 +5,21 @@ use std::ptr; use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion, Throughput}; #[cfg(any( - all(feature = "xz", feature = "xz-sys"), - all(feature = "xz", feature = "liblzma-sys"), + all(feature = "xz-core", feature = "xz-sys"), + all(feature = "xz-core", feature = "liblzma-sys"), all(feature = "xz-sys", feature = "liblzma-sys"), ))] compile_error!("backend_comparison bench must be built with exactly one backend feature"); -#[cfg(not(any(feature = "xz", feature = "xz-sys", feature = "liblzma-sys")))] -compile_error!("backend_comparison bench requires `xz`, `xz-sys`, or `liblzma-sys`"); +#[cfg(not(any(feature = "xz-core", feature = "xz-sys", feature = "liblzma-sys")))] +compile_error!("backend_comparison bench requires `xz-core`, `xz-sys`, or `liblzma-sys`"); #[cfg(feature = "liblzma-sys")] use liblzma_sys::{ lzma_crc32, lzma_crc64, lzma_easy_buffer_encode, lzma_stream_buffer_bound, lzma_stream_buffer_decode, LZMA_CHECK_CRC64, LZMA_OK, }; -#[cfg(feature = "xz")] -use xz::{ +#[cfg(feature = "xz-core")] +use xz_core::{ check::{crc32_fast::lzma_crc32, crc64_fast::lzma_crc64}, common::{ easy_buffer_encoder::lzma_easy_buffer_encode, @@ -34,8 +34,8 @@ use xz_sys::{ lzma_stream_buffer_decode, LZMA_CHECK_CRC64, LZMA_OK, }; -#[cfg(feature = "xz")] -const BACKEND_NAME: &str = "xz"; +#[cfg(feature = "xz-core")] +const BACKEND_NAME: &str = "xz-core"; #[cfg(feature = "liblzma-sys")] const BACKEND_NAME: &str = "liblzma-sys"; #[cfg(feature = "xz-sys")] diff --git a/docs/performance-workflow.md b/docs/performance-workflow.md index f809c317..965193e6 100644 --- a/docs/performance-workflow.md +++ b/docs/performance-workflow.md @@ -6,7 +6,7 @@ Important: the C and Rust sys backends must never be linked into the same proces The root crate now has three backend modes: -- `xz`: direct Rust ABI calls into the pure Rust port +- `xz-core`: direct Rust ABI calls into the pure Rust port - `xz-sys`: C ABI calls into the pure Rust port through the `xz-sys` shell - `liblzma-sys`: C ABI calls into vendored C `liblzma` @@ -28,7 +28,7 @@ cargo test --test sys_equivalence ## 2. Compare the full test suite -Use `hyperfine` to compare end-to-end wall clock time of the deterministic root test bundle (`xz` vs C) and `systest` with isolated target directories per backend: +Use `hyperfine` to compare end-to-end wall clock time of the deterministic root test bundle (`xz-core` vs C) and `systest` with isolated target directories per backend: ```bash scripts/compare_backends.sh --runs 10 --warmup 2 @@ -58,7 +58,7 @@ The root bundle intentionally skips QuickCheck-based unit tests because they gen ## 3. Compare focused workloads -Use `perf-probe`, a small standalone binary crate that links exactly one backend at a time. `scripts/compare_workloads.sh` compares all three backends in separate processes: direct `xz`, `xz-sys`, and vendored C `liblzma-sys`. +Use `perf-probe`, a small standalone binary crate that links exactly one backend at a time. `scripts/compare_workloads.sh` compares all three backends in separate processes: direct `xz-core`, `xz-sys`, and vendored C `liblzma-sys`. Examples: @@ -124,9 +124,9 @@ Use `--name-pattern ` to isolate a file family inside the XZ corpus w Examples: ```bash -scripts/profile_backend.sh xz decode --size 1048576 --iters 800 --warmup 80 -scripts/profile_backend.sh xz size --input-kind random --size 1048576 --iters 800 --warmup 80 -scripts/profile_backend.sh xz encode --input-kind random --size 8388608 --iters 150 --warmup 20 +scripts/profile_backend.sh xz-core decode --size 1048576 --iters 800 --warmup 80 +scripts/profile_backend.sh xz-core size --input-kind random --size 1048576 --iters 800 --warmup 80 +scripts/profile_backend.sh xz-core encode --input-kind random --size 8388608 --iters 150 --warmup 20 scripts/profile_backend.sh c crc64 --size 16777216 --iters 400 ``` @@ -151,8 +151,8 @@ On macOS the script prefers `samply`; on Linux it falls back to `perf`; otherwis After a profile points to a hot Rust function, inspect its optimized output: ```bash -scripts/inspect_codegen.sh xz::lzma::lzma_encoder::lzma_encode --package xz -scripts/inspect_codegen.sh xz::check::crc64_fast::lzma_crc64 --package xz --format llvm +scripts/inspect_codegen.sh xz_core::lzma::lzma_encoder::lzma_encode --package xz-core +scripts/inspect_codegen.sh xz_core::check::crc64_fast::lzma_crc64 --package xz-core --format llvm ``` This uses `cargo-asm` and builds under `target/codegen` by default. diff --git a/examples/bufread_trailing_probe.rs b/examples/bufread_trailing_probe.rs index fd02454d..25957ffd 100644 --- a/examples/bufread_trailing_probe.rs +++ b/examples/bufread_trailing_probe.rs @@ -4,8 +4,8 @@ use std::time::{Duration, Instant}; use liblzma::bufread; -#[cfg(feature = "xz")] -const BACKEND_NAME: &str = "xz"; +#[cfg(feature = "xz-core")] +const BACKEND_NAME: &str = "xz-core"; #[cfg(feature = "xz-sys")] const BACKEND_NAME: &str = "xz-sys"; #[cfg(feature = "liblzma-sys")] diff --git a/examples/qc_probe.rs b/examples/qc_probe.rs index 678cfa0d..985ab15a 100644 --- a/examples/qc_probe.rs +++ b/examples/qc_probe.rs @@ -5,8 +5,8 @@ use std::time::{Duration, Instant}; use liblzma::read; use liblzma::write; -#[cfg(feature = "xz")] -const BACKEND_NAME: &str = "xz"; +#[cfg(feature = "xz-core")] +const BACKEND_NAME: &str = "xz-core"; #[cfg(feature = "xz-sys")] const BACKEND_NAME: &str = "xz-sys"; #[cfg(feature = "liblzma-sys")] diff --git a/examples/standard_files_probe.rs b/examples/standard_files_probe.rs index 816ca9b3..8f85821b 100644 --- a/examples/standard_files_probe.rs +++ b/examples/standard_files_probe.rs @@ -8,8 +8,8 @@ use liblzma::read; use liblzma::stream; use liblzma::write; -#[cfg(feature = "xz")] -const BACKEND_NAME: &str = "xz"; +#[cfg(feature = "xz-core")] +const BACKEND_NAME: &str = "xz-core"; #[cfg(feature = "xz-sys")] const BACKEND_NAME: &str = "xz-sys"; #[cfg(feature = "liblzma-sys")] diff --git a/perf-probe/Cargo.toml b/perf-probe/Cargo.toml index 81b80ccb..16618bb1 100644 --- a/perf-probe/Cargo.toml +++ b/perf-probe/Cargo.toml @@ -6,11 +6,11 @@ publish = false [features] default = [] -xz = ["dep:xz"] +xz-core = ["dep:xz-core"] xz-sys = ["dep:xz-sys"] liblzma-sys = ["dep:liblzma-sys"] [dependencies] liblzma-sys = { path = "../liblzma-sys", optional = true } -xz = { path = "../xz", optional = true } +xz-core = { path = "../xz-core", optional = true } xz-sys = { path = "../xz-sys", optional = true } diff --git a/perf-probe/src/main.rs b/perf-probe/src/main.rs index d57c5ad4..08f3446b 100644 --- a/perf-probe/src/main.rs +++ b/perf-probe/src/main.rs @@ -1,13 +1,13 @@ #![cfg(not(target_family = "wasm"))] #[cfg(any( - all(feature = "xz", feature = "xz-sys"), - all(feature = "xz", feature = "liblzma-sys"), + all(feature = "xz-core", feature = "xz-sys"), + all(feature = "xz-core", feature = "liblzma-sys"), all(feature = "xz-sys", feature = "liblzma-sys"), ))] -compile_error!("Enable exactly one backend feature: xz, xz-sys, or liblzma-sys"); -#[cfg(not(any(feature = "xz", feature = "xz-sys", feature = "liblzma-sys")))] -compile_error!("Enable one backend feature: xz, xz-sys, or liblzma-sys"); +compile_error!("Enable exactly one backend feature: xz-core, xz-sys, or liblzma-sys"); +#[cfg(not(any(feature = "xz-core", feature = "xz-sys", feature = "liblzma-sys")))] +compile_error!("Enable one backend feature: xz-core, xz-sys, or liblzma-sys"); use std::env; use std::fs; @@ -23,10 +23,10 @@ use liblzma_sys::{ lzma_index_uncompressed_size, lzma_stream_buffer_bound, lzma_stream_buffer_decode, lzma_stream_flags as BackendStreamFlags, lzma_stream_footer_decode, }; -#[cfg(feature = "xz")] -use xz::check::{crc32_fast::lzma_crc32, crc64_fast::lzma_crc64}; -#[cfg(feature = "xz")] -use xz::common::{ +#[cfg(feature = "xz-core")] +use xz_core::check::{crc32_fast::lzma_crc32, crc64_fast::lzma_crc64}; +#[cfg(feature = "xz-core")] +use xz_core::common::{ easy_buffer_encoder::lzma_easy_buffer_encode, index::{lzma_index_end, lzma_index_uncompressed_size}, index_decoder::lzma_index_buffer_decode, @@ -34,8 +34,8 @@ use xz::common::{ stream_buffer_encoder::lzma_stream_buffer_bound, stream_flags_decoder::lzma_stream_footer_decode, }; -#[cfg(feature = "xz")] -use xz::types::{ +#[cfg(feature = "xz-core")] +use xz_core::types::{ LZMA_CHECK_CRC64, LZMA_OK, LZMA_STREAM_HEADER_SIZE, lzma_index as BackendIndex, lzma_stream_flags as BackendStreamFlags, }; @@ -47,8 +47,8 @@ use xz_sys::{ lzma_stream_flags as BackendStreamFlags, lzma_stream_footer_decode, }; -#[cfg(feature = "xz")] -const BACKEND_NAME: &str = "xz"; +#[cfg(feature = "xz-core")] +const BACKEND_NAME: &str = "xz-core"; #[cfg(feature = "liblzma-sys")] const BACKEND_NAME: &str = "liblzma-sys"; #[cfg(feature = "xz-sys")] @@ -225,7 +225,7 @@ fn usage() -> String { let mut message = String::new(); message.push_str("Usage:\n"); message.push_str( - " cargo run -p perf-probe --release --no-default-features --features -- \\\n", + " cargo run -p perf-probe --release --no-default-features --features -- \\\n", ); message.push_str(" --workload [options]\n\n"); message.push_str("Options:\n"); @@ -489,7 +489,7 @@ fn fold_bytes(len: usize, data: &[u8]) -> u64 { } unsafe fn backend_encode(input: &[u8], preset: u32) -> Vec { - #[cfg(feature = "xz")] + #[cfg(feature = "xz-core")] let bound = lzma_stream_buffer_bound(input.len()); #[cfg(any(feature = "xz-sys", feature = "liblzma-sys"))] let bound = unsafe { lzma_stream_buffer_bound(input.len()) }; diff --git a/scripts/compare_all_trimmed.sh b/scripts/compare_all_trimmed.sh index bf3dc2b3..55b2d990 100755 --- a/scripts/compare_all_trimmed.sh +++ b/scripts/compare_all_trimmed.sh @@ -106,7 +106,7 @@ record_pair() { echo "prebuilding root test binaries..." env CARGO_TARGET_DIR="$RUST_TARGET" \ - cargo test -p liblzma --release --no-default-features --features xz --lib --tests --no-run >/dev/null + cargo test -p liblzma --release --no-default-features --features xz-core --lib --tests --no-run >/dev/null env LZMA_API_STATIC=1 CARGO_TARGET_DIR="$C_TARGET" \ cargo test --release --no-default-features --features liblzma-sys --lib --tests --no-run >/dev/null @@ -118,14 +118,14 @@ env LZMA_API_STATIC=1 CARGO_TARGET_DIR="$C_TARGET" \ echo "prebuilding focused workload probes..." env CARGO_TARGET_DIR="$RUST_TARGET" \ - cargo build -p perf-probe --release --no-default-features --features xz >/dev/null + cargo build -p perf-probe --release --no-default-features --features xz-core >/dev/null env LZMA_API_STATIC=1 CARGO_TARGET_DIR="$C_TARGET" \ cargo build -p perf-probe --release --no-default-features --features liblzma-sys >/dev/null echo "prebuilding API workload probes..." for example in standard_files_probe qc_probe bufread_trailing_probe; do env CARGO_TARGET_DIR="$RUST_TARGET" \ - cargo build --example "$example" --release --no-default-features --features xz >/dev/null + cargo build --example "$example" --release --no-default-features --features xz-core >/dev/null env LZMA_API_STATIC=1 CARGO_TARGET_DIR="$C_TARGET" \ cargo build --example "$example" --release --no-default-features --features liblzma-sys >/dev/null done @@ -142,7 +142,7 @@ DECODE_INPUT="$RESULTS_DIR/decode-input-1048576.xz" record_pair \ root-tests \ "root test bundle" \ - xz-tests \ + xz-core-tests \ "./scripts/run_root_test_bins.sh $RUST_TARGET $ROOT_REPEATS" \ c-tests \ "./scripts/run_root_test_bins.sh $C_TARGET $ROOT_REPEATS" @@ -158,7 +158,7 @@ record_pair \ record_pair \ encode \ "focused encode random 1MiB" \ - xz \ + xz-core \ "$PROBE_RUST_BIN --workload encode --input-kind random --size 1048576 --iters 300 --warmup 20" \ c \ "$PROBE_C_BIN --workload encode --input-kind random --size 1048576 --iters 300 --warmup 20" @@ -166,7 +166,7 @@ record_pair \ record_pair \ decode \ "focused decode random 1MiB" \ - xz \ + xz-core \ "$PROBE_RUST_BIN --workload decode --compressed-input $DECODE_INPUT --expected-size 1048576 --iters 800 --warmup 80" \ c \ "$PROBE_C_BIN --workload decode --compressed-input $DECODE_INPUT --expected-size 1048576 --iters 800 --warmup 80" @@ -174,7 +174,7 @@ record_pair \ record_pair \ size \ "focused uncompressed_size random 1MiB" \ - xz \ + xz-core \ "$PROBE_RUST_BIN --workload size --compressed-input $DECODE_INPUT --expected-size 1048576 --iters 2000000 --warmup 200000" \ c \ "$PROBE_C_BIN --workload size --compressed-input $DECODE_INPUT --expected-size 1048576 --iters 2000000 --warmup 200000" @@ -182,7 +182,7 @@ record_pair \ record_pair \ crc32 \ "focused crc32 16MiB" \ - xz \ + xz-core \ "$PROBE_RUST_BIN --workload crc32 --size 16777216 --iters 300 --warmup 20" \ c \ "$PROBE_C_BIN --workload crc32 --size 16777216 --iters 300 --warmup 20" @@ -190,7 +190,7 @@ record_pair \ record_pair \ crc64-large \ "focused crc64 16MiB" \ - xz \ + xz-core \ "$PROBE_RUST_BIN --workload crc64 --size 16777216 --iters 400 --warmup 20" \ c \ "$PROBE_C_BIN --workload crc64 --size 16777216 --iters 400 --warmup 20" @@ -198,7 +198,7 @@ record_pair \ record_pair \ crc64-smallchunk \ "focused crc64 1MiB chunk 16" \ - xz \ + xz-core \ "$PROBE_RUST_BIN --workload crc64 --size 1048576 --chunk-size 16 --iters 400 --warmup 40" \ c \ "$PROBE_C_BIN --workload crc64 --size 1048576 --chunk-size 16 --iters 400 --warmup 40" @@ -206,7 +206,7 @@ record_pair \ record_pair \ api-standard-files-all \ "API standard files all" \ - xz \ + xz-core \ "$API_RUST_EXAMPLES/standard_files_probe --mode all --iters 200 --warmup 20" \ c \ "$API_C_EXAMPLES/standard_files_probe --mode all --iters 200 --warmup 20" @@ -214,7 +214,7 @@ record_pair \ record_pair \ api-standard-files-good \ "API standard files good" \ - xz \ + xz-core \ "$API_RUST_EXAMPLES/standard_files_probe --mode good --iters 1000 --warmup 100" \ c \ "$API_C_EXAMPLES/standard_files_probe --mode good --iters 1000 --warmup 100" @@ -222,7 +222,7 @@ record_pair \ record_pair \ api-standard-files-delta \ "API standard files good delta" \ - xz \ + xz-core \ "$API_RUST_EXAMPLES/standard_files_probe --mode good --name-pattern delta --iters 400 --warmup 40" \ c \ "$API_C_EXAMPLES/standard_files_probe --mode good --name-pattern delta --iters 400 --warmup 40" @@ -230,7 +230,7 @@ record_pair \ record_pair \ api-qc \ "API qc both" \ - xz \ + xz-core \ "$API_RUST_EXAMPLES/qc_probe --mode both --cases 128 --max-size 4096 --iters 200 --warmup 20" \ c \ "$API_C_EXAMPLES/qc_probe --mode both --cases 128 --max-size 4096 --iters 200 --warmup 20" @@ -238,7 +238,7 @@ record_pair \ record_pair \ api-bufread-trailing \ "API bufread trailing" \ - xz \ + xz-core \ "$API_RUST_EXAMPLES/bufread_trailing_probe --mode both --input-size 1024 --trailing-size 123 --iters 1000 --warmup 100" \ c \ "$API_C_EXAMPLES/bufread_trailing_probe --mode both --input-size 1024 --trailing-size 123 --iters 1000 --warmup 100" diff --git a/scripts/compare_api_workloads.sh b/scripts/compare_api_workloads.sh index 19a5cdc7..3bcb56a6 100755 --- a/scripts/compare_api_workloads.sh +++ b/scripts/compare_api_workloads.sh @@ -50,7 +50,7 @@ esac RUST_BIN="$RUST_TARGET/release/examples/$EXAMPLE_NAME" C_BIN="$C_TARGET/release/examples/$EXAMPLE_NAME" -env CARGO_TARGET_DIR="$RUST_TARGET" cargo build --example "$EXAMPLE_NAME" --release --no-default-features --features xz >/dev/null +env CARGO_TARGET_DIR="$RUST_TARGET" cargo build --example "$EXAMPLE_NAME" --release --no-default-features --features xz-core >/dev/null env LZMA_API_STATIC=1 CARGO_TARGET_DIR="$C_TARGET" cargo build --example "$EXAMPLE_NAME" --release --no-default-features --features liblzma-sys >/dev/null hyperfine \ @@ -58,7 +58,7 @@ hyperfine \ --warmup 2 \ --export-json "$RESULTS_DIR/api-${WORKLOAD}.json" \ --export-markdown "$RESULTS_DIR/api-${WORKLOAD}.md" \ - --command-name xz \ + --command-name xz-core \ "$RUST_BIN ${RAW_ARGS[*]}" \ --command-name c \ "$C_BIN ${RAW_ARGS[*]}" diff --git a/scripts/compare_backends.sh b/scripts/compare_backends.sh index f16fb023..b4b08876 100755 --- a/scripts/compare_backends.sh +++ b/scripts/compare_backends.sh @@ -33,7 +33,7 @@ while [[ $# -gt 0 ]]; do cat <<'EOF' Usage: scripts/compare_backends.sh [options] -Compare full test-suite wall clock time for the direct `xz` backend and C backend using hyperfine. +Compare full test-suite wall clock time for the direct `xz-core` backend and C backend using hyperfine. Results are written under target/perf-results by default. Options: @@ -70,7 +70,7 @@ SYSTEST_RUST_CMD="env CARGO_TARGET_DIR=$SYSTEST_RUST_TARGET cargo test -p systes SYSTEST_C_CMD="env LZMA_API_STATIC=1 CARGO_TARGET_DIR=$SYSTEST_C_TARGET cargo test -p systest --release --no-default-features --features liblzma-sys -- --test-threads=1" echo "prebuilding root test binaries..." -env CARGO_TARGET_DIR="$ROOT_RUST_TARGET" cargo test -p liblzma --release --no-default-features --features xz --no-run >/dev/null +env CARGO_TARGET_DIR="$ROOT_RUST_TARGET" cargo test -p liblzma --release --no-default-features --features xz-core --no-run >/dev/null env LZMA_API_STATIC=1 CARGO_TARGET_DIR="$ROOT_C_TARGET" cargo test --release --no-default-features --features liblzma-sys --no-run >/dev/null hyperfine \ @@ -79,7 +79,7 @@ hyperfine \ --warmup "$WARMUP" \ --export-json "$RESULTS_DIR/root-tests.json" \ --export-markdown "$RESULTS_DIR/root-tests.md" \ - --command-name xz-tests \ + --command-name xz-core-tests \ "$ROOT_RUST_CMD" \ --command-name c-tests \ "$ROOT_C_CMD" diff --git a/scripts/compare_workloads.sh b/scripts/compare_workloads.sh index ae162c68..f9fd2cef 100755 --- a/scripts/compare_workloads.sh +++ b/scripts/compare_workloads.sh @@ -32,7 +32,7 @@ RUST_BIN="$RUST_TARGET/release/perf-probe" RUST_SYS_BIN="$RUST_SYS_TARGET/release/perf-probe" C_BIN="$C_TARGET/release/perf-probe" -env CARGO_TARGET_DIR="$RUST_TARGET" cargo build -p perf-probe --release --no-default-features --features xz >/dev/null +env CARGO_TARGET_DIR="$RUST_TARGET" cargo build -p perf-probe --release --no-default-features --features xz-core >/dev/null env CARGO_TARGET_DIR="$RUST_SYS_TARGET" cargo build -p perf-probe --release --no-default-features --features xz-sys >/dev/null env LZMA_API_STATIC=1 CARGO_TARGET_DIR="$C_TARGET" cargo build -p perf-probe --release --no-default-features --features liblzma-sys >/dev/null @@ -120,7 +120,7 @@ hyperfine \ --warmup 2 \ --export-json "$RESULTS_DIR/${WORKLOAD}.json" \ --export-markdown "$RESULTS_DIR/${WORKLOAD}.md" \ - --command-name xz \ + --command-name xz-core \ "${RUST_CMD[*]}" \ --command-name xz-sys \ "${RUST_SYS_CMD[*]}" \ diff --git a/scripts/inspect_codegen.sh b/scripts/inspect_codegen.sh index be32c792..d3722236 100755 --- a/scripts/inspect_codegen.sh +++ b/scripts/inspect_codegen.sh @@ -12,8 +12,8 @@ Options: --target-dir Cargo target dir (default: target/codegen) Example: - scripts/inspect_codegen.sh xz::lzma::lzma2_encoder::lzma2_encode \ - --package xz --format asm + scripts/inspect_codegen.sh xz_core::lzma::lzma2_encoder::lzma2_encode \ + --package xz-core --format asm EOF } @@ -30,7 +30,7 @@ fi SYMBOL="$1" shift -PACKAGE="xz" +PACKAGE="xz-core" FORMAT="asm" FEATURES="" TARGET_DIR="target/codegen" diff --git a/scripts/profile_backend.sh b/scripts/profile_backend.sh index 5bcab7eb..8f873627 100755 --- a/scripts/profile_backend.sh +++ b/scripts/profile_backend.sh @@ -3,11 +3,11 @@ set -euo pipefail if [[ $# -lt 2 ]]; then cat <<'EOF' >&2 -Usage: scripts/profile_backend.sh [backend_probe args...] +Usage: scripts/profile_backend.sh [backend_probe args...] Examples: - scripts/profile_backend.sh xz decode --size 1048576 --iters 500 --warmup 50 - scripts/profile_backend.sh xz size --input-kind random --size 1048576 --iters 800 --warmup 80 + scripts/profile_backend.sh xz-core decode --size 1048576 --iters 500 --warmup 50 + scripts/profile_backend.sh xz-core size --input-kind random --size 1048576 --iters 800 --warmup 80 Environment: PROFILER=auto|samply|perf|plain default: auto @@ -29,8 +29,8 @@ case "$BACKEND" in TARGET_DIR="target/profile-bench-c" BACKEND_ENV=(LZMA_API_STATIC=1) ;; - xz|rust) - FEATURE="xz" + xz-core|xz|rust) + FEATURE="xz-core" TARGET_DIR="target/profile-bench-rust" BACKEND_ENV=() ;; diff --git a/src/lib.rs b/src/lib.rs index a2ef1626..b4c357a6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -53,19 +53,19 @@ #![deny(missing_docs)] #[cfg(any( - all(feature = "xz", feature = "xz-sys"), - all(feature = "xz", feature = "liblzma-sys"), + all(feature = "xz-core", feature = "xz-sys"), + all(feature = "xz-core", feature = "liblzma-sys"), all(feature = "xz-sys", feature = "liblzma-sys"), ))] -compile_error!("Enable exactly one of `xz`, `xz-sys`, or `liblzma-sys`"); +compile_error!("Enable exactly one of `xz-core`, `xz-sys`, or `liblzma-sys`"); -#[cfg(not(any(feature = "xz", feature = "xz-sys", feature = "liblzma-sys")))] -compile_error!("Enable `xz`, `xz-sys`, or `liblzma-sys`"); +#[cfg(not(any(feature = "xz-core", feature = "xz-sys", feature = "liblzma-sys")))] +compile_error!("Enable `xz-core`, `xz-sys`, or `liblzma-sys`"); -#[cfg(feature = "xz")] +#[cfg(feature = "xz-core")] pub(crate) mod sys { - pub(crate) use xz::check::check::lzma_check_is_supported; - pub(crate) use xz::common::{ + pub(crate) use xz_core::check::check::lzma_check_is_supported; + pub(crate) use xz_core::common::{ alone_decoder::lzma_alone_decoder, alone_encoder::lzma_alone_encoder, auto_decoder::lzma_auto_decoder, @@ -82,15 +82,17 @@ pub(crate) mod sys { string_conversion::LZMA_PRESET_DEFAULT, }; #[cfg(feature = "parallel")] - pub(crate) use xz::common::{ + pub(crate) use xz_core::common::{ filter_encoder::lzma_mt_block_size, stream_mt::{ lzma_stream_decoder_mt, lzma_stream_encoder_mt, lzma_stream_encoder_mt_memusage, }, }; - pub(crate) use xz::lz::lz_encoder::lzma_mf_is_supported; - pub(crate) use xz::lzma::lzma_encoder_presets::{lzma_lzma_preset, LZMA_PRESET_LEVEL_MASK}; - pub(crate) use xz::types::*; + pub(crate) use xz_core::lz::lz_encoder::lzma_mf_is_supported; + pub(crate) use xz_core::lzma::lzma_encoder_presets::{ + lzma_lzma_preset, LZMA_PRESET_LEVEL_MASK, + }; + pub(crate) use xz_core::types::*; } #[cfg(feature = "xz-sys")] diff --git a/src/stream.rs b/src/stream.rs index 4cbc7ec4..cb9775b7 100644 --- a/src/stream.rs +++ b/src/stream.rs @@ -4,7 +4,7 @@ //! encoding/decoding of LZMA streams. Each [`Stream`] is either an encoder or //! decoder and processes data in a streaming fashion. -#![cfg_attr(feature = "xz", allow(unused_unsafe))] +#![cfg_attr(feature = "xz-core", allow(unused_unsafe))] use std::collections::LinkedList; use std::error; diff --git a/systest/build.rs b/systest/build.rs index 227deb74..e50633f3 100644 --- a/systest/build.rs +++ b/systest/build.rs @@ -177,7 +177,7 @@ fn main() { let bare_externs = vec!["libc"]; let mut path_externs = Vec::new(); if use_rs_sys { - path_externs.push(("xz", latest_rlib(&deps_dir, "xz"))); + path_externs.push(("xz_core", latest_rlib(&deps_dir, "xz_core"))); } let rustc_wrapper = write_rustc_wrapper( &PathBuf::from(env::var_os("OUT_DIR").unwrap()), diff --git a/tests/sys_equivalence.rs b/tests/sys_equivalence.rs index be3ae82f..ef199df9 100644 --- a/tests/sys_equivalence.rs +++ b/tests/sys_equivalence.rs @@ -77,8 +77,8 @@ fn rs_sys_avoids_literal_lzma_const_defs() { stmt.push(' '); if trimmed.ends_with(';') { assert!( - stmt.contains("= xz::"), - "LZMA const must alias xz symbol, not use local literal (line {}): {}", + stmt.contains("= xz_core::"), + "LZMA const must alias xz-core symbol, not use local literal (line {}): {}", start_line, stmt ); diff --git a/xz/Cargo.toml b/xz-core/Cargo.toml similarity index 96% rename from xz/Cargo.toml rename to xz-core/Cargo.toml index 8a13865b..5e95c865 100644 --- a/xz/Cargo.toml +++ b/xz-core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "xz" +name = "xz-core" version = "0.1.0" edition = "2024" license = "MIT OR Apache-2.0" diff --git a/xz/src/alloc.rs b/xz-core/src/alloc.rs similarity index 100% rename from xz/src/alloc.rs rename to xz-core/src/alloc.rs diff --git a/xz/src/check/check.rs b/xz-core/src/check/check.rs similarity index 100% rename from xz/src/check/check.rs rename to xz-core/src/check/check.rs diff --git a/xz/src/check/crc32_fast.rs b/xz-core/src/check/crc32_fast.rs similarity index 100% rename from xz/src/check/crc32_fast.rs rename to xz-core/src/check/crc32_fast.rs diff --git a/xz/src/check/crc64_fast.rs b/xz-core/src/check/crc64_fast.rs similarity index 100% rename from xz/src/check/crc64_fast.rs rename to xz-core/src/check/crc64_fast.rs diff --git a/xz/src/check/mod.rs b/xz-core/src/check/mod.rs similarity index 100% rename from xz/src/check/mod.rs rename to xz-core/src/check/mod.rs diff --git a/xz/src/check/sha256.rs b/xz-core/src/check/sha256.rs similarity index 100% rename from xz/src/check/sha256.rs rename to xz-core/src/check/sha256.rs diff --git a/xz/src/common/alone_decoder.rs b/xz-core/src/common/alone_decoder.rs similarity index 100% rename from xz/src/common/alone_decoder.rs rename to xz-core/src/common/alone_decoder.rs diff --git a/xz/src/common/alone_encoder.rs b/xz-core/src/common/alone_encoder.rs similarity index 100% rename from xz/src/common/alone_encoder.rs rename to xz-core/src/common/alone_encoder.rs diff --git a/xz/src/common/auto_decoder.rs b/xz-core/src/common/auto_decoder.rs similarity index 100% rename from xz/src/common/auto_decoder.rs rename to xz-core/src/common/auto_decoder.rs diff --git a/xz/src/common/block_buffer_decoder.rs b/xz-core/src/common/block_buffer_decoder.rs similarity index 100% rename from xz/src/common/block_buffer_decoder.rs rename to xz-core/src/common/block_buffer_decoder.rs diff --git a/xz/src/common/block_buffer_encoder.rs b/xz-core/src/common/block_buffer_encoder.rs similarity index 100% rename from xz/src/common/block_buffer_encoder.rs rename to xz-core/src/common/block_buffer_encoder.rs diff --git a/xz/src/common/block_decoder.rs b/xz-core/src/common/block_decoder.rs similarity index 100% rename from xz/src/common/block_decoder.rs rename to xz-core/src/common/block_decoder.rs diff --git a/xz/src/common/block_encoder.rs b/xz-core/src/common/block_encoder.rs similarity index 100% rename from xz/src/common/block_encoder.rs rename to xz-core/src/common/block_encoder.rs diff --git a/xz/src/common/block_header_decoder.rs b/xz-core/src/common/block_header_decoder.rs similarity index 100% rename from xz/src/common/block_header_decoder.rs rename to xz-core/src/common/block_header_decoder.rs diff --git a/xz/src/common/block_header_encoder.rs b/xz-core/src/common/block_header_encoder.rs similarity index 100% rename from xz/src/common/block_header_encoder.rs rename to xz-core/src/common/block_header_encoder.rs diff --git a/xz/src/common/block_util.rs b/xz-core/src/common/block_util.rs similarity index 100% rename from xz/src/common/block_util.rs rename to xz-core/src/common/block_util.rs diff --git a/xz/src/common/common.rs b/xz-core/src/common/common.rs similarity index 100% rename from xz/src/common/common.rs rename to xz-core/src/common/common.rs diff --git a/xz/src/common/common_types.rs b/xz-core/src/common/common_types.rs similarity index 100% rename from xz/src/common/common_types.rs rename to xz-core/src/common/common_types.rs diff --git a/xz/src/common/easy_buffer_encoder.rs b/xz-core/src/common/easy_buffer_encoder.rs similarity index 100% rename from xz/src/common/easy_buffer_encoder.rs rename to xz-core/src/common/easy_buffer_encoder.rs diff --git a/xz/src/common/easy_decoder_memusage.rs b/xz-core/src/common/easy_decoder_memusage.rs similarity index 100% rename from xz/src/common/easy_decoder_memusage.rs rename to xz-core/src/common/easy_decoder_memusage.rs diff --git a/xz/src/common/easy_encoder.rs b/xz-core/src/common/easy_encoder.rs similarity index 100% rename from xz/src/common/easy_encoder.rs rename to xz-core/src/common/easy_encoder.rs diff --git a/xz/src/common/easy_encoder_memusage.rs b/xz-core/src/common/easy_encoder_memusage.rs similarity index 100% rename from xz/src/common/easy_encoder_memusage.rs rename to xz-core/src/common/easy_encoder_memusage.rs diff --git a/xz/src/common/easy_preset.rs b/xz-core/src/common/easy_preset.rs similarity index 100% rename from xz/src/common/easy_preset.rs rename to xz-core/src/common/easy_preset.rs diff --git a/xz/src/common/file_info.rs b/xz-core/src/common/file_info.rs similarity index 100% rename from xz/src/common/file_info.rs rename to xz-core/src/common/file_info.rs diff --git a/xz/src/common/filter_buffer_decoder.rs b/xz-core/src/common/filter_buffer_decoder.rs similarity index 100% rename from xz/src/common/filter_buffer_decoder.rs rename to xz-core/src/common/filter_buffer_decoder.rs diff --git a/xz/src/common/filter_buffer_encoder.rs b/xz-core/src/common/filter_buffer_encoder.rs similarity index 100% rename from xz/src/common/filter_buffer_encoder.rs rename to xz-core/src/common/filter_buffer_encoder.rs diff --git a/xz/src/common/filter_common.rs b/xz-core/src/common/filter_common.rs similarity index 100% rename from xz/src/common/filter_common.rs rename to xz-core/src/common/filter_common.rs diff --git a/xz/src/common/filter_decoder.rs b/xz-core/src/common/filter_decoder.rs similarity index 100% rename from xz/src/common/filter_decoder.rs rename to xz-core/src/common/filter_decoder.rs diff --git a/xz/src/common/filter_encoder.rs b/xz-core/src/common/filter_encoder.rs similarity index 100% rename from xz/src/common/filter_encoder.rs rename to xz-core/src/common/filter_encoder.rs diff --git a/xz/src/common/filter_flags_decoder.rs b/xz-core/src/common/filter_flags_decoder.rs similarity index 100% rename from xz/src/common/filter_flags_decoder.rs rename to xz-core/src/common/filter_flags_decoder.rs diff --git a/xz/src/common/filter_flags_encoder.rs b/xz-core/src/common/filter_flags_encoder.rs similarity index 100% rename from xz/src/common/filter_flags_encoder.rs rename to xz-core/src/common/filter_flags_encoder.rs diff --git a/xz/src/common/hardware_cputhreads.rs b/xz-core/src/common/hardware_cputhreads.rs similarity index 100% rename from xz/src/common/hardware_cputhreads.rs rename to xz-core/src/common/hardware_cputhreads.rs diff --git a/xz/src/common/hardware_physmem.rs b/xz-core/src/common/hardware_physmem.rs similarity index 100% rename from xz/src/common/hardware_physmem.rs rename to xz-core/src/common/hardware_physmem.rs diff --git a/xz/src/common/index.rs b/xz-core/src/common/index.rs similarity index 100% rename from xz/src/common/index.rs rename to xz-core/src/common/index.rs diff --git a/xz/src/common/index_decoder.rs b/xz-core/src/common/index_decoder.rs similarity index 100% rename from xz/src/common/index_decoder.rs rename to xz-core/src/common/index_decoder.rs diff --git a/xz/src/common/index_encoder.rs b/xz-core/src/common/index_encoder.rs similarity index 100% rename from xz/src/common/index_encoder.rs rename to xz-core/src/common/index_encoder.rs diff --git a/xz/src/common/index_hash.rs b/xz-core/src/common/index_hash.rs similarity index 100% rename from xz/src/common/index_hash.rs rename to xz-core/src/common/index_hash.rs diff --git a/xz/src/common/lzip_decoder.rs b/xz-core/src/common/lzip_decoder.rs similarity index 100% rename from xz/src/common/lzip_decoder.rs rename to xz-core/src/common/lzip_decoder.rs diff --git a/xz/src/common/microlzma_decoder.rs b/xz-core/src/common/microlzma_decoder.rs similarity index 100% rename from xz/src/common/microlzma_decoder.rs rename to xz-core/src/common/microlzma_decoder.rs diff --git a/xz/src/common/microlzma_encoder.rs b/xz-core/src/common/microlzma_encoder.rs similarity index 100% rename from xz/src/common/microlzma_encoder.rs rename to xz-core/src/common/microlzma_encoder.rs diff --git a/xz/src/common/mod.rs b/xz-core/src/common/mod.rs similarity index 100% rename from xz/src/common/mod.rs rename to xz-core/src/common/mod.rs diff --git a/xz/src/common/outqueue.rs b/xz-core/src/common/outqueue.rs similarity index 100% rename from xz/src/common/outqueue.rs rename to xz-core/src/common/outqueue.rs diff --git a/xz/src/common/stream_buffer_decoder.rs b/xz-core/src/common/stream_buffer_decoder.rs similarity index 100% rename from xz/src/common/stream_buffer_decoder.rs rename to xz-core/src/common/stream_buffer_decoder.rs diff --git a/xz/src/common/stream_buffer_encoder.rs b/xz-core/src/common/stream_buffer_encoder.rs similarity index 100% rename from xz/src/common/stream_buffer_encoder.rs rename to xz-core/src/common/stream_buffer_encoder.rs diff --git a/xz/src/common/stream_decoder.rs b/xz-core/src/common/stream_decoder.rs similarity index 100% rename from xz/src/common/stream_decoder.rs rename to xz-core/src/common/stream_decoder.rs diff --git a/xz/src/common/stream_decoder_mt.rs b/xz-core/src/common/stream_decoder_mt.rs similarity index 100% rename from xz/src/common/stream_decoder_mt.rs rename to xz-core/src/common/stream_decoder_mt.rs diff --git a/xz/src/common/stream_encoder.rs b/xz-core/src/common/stream_encoder.rs similarity index 100% rename from xz/src/common/stream_encoder.rs rename to xz-core/src/common/stream_encoder.rs diff --git a/xz/src/common/stream_encoder_mt.rs b/xz-core/src/common/stream_encoder_mt.rs similarity index 100% rename from xz/src/common/stream_encoder_mt.rs rename to xz-core/src/common/stream_encoder_mt.rs diff --git a/xz/src/common/stream_flags_common.rs b/xz-core/src/common/stream_flags_common.rs similarity index 100% rename from xz/src/common/stream_flags_common.rs rename to xz-core/src/common/stream_flags_common.rs diff --git a/xz/src/common/stream_flags_decoder.rs b/xz-core/src/common/stream_flags_decoder.rs similarity index 100% rename from xz/src/common/stream_flags_decoder.rs rename to xz-core/src/common/stream_flags_decoder.rs diff --git a/xz/src/common/stream_flags_encoder.rs b/xz-core/src/common/stream_flags_encoder.rs similarity index 100% rename from xz/src/common/stream_flags_encoder.rs rename to xz-core/src/common/stream_flags_encoder.rs diff --git a/xz/src/common/stream_mt.rs b/xz-core/src/common/stream_mt.rs similarity index 100% rename from xz/src/common/stream_mt.rs rename to xz-core/src/common/stream_mt.rs diff --git a/xz/src/common/string_conversion.rs b/xz-core/src/common/string_conversion.rs similarity index 100% rename from xz/src/common/string_conversion.rs rename to xz-core/src/common/string_conversion.rs diff --git a/xz/src/common/threading.rs b/xz-core/src/common/threading.rs similarity index 100% rename from xz/src/common/threading.rs rename to xz-core/src/common/threading.rs diff --git a/xz/src/common/vli_decoder.rs b/xz-core/src/common/vli_decoder.rs similarity index 100% rename from xz/src/common/vli_decoder.rs rename to xz-core/src/common/vli_decoder.rs diff --git a/xz/src/common/vli_encoder.rs b/xz-core/src/common/vli_encoder.rs similarity index 100% rename from xz/src/common/vli_encoder.rs rename to xz-core/src/common/vli_encoder.rs diff --git a/xz/src/common/vli_size.rs b/xz-core/src/common/vli_size.rs similarity index 100% rename from xz/src/common/vli_size.rs rename to xz-core/src/common/vli_size.rs diff --git a/xz/src/delta/delta_common.rs b/xz-core/src/delta/delta_common.rs similarity index 100% rename from xz/src/delta/delta_common.rs rename to xz-core/src/delta/delta_common.rs diff --git a/xz/src/delta/delta_decoder.rs b/xz-core/src/delta/delta_decoder.rs similarity index 100% rename from xz/src/delta/delta_decoder.rs rename to xz-core/src/delta/delta_decoder.rs diff --git a/xz/src/delta/delta_encoder.rs b/xz-core/src/delta/delta_encoder.rs similarity index 100% rename from xz/src/delta/delta_encoder.rs rename to xz-core/src/delta/delta_encoder.rs diff --git a/xz/src/delta/mod.rs b/xz-core/src/delta/mod.rs similarity index 100% rename from xz/src/delta/mod.rs rename to xz-core/src/delta/mod.rs diff --git a/xz/src/lib.rs b/xz-core/src/lib.rs similarity index 100% rename from xz/src/lib.rs rename to xz-core/src/lib.rs diff --git a/xz/src/lz/lz_decoder.rs b/xz-core/src/lz/lz_decoder.rs similarity index 100% rename from xz/src/lz/lz_decoder.rs rename to xz-core/src/lz/lz_decoder.rs diff --git a/xz/src/lz/lz_encoder.rs b/xz-core/src/lz/lz_encoder.rs similarity index 100% rename from xz/src/lz/lz_encoder.rs rename to xz-core/src/lz/lz_encoder.rs diff --git a/xz/src/lz/lz_encoder_mf.rs b/xz-core/src/lz/lz_encoder_mf.rs similarity index 100% rename from xz/src/lz/lz_encoder_mf.rs rename to xz-core/src/lz/lz_encoder_mf.rs diff --git a/xz/src/lz/mod.rs b/xz-core/src/lz/mod.rs similarity index 100% rename from xz/src/lz/mod.rs rename to xz-core/src/lz/mod.rs diff --git a/xz/src/lzma/fastpos_table.rs b/xz-core/src/lzma/fastpos_table.rs similarity index 100% rename from xz/src/lzma/fastpos_table.rs rename to xz-core/src/lzma/fastpos_table.rs diff --git a/xz/src/lzma/lzma2_decoder.rs b/xz-core/src/lzma/lzma2_decoder.rs similarity index 100% rename from xz/src/lzma/lzma2_decoder.rs rename to xz-core/src/lzma/lzma2_decoder.rs diff --git a/xz/src/lzma/lzma2_encoder.rs b/xz-core/src/lzma/lzma2_encoder.rs similarity index 100% rename from xz/src/lzma/lzma2_encoder.rs rename to xz-core/src/lzma/lzma2_encoder.rs diff --git a/xz/src/lzma/lzma_decoder.rs b/xz-core/src/lzma/lzma_decoder.rs similarity index 100% rename from xz/src/lzma/lzma_decoder.rs rename to xz-core/src/lzma/lzma_decoder.rs diff --git a/xz/src/lzma/lzma_encoder.rs b/xz-core/src/lzma/lzma_encoder.rs similarity index 100% rename from xz/src/lzma/lzma_encoder.rs rename to xz-core/src/lzma/lzma_encoder.rs diff --git a/xz/src/lzma/lzma_encoder_optimum_fast.rs b/xz-core/src/lzma/lzma_encoder_optimum_fast.rs similarity index 100% rename from xz/src/lzma/lzma_encoder_optimum_fast.rs rename to xz-core/src/lzma/lzma_encoder_optimum_fast.rs diff --git a/xz/src/lzma/lzma_encoder_optimum_normal.rs b/xz-core/src/lzma/lzma_encoder_optimum_normal.rs similarity index 100% rename from xz/src/lzma/lzma_encoder_optimum_normal.rs rename to xz-core/src/lzma/lzma_encoder_optimum_normal.rs diff --git a/xz/src/lzma/lzma_encoder_presets.rs b/xz-core/src/lzma/lzma_encoder_presets.rs similarity index 100% rename from xz/src/lzma/lzma_encoder_presets.rs rename to xz-core/src/lzma/lzma_encoder_presets.rs diff --git a/xz/src/lzma/mod.rs b/xz-core/src/lzma/mod.rs similarity index 100% rename from xz/src/lzma/mod.rs rename to xz-core/src/lzma/mod.rs diff --git a/xz/src/rangecoder/mod.rs b/xz-core/src/rangecoder/mod.rs similarity index 100% rename from xz/src/rangecoder/mod.rs rename to xz-core/src/rangecoder/mod.rs diff --git a/xz/src/rangecoder/price_table.rs b/xz-core/src/rangecoder/price_table.rs similarity index 100% rename from xz/src/rangecoder/price_table.rs rename to xz-core/src/rangecoder/price_table.rs diff --git a/xz/src/simple/arm.rs b/xz-core/src/simple/arm.rs similarity index 100% rename from xz/src/simple/arm.rs rename to xz-core/src/simple/arm.rs diff --git a/xz/src/simple/arm64.rs b/xz-core/src/simple/arm64.rs similarity index 100% rename from xz/src/simple/arm64.rs rename to xz-core/src/simple/arm64.rs diff --git a/xz/src/simple/armthumb.rs b/xz-core/src/simple/armthumb.rs similarity index 100% rename from xz/src/simple/armthumb.rs rename to xz-core/src/simple/armthumb.rs diff --git a/xz/src/simple/ia64.rs b/xz-core/src/simple/ia64.rs similarity index 100% rename from xz/src/simple/ia64.rs rename to xz-core/src/simple/ia64.rs diff --git a/xz/src/simple/mod.rs b/xz-core/src/simple/mod.rs similarity index 100% rename from xz/src/simple/mod.rs rename to xz-core/src/simple/mod.rs diff --git a/xz/src/simple/powerpc.rs b/xz-core/src/simple/powerpc.rs similarity index 100% rename from xz/src/simple/powerpc.rs rename to xz-core/src/simple/powerpc.rs diff --git a/xz/src/simple/riscv.rs b/xz-core/src/simple/riscv.rs similarity index 100% rename from xz/src/simple/riscv.rs rename to xz-core/src/simple/riscv.rs diff --git a/xz/src/simple/simple_coder.rs b/xz-core/src/simple/simple_coder.rs similarity index 100% rename from xz/src/simple/simple_coder.rs rename to xz-core/src/simple/simple_coder.rs diff --git a/xz/src/simple/simple_decoder.rs b/xz-core/src/simple/simple_decoder.rs similarity index 100% rename from xz/src/simple/simple_decoder.rs rename to xz-core/src/simple/simple_decoder.rs diff --git a/xz/src/simple/simple_encoder.rs b/xz-core/src/simple/simple_encoder.rs similarity index 100% rename from xz/src/simple/simple_encoder.rs rename to xz-core/src/simple/simple_encoder.rs diff --git a/xz/src/simple/sparc.rs b/xz-core/src/simple/sparc.rs similarity index 100% rename from xz/src/simple/sparc.rs rename to xz-core/src/simple/sparc.rs diff --git a/xz/src/simple/x86.rs b/xz-core/src/simple/x86.rs similarity index 100% rename from xz/src/simple/x86.rs rename to xz-core/src/simple/x86.rs diff --git a/xz/src/tuklib/mod.rs b/xz-core/src/tuklib/mod.rs similarity index 100% rename from xz/src/tuklib/mod.rs rename to xz-core/src/tuklib/mod.rs diff --git a/xz/src/tuklib/tuklib_cpucores.rs b/xz-core/src/tuklib/tuklib_cpucores.rs similarity index 100% rename from xz/src/tuklib/tuklib_cpucores.rs rename to xz-core/src/tuklib/tuklib_cpucores.rs diff --git a/xz/src/tuklib/tuklib_physmem.rs b/xz-core/src/tuklib/tuklib_physmem.rs similarity index 100% rename from xz/src/tuklib/tuklib_physmem.rs rename to xz-core/src/tuklib/tuklib_physmem.rs diff --git a/xz/src/types.rs b/xz-core/src/types.rs similarity index 100% rename from xz/src/types.rs rename to xz-core/src/types.rs diff --git a/xz-sys/Cargo.toml b/xz-sys/Cargo.toml index 00329284..3e7d1264 100644 --- a/xz-sys/Cargo.toml +++ b/xz-sys/Cargo.toml @@ -22,5 +22,5 @@ parallel = [] wasm = ["static", "bindgen"] [dependencies] -xz = { path = "../xz" } +xz-core = { path = "../xz-core" } libc = "0.2" diff --git a/xz-sys/src/lib.rs b/xz-sys/src/lib.rs index 0faba493..ee64f781 100644 --- a/xz-sys/src/lib.rs +++ b/xz-sys/src/lib.rs @@ -1,6 +1,6 @@ -//! liblzma-sys compatible API layer backed by pure Rust xz +//! liblzma-sys compatible API layer backed by pure Rust xz-core //! -//! Re-exports symbols from xz with the same names and signatures +//! Re-exports symbols from xz-core with the same names and signatures //! as liblzma-sys, enabling drop-in replacement. //! #![allow( @@ -54,17 +54,17 @@ pub type lzma_delta_type = c_uint; /**************************** * Canonical struct re-exports ****************************/ -pub use xz::common::index_hash::lzma_index_hash; -pub use xz::types::lzma_allocator; -pub use xz::types::lzma_block; -pub use xz::types::lzma_filter; -pub use xz::types::lzma_index; -pub use xz::types::lzma_index_iter; -pub use xz::types::lzma_index_iter_mode; -pub use xz::types::lzma_mt; -pub use xz::types::lzma_options_lzma; -pub use xz::types::lzma_stream; -pub use xz::types::lzma_stream_flags; +pub use xz_core::common::index_hash::lzma_index_hash; +pub use xz_core::types::lzma_allocator; +pub use xz_core::types::lzma_block; +pub use xz_core::types::lzma_filter; +pub use xz_core::types::lzma_index; +pub use xz_core::types::lzma_index_iter; +pub use xz_core::types::lzma_index_iter_mode; +pub use xz_core::types::lzma_mt; +pub use xz_core::types::lzma_options_lzma; +pub use xz_core::types::lzma_stream; +pub use xz_core::types::lzma_stream_flags; #[repr(C)] pub struct lzma_options_bcj { @@ -90,89 +90,91 @@ pub enum lzma_internal {} ******************/ /* `lzma/version.h`: compile-time version constants */ -pub const LZMA_VERSION_MAJOR: u32 = xz::common::common::LZMA_VERSION_MAJOR as u32; -pub const LZMA_VERSION_MINOR: u32 = xz::common::common::LZMA_VERSION_MINOR as u32; -pub const LZMA_VERSION_PATCH: u32 = xz::common::common::LZMA_VERSION_PATCH as u32; -pub const LZMA_VERSION: u32 = xz::common::common::LZMA_VERSION as u32; +pub const LZMA_VERSION_MAJOR: u32 = xz_core::common::common::LZMA_VERSION_MAJOR as u32; +pub const LZMA_VERSION_MINOR: u32 = xz_core::common::common::LZMA_VERSION_MINOR as u32; +pub const LZMA_VERSION_PATCH: u32 = xz_core::common::common::LZMA_VERSION_PATCH as u32; +pub const LZMA_VERSION: u32 = xz_core::common::common::LZMA_VERSION as u32; /* `lzma/base.h`: return codes */ -pub use xz::types::{ +pub use xz_core::types::{ LZMA_BUF_ERROR, LZMA_DATA_ERROR, LZMA_FORMAT_ERROR, LZMA_GET_CHECK, LZMA_MEM_ERROR, LZMA_MEMLIMIT_ERROR, LZMA_NO_CHECK, LZMA_OK, LZMA_OPTIONS_ERROR, LZMA_PROG_ERROR, LZMA_SEEK_NEEDED, LZMA_STREAM_END, LZMA_UNSUPPORTED_CHECK, }; /* `lzma/base.h`: actions */ -pub use xz::types::{LZMA_FINISH, LZMA_FULL_BARRIER, LZMA_FULL_FLUSH, LZMA_RUN, LZMA_SYNC_FLUSH}; +pub use xz_core::types::{ + LZMA_FINISH, LZMA_FULL_BARRIER, LZMA_FULL_FLUSH, LZMA_RUN, LZMA_SYNC_FLUSH, +}; /* `lzma/vli.h`: backward size / VLI */ -pub const LZMA_BACKWARD_SIZE_MIN: lzma_vli = xz::types::LZMA_BACKWARD_SIZE_MIN as lzma_vli; -pub const LZMA_BACKWARD_SIZE_MAX: lzma_vli = xz::types::LZMA_BACKWARD_SIZE_MAX as lzma_vli; -pub use xz::types::{LZMA_VLI_MAX, LZMA_VLI_UNKNOWN}; -pub const LZMA_VLI_BYTES_MAX: usize = xz::types::LZMA_VLI_BYTES_MAX as usize; +pub const LZMA_BACKWARD_SIZE_MIN: lzma_vli = xz_core::types::LZMA_BACKWARD_SIZE_MIN as lzma_vli; +pub const LZMA_BACKWARD_SIZE_MAX: lzma_vli = xz_core::types::LZMA_BACKWARD_SIZE_MAX as lzma_vli; +pub use xz_core::types::{LZMA_VLI_MAX, LZMA_VLI_UNKNOWN}; +pub const LZMA_VLI_BYTES_MAX: usize = xz_core::types::LZMA_VLI_BYTES_MAX as usize; /* `lzma/check.h`: check types */ -pub use xz::types::{LZMA_CHECK_CRC32, LZMA_CHECK_CRC64, LZMA_CHECK_NONE, LZMA_CHECK_SHA256}; -pub const LZMA_CHECK_ID_MAX: u32 = xz::types::LZMA_CHECK_ID_MAX as u32; -pub const LZMA_CHECK_SIZE_MAX: u32 = xz::types::LZMA_CHECK_SIZE_MAX as u32; +pub use xz_core::types::{LZMA_CHECK_CRC32, LZMA_CHECK_CRC64, LZMA_CHECK_NONE, LZMA_CHECK_SHA256}; +pub const LZMA_CHECK_ID_MAX: u32 = xz_core::types::LZMA_CHECK_ID_MAX as u32; +pub const LZMA_CHECK_SIZE_MAX: u32 = xz_core::types::LZMA_CHECK_SIZE_MAX as u32; /*********** * Filters * ***********/ /* `lzma/lzma12.h`: modes / match finders */ -pub use xz::types::{ +pub use xz_core::types::{ LZMA_MF_BT2, LZMA_MF_BT3, LZMA_MF_BT4, LZMA_MF_HC3, LZMA_MF_HC4, LZMA_MODE_FAST, LZMA_MODE_NORMAL, }; /* `lzma/filter.h`: filter IDs */ -pub use xz::types::{ +pub use xz_core::types::{ LZMA_FILTER_ARM, LZMA_FILTER_ARM64, LZMA_FILTER_ARMTHUMB, LZMA_FILTER_DELTA, LZMA_FILTER_IA64, LZMA_FILTER_LZMA1, LZMA_FILTER_LZMA2, LZMA_FILTER_POWERPC, LZMA_FILTER_RISCV, LZMA_FILTER_SPARC, LZMA_FILTER_X86, }; -pub const LZMA_FILTERS_MAX: u32 = xz::types::LZMA_FILTERS_MAX as u32; -pub const LZMA_DELTA_DIST_MIN: u32 = xz::types::LZMA_DELTA_DIST_MIN as u32; -pub const LZMA_DELTA_DIST_MAX: u32 = xz::types::LZMA_DELTA_DIST_MAX as u32; +pub const LZMA_FILTERS_MAX: u32 = xz_core::types::LZMA_FILTERS_MAX as u32; +pub const LZMA_DELTA_DIST_MIN: u32 = xz_core::types::LZMA_DELTA_DIST_MIN as u32; +pub const LZMA_DELTA_DIST_MAX: u32 = xz_core::types::LZMA_DELTA_DIST_MAX as u32; pub const LZMA_DELTA_TYPE_BYTE: lzma_delta_type = - xz::types::LZMA_DELTA_TYPE_BYTE as lzma_delta_type; + xz_core::types::LZMA_DELTA_TYPE_BYTE as lzma_delta_type; /********************* * Container Formats * *********************/ /* `lzma/container.h`: decoder flags */ -pub use xz::types::{ +pub use xz_core::types::{ LZMA_CONCATENATED, LZMA_IGNORE_CHECK, LZMA_TELL_ANY_CHECK, LZMA_TELL_NO_CHECK, LZMA_TELL_UNSUPPORTED_CHECK, }; /* `lzma/container.h`: presets / option limits */ -pub const LZMA_PRESET_DEFAULT: u32 = xz::common::string_conversion::LZMA_PRESET_DEFAULT as u32; +pub const LZMA_PRESET_DEFAULT: u32 = xz_core::common::string_conversion::LZMA_PRESET_DEFAULT as u32; pub const LZMA_PRESET_LEVEL_MASK: u32 = - xz::lzma::lzma_encoder_presets::LZMA_PRESET_LEVEL_MASK as u32; -pub const LZMA_PRESET_EXTREME: u32 = xz::types::LZMA_PRESET_EXTREME as u32; -pub const LZMA_DICT_SIZE_MIN: u32 = xz::types::LZMA_DICT_SIZE_MIN as u32; + xz_core::lzma::lzma_encoder_presets::LZMA_PRESET_LEVEL_MASK as u32; +pub const LZMA_PRESET_EXTREME: u32 = xz_core::types::LZMA_PRESET_EXTREME as u32; +pub const LZMA_DICT_SIZE_MIN: u32 = xz_core::types::LZMA_DICT_SIZE_MIN as u32; pub const LZMA_DICT_SIZE_DEFAULT: u32 = - xz::common::string_conversion::LZMA_DICT_SIZE_DEFAULT as u32; -pub const LZMA_LCLP_MIN: u32 = xz::common::string_conversion::LZMA_LCLP_MIN as u32; -pub const LZMA_LCLP_MAX: u32 = xz::types::LZMA_LCLP_MAX as u32; -pub const LZMA_LC_DEFAULT: u32 = xz::lzma::lzma_encoder_presets::LZMA_LC_DEFAULT as u32; -pub const LZMA_LP_DEFAULT: u32 = xz::lzma::lzma_encoder_presets::LZMA_LP_DEFAULT as u32; -pub const LZMA_PB_MIN: u32 = xz::common::string_conversion::LZMA_PB_MIN as u32; -pub const LZMA_PB_MAX: u32 = xz::types::LZMA_PB_MAX as u32; -pub const LZMA_PB_DEFAULT: u32 = xz::lzma::lzma_encoder_presets::LZMA_PB_DEFAULT as u32; + xz_core::common::string_conversion::LZMA_DICT_SIZE_DEFAULT as u32; +pub const LZMA_LCLP_MIN: u32 = xz_core::common::string_conversion::LZMA_LCLP_MIN as u32; +pub const LZMA_LCLP_MAX: u32 = xz_core::types::LZMA_LCLP_MAX as u32; +pub const LZMA_LC_DEFAULT: u32 = xz_core::lzma::lzma_encoder_presets::LZMA_LC_DEFAULT as u32; +pub const LZMA_LP_DEFAULT: u32 = xz_core::lzma::lzma_encoder_presets::LZMA_LP_DEFAULT as u32; +pub const LZMA_PB_MIN: u32 = xz_core::common::string_conversion::LZMA_PB_MIN as u32; +pub const LZMA_PB_MAX: u32 = xz_core::types::LZMA_PB_MAX as u32; +pub const LZMA_PB_DEFAULT: u32 = xz_core::lzma::lzma_encoder_presets::LZMA_PB_DEFAULT as u32; /********************* * Advanced Features * *********************/ /* `lzma/stream_flags.h`: stream header size */ -pub const LZMA_STREAM_HEADER_SIZE: u32 = xz::types::LZMA_STREAM_HEADER_SIZE as u32; +pub const LZMA_STREAM_HEADER_SIZE: u32 = xz_core::types::LZMA_STREAM_HEADER_SIZE as u32; pub const LZMA_BLOCK_HEADER_SIZE_MIN: u32 = - xz::common::block_util::LZMA_BLOCK_HEADER_SIZE_MIN as u32; -pub const LZMA_BLOCK_HEADER_SIZE_MAX: u32 = xz::types::LZMA_BLOCK_HEADER_SIZE_MAX as u32; + xz_core::common::block_util::LZMA_BLOCK_HEADER_SIZE_MIN as u32; +pub const LZMA_BLOCK_HEADER_SIZE_MAX: u32 = xz_core::types::LZMA_BLOCK_HEADER_SIZE_MAX as u32; /******************* * Function Wrappers @@ -191,12 +193,12 @@ pub const LZMA_BLOCK_HEADER_SIZE_MAX: u32 = xz::types::LZMA_BLOCK_HEADER_SIZE_MA #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_version_number() -> u32 { - xz::common::common::lzma_version_number() + xz_core::common::common::lzma_version_number() } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_version_string() -> *const c_char { - xz::common::common::lzma_version_string() + xz_core::common::common::lzma_version_string() } /* `lzma/base.h`: common stream API */ @@ -204,32 +206,32 @@ pub unsafe extern "C" fn lzma_version_string() -> *const c_char { #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_code(strm: *mut lzma_stream, action: lzma_action) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::common::lzma_code(strm.cast(), action) + xz_core::common::common::lzma_code(strm.cast(), action) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_end(strm: *mut lzma_stream) { normalize_c_stream_allocator(strm); - xz::common::common::lzma_end(strm.cast()) + xz_core::common::common::lzma_end(strm.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_memlimit_get(strm: *const lzma_stream) -> u64 { normalize_c_stream_allocator(strm as *mut lzma_stream); - xz::common::common::lzma_memlimit_get(strm.cast()) + xz_core::common::common::lzma_memlimit_get(strm.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_memlimit_set(strm: *mut lzma_stream, new_memlimit: u64) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::common::lzma_memlimit_set(strm.cast(), new_memlimit) + xz_core::common::common::lzma_memlimit_set(strm.cast(), new_memlimit) } /* `lzma/base.h`: allocation helpers */ #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_alloc(size: size_t, allocator: *const lzma_allocator) -> *mut c_void { - xz::common::common::lzma_alloc(size, normalize_c_allocator(allocator)) + xz_core::common::common::lzma_alloc(size, normalize_c_allocator(allocator)) } #[unsafe(no_mangle)] @@ -237,12 +239,12 @@ pub unsafe extern "C" fn lzma_alloc_zero( size: size_t, allocator: *const lzma_allocator, ) -> *mut c_void { - xz::common::common::lzma_alloc_zero(size, normalize_c_allocator(allocator)) + xz_core::common::common::lzma_alloc_zero(size, normalize_c_allocator(allocator)) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_free(ptr: *mut c_void, allocator: *const lzma_allocator) { - xz::common::common::lzma_free(ptr, normalize_c_allocator(allocator)) + xz_core::common::common::lzma_free(ptr, normalize_c_allocator(allocator)) } /* `lzma/base.h`: progress / memusage */ @@ -254,19 +256,19 @@ pub unsafe extern "C" fn lzma_get_progress( progress_out: *mut u64, ) { normalize_c_stream_allocator(strm); - xz::common::common::lzma_get_progress(strm.cast(), progress_in, progress_out) + xz_core::common::common::lzma_get_progress(strm.cast(), progress_in, progress_out) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_memusage(strm: *const lzma_stream) -> u64 { normalize_c_stream_allocator(strm as *mut lzma_stream); - xz::common::common::lzma_memusage(strm.cast()) + xz_core::common::common::lzma_memusage(strm.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_get_check(strm: *const lzma_stream) -> lzma_check { normalize_c_stream_allocator(strm as *mut lzma_stream); - xz::common::common::lzma_get_check(strm.cast()) + xz_core::common::common::lzma_get_check(strm.cast()) } /* `lzma/vli.h` */ @@ -279,7 +281,7 @@ pub unsafe extern "C" fn lzma_vli_encode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::vli_encoder::lzma_vli_encode(vli, vli_pos, out, out_pos, out_size) + xz_core::common::vli_encoder::lzma_vli_encode(vli, vli_pos, out, out_pos, out_size) } #[unsafe(no_mangle)] @@ -290,34 +292,34 @@ pub unsafe extern "C" fn lzma_vli_decode( in_pos: *mut size_t, in_size: size_t, ) -> lzma_ret { - xz::common::vli_decoder::lzma_vli_decode(vli, vli_pos, input, in_pos, in_size) + xz_core::common::vli_decoder::lzma_vli_decode(vli, vli_pos, input, in_pos, in_size) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_vli_size(vli: lzma_vli) -> u32 { - xz::common::vli_size::lzma_vli_size(vli) + xz_core::common::vli_size::lzma_vli_size(vli) } /* `lzma/check.h` */ #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_check_is_supported(check: lzma_check) -> lzma_bool { - xz::check::check::lzma_check_is_supported(check) + xz_core::check::check::lzma_check_is_supported(check) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_check_size(check: lzma_check) -> u32 { - xz::check::check::lzma_check_size(check) + xz_core::check::check::lzma_check_size(check) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_crc32(buf: *const u8, size: size_t, crc: u32) -> u32 { - xz::check::crc32_fast::lzma_crc32(buf, size, crc) + xz_core::check::crc32_fast::lzma_crc32(buf, size, crc) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_crc64(buf: *const u8, size: size_t, crc: u64) -> u64 { - xz::check::crc64_fast::lzma_crc64(buf, size, crc) + xz_core::check::crc64_fast::lzma_crc64(buf, size, crc) } /********************* @@ -328,12 +330,12 @@ pub unsafe extern "C" fn lzma_crc64(buf: *const u8, size: size_t, crc: u64) -> u #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_easy_encoder_memusage(preset: u32) -> u64 { - xz::common::easy_encoder_memusage::lzma_easy_encoder_memusage(preset) + xz_core::common::easy_encoder_memusage::lzma_easy_encoder_memusage(preset) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_easy_decoder_memusage(preset: u32) -> u64 { - xz::common::easy_decoder_memusage::lzma_easy_decoder_memusage(preset) + xz_core::common::easy_decoder_memusage::lzma_easy_decoder_memusage(preset) } #[unsafe(no_mangle)] @@ -343,7 +345,7 @@ pub unsafe extern "C" fn lzma_easy_encoder( check: lzma_check, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::easy_encoder::lzma_easy_encoder(strm.cast(), preset, check) + xz_core::common::easy_encoder::lzma_easy_encoder(strm.cast(), preset, check) } #[unsafe(no_mangle)] @@ -357,7 +359,7 @@ pub unsafe extern "C" fn lzma_easy_buffer_encode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::easy_buffer_encoder::lzma_easy_buffer_encode( + xz_core::common::easy_buffer_encoder::lzma_easy_buffer_encode( preset, check, normalize_c_allocator(allocator).cast(), @@ -378,7 +380,7 @@ pub unsafe extern "C" fn lzma_stream_encoder( check: lzma_check, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::stream_encoder::lzma_stream_encoder(strm.cast(), filters.cast(), check) + xz_core::common::stream_encoder::lzma_stream_encoder(strm.cast(), filters.cast(), check) } #[unsafe(no_mangle)] @@ -388,7 +390,7 @@ pub unsafe extern "C" fn lzma_stream_decoder( flags: u32, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::stream_decoder::lzma_stream_decoder(strm.cast(), memlimit, flags) + xz_core::common::stream_decoder::lzma_stream_decoder(strm.cast(), memlimit, flags) } /* `lzma/container.h`: auto decoder */ @@ -400,7 +402,7 @@ pub unsafe extern "C" fn lzma_auto_decoder( flags: u32, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::auto_decoder::lzma_auto_decoder(strm.cast(), memlimit, flags) + xz_core::common::auto_decoder::lzma_auto_decoder(strm.cast(), memlimit, flags) } /* `lzma/container.h`: alone encoder / decoder */ @@ -411,13 +413,13 @@ pub unsafe extern "C" fn lzma_alone_encoder( options: *const lzma_options_lzma, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::alone_encoder::lzma_alone_encoder(strm.cast(), options.cast()) + xz_core::common::alone_encoder::lzma_alone_encoder(strm.cast(), options.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_alone_decoder(strm: *mut lzma_stream, memlimit: u64) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::alone_decoder::lzma_alone_decoder(strm.cast(), memlimit) + xz_core::common::alone_decoder::lzma_alone_decoder(strm.cast(), memlimit) } /* `lzma/container.h`: lzip decoder */ @@ -429,14 +431,14 @@ pub unsafe extern "C" fn lzma_lzip_decoder( flags: u32, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::lzip_decoder::lzma_lzip_decoder(strm.cast(), memlimit, flags) + xz_core::common::lzip_decoder::lzma_lzip_decoder(strm.cast(), memlimit, flags) } /* `lzma/container.h`: stream buffer */ #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_stream_buffer_bound(uncompressed_size: size_t) -> size_t { - xz::common::stream_buffer_encoder::lzma_stream_buffer_bound(uncompressed_size) + xz_core::common::stream_buffer_encoder::lzma_stream_buffer_bound(uncompressed_size) } #[unsafe(no_mangle)] @@ -450,7 +452,7 @@ pub unsafe extern "C" fn lzma_stream_buffer_encode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::stream_buffer_encoder::lzma_stream_buffer_encode( + xz_core::common::stream_buffer_encoder::lzma_stream_buffer_encode( filters.cast(), check, normalize_c_allocator(allocator).cast(), @@ -474,7 +476,7 @@ pub unsafe extern "C" fn lzma_stream_buffer_decode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::stream_buffer_decoder::lzma_stream_buffer_decode( + xz_core::common::stream_buffer_decoder::lzma_stream_buffer_decode( memlimit, flags, normalize_c_allocator(allocator).cast(), @@ -495,12 +497,12 @@ pub unsafe extern "C" fn lzma_stream_buffer_decode( #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_filter_encoder_is_supported(id: lzma_vli) -> lzma_bool { - xz::common::filter_encoder::lzma_filter_encoder_is_supported(id) + xz_core::common::filter_encoder::lzma_filter_encoder_is_supported(id) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_filter_decoder_is_supported(id: lzma_vli) -> lzma_bool { - xz::common::filter_decoder::lzma_filter_decoder_is_supported(id) + xz_core::common::filter_decoder::lzma_filter_decoder_is_supported(id) } #[unsafe(no_mangle)] @@ -509,7 +511,7 @@ pub unsafe extern "C" fn lzma_filters_copy( dest: *mut lzma_filter, allocator: *const lzma_allocator, ) -> lzma_ret { - xz::common::filter_common::lzma_filters_copy( + xz_core::common::filter_common::lzma_filters_copy( src.cast(), dest.cast(), normalize_c_allocator(allocator).cast(), @@ -518,12 +520,12 @@ pub unsafe extern "C" fn lzma_filters_copy( #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_raw_encoder_memusage(filters: *const lzma_filter) -> u64 { - xz::common::filter_encoder::lzma_raw_encoder_memusage(filters.cast()) + xz_core::common::filter_encoder::lzma_raw_encoder_memusage(filters.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_raw_decoder_memusage(filters: *const lzma_filter) -> u64 { - xz::common::filter_decoder::lzma_raw_decoder_memusage(filters.cast()) + xz_core::common::filter_decoder::lzma_raw_decoder_memusage(filters.cast()) } #[unsafe(no_mangle)] @@ -532,7 +534,7 @@ pub unsafe extern "C" fn lzma_raw_encoder( filters: *const lzma_filter, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::filter_encoder::lzma_raw_encoder(strm.cast(), filters.cast()) + xz_core::common::filter_encoder::lzma_raw_encoder(strm.cast(), filters.cast()) } #[unsafe(no_mangle)] @@ -541,7 +543,7 @@ pub unsafe extern "C" fn lzma_raw_decoder( filters: *const lzma_filter, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::filter_decoder::lzma_raw_decoder(strm.cast(), filters.cast()) + xz_core::common::filter_decoder::lzma_raw_decoder(strm.cast(), filters.cast()) } #[unsafe(no_mangle)] @@ -550,7 +552,7 @@ pub unsafe extern "C" fn lzma_filters_update( filters: *const lzma_filter, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::filter_encoder::lzma_filters_update(strm.cast(), filters.cast()) + xz_core::common::filter_encoder::lzma_filters_update(strm.cast(), filters.cast()) } /* `lzma/filter.h`: raw buffer */ @@ -565,7 +567,7 @@ pub unsafe extern "C" fn lzma_raw_buffer_encode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::filter_buffer_encoder::lzma_raw_buffer_encode( + xz_core::common::filter_buffer_encoder::lzma_raw_buffer_encode( filters.cast(), normalize_c_allocator(allocator).cast(), input, @@ -587,7 +589,7 @@ pub unsafe extern "C" fn lzma_raw_buffer_decode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::filter_buffer_decoder::lzma_raw_buffer_decode( + xz_core::common::filter_buffer_decoder::lzma_raw_buffer_decode( filters.cast(), normalize_c_allocator(allocator).cast(), input, @@ -606,7 +608,7 @@ pub unsafe extern "C" fn lzma_properties_size( size: *mut u32, filter: *const lzma_filter, ) -> lzma_ret { - xz::common::filter_encoder::lzma_properties_size(size, filter.cast()) + xz_core::common::filter_encoder::lzma_properties_size(size, filter.cast()) } #[unsafe(no_mangle)] @@ -614,7 +616,7 @@ pub unsafe extern "C" fn lzma_properties_encode( filter: *const lzma_filter, props: *mut u8, ) -> lzma_ret { - xz::common::filter_encoder::lzma_properties_encode(filter.cast(), props) + xz_core::common::filter_encoder::lzma_properties_encode(filter.cast(), props) } #[unsafe(no_mangle)] @@ -624,7 +626,7 @@ pub unsafe extern "C" fn lzma_properties_decode( props: *const u8, props_size: size_t, ) -> lzma_ret { - xz::common::filter_decoder::lzma_properties_decode( + xz_core::common::filter_decoder::lzma_properties_decode( filter.cast(), normalize_c_allocator(allocator).cast(), props, @@ -634,7 +636,7 @@ pub unsafe extern "C" fn lzma_properties_decode( #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_mt_block_size(filters: *const lzma_filter) -> u64 { - xz::common::filter_encoder::lzma_mt_block_size(filters.cast()) + xz_core::common::filter_encoder::lzma_mt_block_size(filters.cast()) } /* `lzma/lzma12.h` */ @@ -644,17 +646,17 @@ pub unsafe extern "C" fn lzma_lzma_preset( options: *mut lzma_options_lzma, preset: u32, ) -> lzma_bool { - xz::lzma::lzma_encoder_presets::lzma_lzma_preset(options.cast(), preset) + xz_core::lzma::lzma_encoder_presets::lzma_lzma_preset(options.cast(), preset) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_mf_is_supported(mf: lzma_match_finder) -> lzma_bool { - xz::lz::lz_encoder::lzma_mf_is_supported(mf) + xz_core::lz::lz_encoder::lzma_mf_is_supported(mf) } #[unsafe(no_mangle)] pub extern "C" fn lzma_mode_is_supported(mode: lzma_mode) -> lzma_bool { - xz::lzma::lzma_encoder::lzma_mode_is_supported(mode) + xz_core::lzma::lzma_encoder::lzma_mode_is_supported(mode) } /* `lzma/bcj.h` */ @@ -665,7 +667,7 @@ pub unsafe extern "C" fn lzma_bcj_arm64_encode( buf: *mut u8, size: size_t, ) -> size_t { - xz::simple::arm64::lzma_bcj_arm64_encode(start_offset, buf, size) + xz_core::simple::arm64::lzma_bcj_arm64_encode(start_offset, buf, size) } #[unsafe(no_mangle)] @@ -674,7 +676,7 @@ pub unsafe extern "C" fn lzma_bcj_arm64_decode( buf: *mut u8, size: size_t, ) -> size_t { - xz::simple::arm64::lzma_bcj_arm64_decode(start_offset, buf, size) + xz_core::simple::arm64::lzma_bcj_arm64_decode(start_offset, buf, size) } #[unsafe(no_mangle)] @@ -683,7 +685,7 @@ pub unsafe extern "C" fn lzma_bcj_riscv_encode( buf: *mut u8, size: size_t, ) -> size_t { - xz::simple::riscv::lzma_bcj_riscv_encode(start_offset, buf, size) + xz_core::simple::riscv::lzma_bcj_riscv_encode(start_offset, buf, size) } #[unsafe(no_mangle)] @@ -692,7 +694,7 @@ pub unsafe extern "C" fn lzma_bcj_riscv_decode( buf: *mut u8, size: size_t, ) -> size_t { - xz::simple::riscv::lzma_bcj_riscv_decode(start_offset, buf, size) + xz_core::simple::riscv::lzma_bcj_riscv_decode(start_offset, buf, size) } #[unsafe(no_mangle)] @@ -701,7 +703,7 @@ pub unsafe extern "C" fn lzma_bcj_x86_encode( buf: *mut u8, size: size_t, ) -> size_t { - xz::simple::x86::lzma_bcj_x86_encode(start_offset, buf, size) + xz_core::simple::x86::lzma_bcj_x86_encode(start_offset, buf, size) } #[unsafe(no_mangle)] @@ -710,7 +712,7 @@ pub unsafe extern "C" fn lzma_bcj_x86_decode( buf: *mut u8, size: size_t, ) -> size_t { - xz::simple::x86::lzma_bcj_x86_decode(start_offset, buf, size) + xz_core::simple::x86::lzma_bcj_x86_decode(start_offset, buf, size) } /********************* @@ -724,7 +726,7 @@ pub unsafe extern "C" fn lzma_stream_header_encode( options: *const lzma_stream_flags, out: *mut u8, ) -> lzma_ret { - xz::common::stream_flags_encoder::lzma_stream_header_encode(options.cast(), out) + xz_core::common::stream_flags_encoder::lzma_stream_header_encode(options.cast(), out) } #[unsafe(no_mangle)] @@ -732,7 +734,7 @@ pub unsafe extern "C" fn lzma_stream_footer_encode( options: *const lzma_stream_flags, out: *mut u8, ) -> lzma_ret { - xz::common::stream_flags_encoder::lzma_stream_footer_encode(options.cast(), out) + xz_core::common::stream_flags_encoder::lzma_stream_footer_encode(options.cast(), out) } #[unsafe(no_mangle)] @@ -740,7 +742,7 @@ pub unsafe extern "C" fn lzma_stream_header_decode( options: *mut lzma_stream_flags, input: *const u8, ) -> lzma_ret { - xz::common::stream_flags_decoder::lzma_stream_header_decode(options.cast(), input) + xz_core::common::stream_flags_decoder::lzma_stream_header_decode(options.cast(), input) } #[unsafe(no_mangle)] @@ -748,7 +750,7 @@ pub unsafe extern "C" fn lzma_stream_footer_decode( options: *mut lzma_stream_flags, input: *const u8, ) -> lzma_ret { - xz::common::stream_flags_decoder::lzma_stream_footer_decode(options.cast(), input) + xz_core::common::stream_flags_decoder::lzma_stream_footer_decode(options.cast(), input) } #[unsafe(no_mangle)] @@ -756,19 +758,19 @@ pub unsafe extern "C" fn lzma_stream_flags_compare( a: *const lzma_stream_flags, b: *const lzma_stream_flags, ) -> lzma_ret { - xz::common::stream_flags_common::lzma_stream_flags_compare(a.cast(), b.cast()) + xz_core::common::stream_flags_common::lzma_stream_flags_compare(a.cast(), b.cast()) } /* `lzma/hardware.h` */ #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_physmem() -> u64 { - xz::common::hardware_physmem::lzma_physmem() + xz_core::common::hardware_physmem::lzma_physmem() } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_cputhreads() -> u32 { - xz::common::hardware_cputhreads::lzma_cputhreads() + xz_core::common::hardware_cputhreads::lzma_cputhreads() } /* `lzma/index.h`: core index operations */ @@ -782,7 +784,7 @@ pub unsafe extern "C" fn lzma_index_buffer_decode( in_pos: *mut size_t, in_size: size_t, ) -> lzma_ret { - xz::common::index_decoder::lzma_index_buffer_decode( + xz_core::common::index_decoder::lzma_index_buffer_decode( i.cast(), memlimit, normalize_c_allocator(allocator).cast(), @@ -794,19 +796,19 @@ pub unsafe extern "C" fn lzma_index_buffer_decode( #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_index_uncompressed_size(i: *const lzma_index) -> lzma_vli { - xz::common::index::lzma_index_uncompressed_size(i.cast()) + xz_core::common::index::lzma_index_uncompressed_size(i.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_index_end(i: *mut lzma_index, allocator: *const lzma_allocator) { - xz::common::index::lzma_index_end(i.cast(), normalize_c_allocator(allocator).cast()) + xz_core::common::index::lzma_index_end(i.cast(), normalize_c_allocator(allocator).cast()) } /* `lzma/block.h` */ #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_block_header_size(block: *mut lzma_block) -> lzma_ret { - xz::common::block_header_encoder::lzma_block_header_size(block.cast()) + xz_core::common::block_header_encoder::lzma_block_header_size(block.cast()) } #[unsafe(no_mangle)] @@ -814,7 +816,7 @@ pub unsafe extern "C" fn lzma_block_header_encode( block: *const lzma_block, out: *mut u8, ) -> lzma_ret { - xz::common::block_header_encoder::lzma_block_header_encode(block.cast(), out) + xz_core::common::block_header_encoder::lzma_block_header_encode(block.cast(), out) } #[unsafe(no_mangle)] @@ -823,7 +825,7 @@ pub unsafe extern "C" fn lzma_block_header_decode( allocator: *const lzma_allocator, input: *const u8, ) -> lzma_ret { - xz::common::block_header_decoder::lzma_block_header_decode( + xz_core::common::block_header_decoder::lzma_block_header_decode( block.cast(), normalize_c_allocator(allocator).cast(), input, @@ -835,17 +837,17 @@ pub unsafe extern "C" fn lzma_block_compressed_size( block: *mut lzma_block, unpadded_size: lzma_vli, ) -> lzma_ret { - xz::common::block_util::lzma_block_compressed_size(block.cast(), unpadded_size) + xz_core::common::block_util::lzma_block_compressed_size(block.cast(), unpadded_size) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_block_unpadded_size(block: *const lzma_block) -> lzma_vli { - xz::common::block_util::lzma_block_unpadded_size(block.cast()) + xz_core::common::block_util::lzma_block_unpadded_size(block.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_block_total_size(block: *const lzma_block) -> lzma_vli { - xz::common::block_util::lzma_block_total_size(block.cast()) + xz_core::common::block_util::lzma_block_total_size(block.cast()) } #[unsafe(no_mangle)] @@ -854,7 +856,7 @@ pub unsafe extern "C" fn lzma_block_encoder( block: *mut lzma_block, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::block_encoder::lzma_block_encoder(strm.cast(), block.cast()) + xz_core::common::block_encoder::lzma_block_encoder(strm.cast(), block.cast()) } #[unsafe(no_mangle)] @@ -863,12 +865,12 @@ pub unsafe extern "C" fn lzma_block_decoder( block: *mut lzma_block, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::block_decoder::lzma_block_decoder(strm.cast(), block.cast()) + xz_core::common::block_decoder::lzma_block_decoder(strm.cast(), block.cast()) } #[unsafe(no_mangle)] pub extern "C" fn lzma_block_buffer_bound(uncompressed_size: size_t) -> size_t { - xz::common::block_buffer_encoder::lzma_block_buffer_bound(uncompressed_size) + xz_core::common::block_buffer_encoder::lzma_block_buffer_bound(uncompressed_size) } #[unsafe(no_mangle)] @@ -881,7 +883,7 @@ pub unsafe extern "C" fn lzma_block_buffer_encode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::block_buffer_encoder::lzma_block_buffer_encode( + xz_core::common::block_buffer_encoder::lzma_block_buffer_encode( block.cast(), normalize_c_allocator(allocator).cast(), input, @@ -901,7 +903,7 @@ pub unsafe extern "C" fn lzma_block_uncomp_encode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::block_buffer_encoder::lzma_block_uncomp_encode( + xz_core::common::block_buffer_encoder::lzma_block_uncomp_encode( block.cast(), input, in_size, @@ -922,7 +924,7 @@ pub unsafe extern "C" fn lzma_block_buffer_decode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::block_buffer_decoder::lzma_block_buffer_decode( + xz_core::common::block_buffer_decoder::lzma_block_buffer_decode( block.cast(), normalize_c_allocator(allocator).cast(), input, @@ -938,17 +940,17 @@ pub unsafe extern "C" fn lzma_block_buffer_decode( #[unsafe(no_mangle)] pub extern "C" fn lzma_index_memusage(streams: lzma_vli, blocks: lzma_vli) -> u64 { - xz::common::index::lzma_index_memusage(streams, blocks) + xz_core::common::index::lzma_index_memusage(streams, blocks) } #[unsafe(no_mangle)] pub extern "C" fn lzma_index_memused(i: *const lzma_index) -> u64 { - xz::common::index::lzma_index_memused(i.cast()) + xz_core::common::index::lzma_index_memused(i.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_index_init(allocator: *const lzma_allocator) -> *mut lzma_index { - xz::common::index::lzma_index_init(normalize_c_allocator(allocator).cast()).cast() + xz_core::common::index::lzma_index_init(normalize_c_allocator(allocator).cast()).cast() } #[unsafe(no_mangle)] @@ -958,7 +960,7 @@ pub unsafe extern "C" fn lzma_index_append( unpadded_size: lzma_vli, uncompressed_size: lzma_vli, ) -> lzma_ret { - xz::common::index::lzma_index_append( + xz_core::common::index::lzma_index_append( i.cast(), normalize_c_allocator(allocator).cast(), unpadded_size, @@ -971,12 +973,12 @@ pub unsafe extern "C" fn lzma_index_stream_flags( i: *mut lzma_index, stream_flags: *const lzma_stream_flags, ) -> lzma_ret { - xz::common::index::lzma_index_stream_flags(i.cast(), stream_flags.cast()) + xz_core::common::index::lzma_index_stream_flags(i.cast(), stream_flags.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_index_checks(i: *const lzma_index) -> u32 { - xz::common::index::lzma_index_checks(i.cast()) + xz_core::common::index::lzma_index_checks(i.cast()) } #[unsafe(no_mangle)] @@ -984,47 +986,47 @@ pub unsafe extern "C" fn lzma_index_stream_padding( i: *mut lzma_index, stream_padding: lzma_vli, ) -> lzma_ret { - xz::common::index::lzma_index_stream_padding(i.cast(), stream_padding) + xz_core::common::index::lzma_index_stream_padding(i.cast(), stream_padding) } #[unsafe(no_mangle)] pub extern "C" fn lzma_index_stream_count(i: *const lzma_index) -> lzma_vli { - xz::common::index::lzma_index_stream_count(i.cast()) + xz_core::common::index::lzma_index_stream_count(i.cast()) } #[unsafe(no_mangle)] pub extern "C" fn lzma_index_block_count(i: *const lzma_index) -> lzma_vli { - xz::common::index::lzma_index_block_count(i.cast()) + xz_core::common::index::lzma_index_block_count(i.cast()) } #[unsafe(no_mangle)] pub extern "C" fn lzma_index_size(i: *const lzma_index) -> lzma_vli { - xz::common::index::lzma_index_size(i.cast()) + xz_core::common::index::lzma_index_size(i.cast()) } #[unsafe(no_mangle)] pub extern "C" fn lzma_index_stream_size(i: *const lzma_index) -> lzma_vli { - xz::common::index::lzma_index_stream_size(i.cast()) + xz_core::common::index::lzma_index_stream_size(i.cast()) } #[unsafe(no_mangle)] pub extern "C" fn lzma_index_total_size(i: *const lzma_index) -> lzma_vli { - xz::common::index::lzma_index_total_size(i.cast()) + xz_core::common::index::lzma_index_total_size(i.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_index_file_size(i: *const lzma_index) -> lzma_vli { - xz::common::index::lzma_index_file_size(i.cast()) + xz_core::common::index::lzma_index_file_size(i.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_index_iter_init(iter: *mut lzma_index_iter, i: *const lzma_index) { - xz::common::index::lzma_index_iter_init(iter.cast(), i.cast()) + xz_core::common::index::lzma_index_iter_init(iter.cast(), i.cast()) } #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_index_iter_rewind(iter: *mut lzma_index_iter) { - xz::common::index::lzma_index_iter_rewind(iter.cast()) + xz_core::common::index::lzma_index_iter_rewind(iter.cast()) } #[unsafe(no_mangle)] @@ -1032,7 +1034,7 @@ pub unsafe extern "C" fn lzma_index_iter_next( iter: *mut lzma_index_iter, mode: lzma_index_iter_mode, ) -> lzma_bool { - xz::common::index::lzma_index_iter_next(iter.cast(), mode) + xz_core::common::index::lzma_index_iter_next(iter.cast(), mode) } #[unsafe(no_mangle)] @@ -1040,7 +1042,7 @@ pub unsafe extern "C" fn lzma_index_iter_locate( iter: *mut lzma_index_iter, target: lzma_vli, ) -> lzma_bool { - xz::common::index::lzma_index_iter_locate(iter.cast(), target) + xz_core::common::index::lzma_index_iter_locate(iter.cast(), target) } #[unsafe(no_mangle)] @@ -1049,7 +1051,7 @@ pub unsafe extern "C" fn lzma_index_cat( src: *mut lzma_index, allocator: *const lzma_allocator, ) -> lzma_ret { - xz::common::index::lzma_index_cat( + xz_core::common::index::lzma_index_cat( dest.cast(), src.cast(), normalize_c_allocator(allocator).cast(), @@ -1061,7 +1063,7 @@ pub unsafe extern "C" fn lzma_index_dup( i: *const lzma_index, allocator: *const lzma_allocator, ) -> *mut lzma_index { - xz::common::index::lzma_index_dup(i.cast(), normalize_c_allocator(allocator).cast()).cast() + xz_core::common::index::lzma_index_dup(i.cast(), normalize_c_allocator(allocator).cast()).cast() } #[unsafe(no_mangle)] @@ -1070,7 +1072,7 @@ pub unsafe extern "C" fn lzma_index_encoder( i: *const lzma_index, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::index_encoder::lzma_index_encoder(strm.cast(), i.cast()) + xz_core::common::index_encoder::lzma_index_encoder(strm.cast(), i.cast()) } #[unsafe(no_mangle)] @@ -1080,7 +1082,7 @@ pub unsafe extern "C" fn lzma_index_decoder( memlimit: u64, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::index_decoder::lzma_index_decoder(strm.cast(), i.cast(), memlimit) + xz_core::common::index_decoder::lzma_index_decoder(strm.cast(), i.cast(), memlimit) } #[unsafe(no_mangle)] @@ -1090,7 +1092,7 @@ pub unsafe extern "C" fn lzma_index_buffer_encode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::index_encoder::lzma_index_buffer_encode(i.cast(), out, out_pos, out_size) + xz_core::common::index_encoder::lzma_index_buffer_encode(i.cast(), out, out_pos, out_size) } /* `lzma/index_hash.h` */ @@ -1100,7 +1102,7 @@ pub unsafe extern "C" fn lzma_index_hash_init( index_hash: *mut lzma_index_hash, allocator: *const lzma_allocator, ) -> *mut lzma_index_hash { - xz::common::index_hash::lzma_index_hash_init( + xz_core::common::index_hash::lzma_index_hash_init( index_hash.cast(), normalize_c_allocator(allocator).cast(), ) @@ -1112,7 +1114,7 @@ pub unsafe extern "C" fn lzma_index_hash_end( index_hash: *mut lzma_index_hash, allocator: *const lzma_allocator, ) { - xz::common::index_hash::lzma_index_hash_end( + xz_core::common::index_hash::lzma_index_hash_end( index_hash.cast(), normalize_c_allocator(allocator).cast(), ) @@ -1124,7 +1126,7 @@ pub unsafe extern "C" fn lzma_index_hash_append( unpadded_size: lzma_vli, uncompressed_size: lzma_vli, ) -> lzma_ret { - xz::common::index_hash::lzma_index_hash_append( + xz_core::common::index_hash::lzma_index_hash_append( index_hash.cast(), unpadded_size, uncompressed_size, @@ -1138,12 +1140,12 @@ pub unsafe extern "C" fn lzma_index_hash_decode( in_pos: *mut size_t, in_size: size_t, ) -> lzma_ret { - xz::common::index_hash::lzma_index_hash_decode(index_hash.cast(), input, in_pos, in_size) + xz_core::common::index_hash::lzma_index_hash_decode(index_hash.cast(), input, in_pos, in_size) } #[unsafe(no_mangle)] pub extern "C" fn lzma_index_hash_size(index_hash: *const lzma_index_hash) -> lzma_vli { - xz::common::index_hash::lzma_index_hash_size(index_hash.cast()) + xz_core::common::index_hash::lzma_index_hash_size(index_hash.cast()) } /* `lzma/filter.h`: filter flags / string conversion */ @@ -1153,7 +1155,7 @@ pub unsafe extern "C" fn lzma_filter_flags_size( size: *mut u32, filter: *const lzma_filter, ) -> lzma_ret { - xz::common::filter_flags_encoder::lzma_filter_flags_size(size, filter.cast()) + xz_core::common::filter_flags_encoder::lzma_filter_flags_size(size, filter.cast()) } #[unsafe(no_mangle)] @@ -1163,7 +1165,7 @@ pub unsafe extern "C" fn lzma_filter_flags_encode( out_pos: *mut size_t, out_size: size_t, ) -> lzma_ret { - xz::common::filter_flags_encoder::lzma_filter_flags_encode( + xz_core::common::filter_flags_encoder::lzma_filter_flags_encode( filter.cast(), out, out_pos, @@ -1179,7 +1181,7 @@ pub unsafe extern "C" fn lzma_filter_flags_decode( in_pos: *mut size_t, in_size: size_t, ) -> lzma_ret { - xz::common::filter_flags_decoder::lzma_filter_flags_decode( + xz_core::common::filter_flags_decoder::lzma_filter_flags_decode( filter.cast(), normalize_c_allocator(allocator).cast(), input, @@ -1193,7 +1195,7 @@ pub unsafe extern "C" fn lzma_filters_free( filters: *mut lzma_filter, allocator: *const lzma_allocator, ) { - xz::common::filter_common::lzma_filters_free( + xz_core::common::filter_common::lzma_filters_free( filters.cast(), normalize_c_allocator(allocator).cast(), ) @@ -1207,7 +1209,7 @@ pub unsafe extern "C" fn lzma_str_to_filters( flags: u32, allocator: *const lzma_allocator, ) -> *const c_char { - xz::common::string_conversion::lzma_str_to_filters( + xz_core::common::string_conversion::lzma_str_to_filters( str_, error_pos, filters.cast(), @@ -1223,7 +1225,7 @@ pub unsafe extern "C" fn lzma_str_from_filters( flags: u32, allocator: *const lzma_allocator, ) -> lzma_ret { - xz::common::string_conversion::lzma_str_from_filters( + xz_core::common::string_conversion::lzma_str_from_filters( str_, filters.cast(), flags, @@ -1238,7 +1240,7 @@ pub unsafe extern "C" fn lzma_str_list_filters( flags: u32, allocator: *const lzma_allocator, ) -> lzma_ret { - xz::common::string_conversion::lzma_str_list_filters( + xz_core::common::string_conversion::lzma_str_list_filters( str_, filter_id, flags, @@ -1254,7 +1256,7 @@ pub unsafe extern "C" fn lzma_microlzma_encoder( options: *const lzma_options_lzma, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::microlzma_encoder::lzma_microlzma_encoder(strm.cast(), options.cast()) + xz_core::common::microlzma_encoder::lzma_microlzma_encoder(strm.cast(), options.cast()) } #[unsafe(no_mangle)] @@ -1266,7 +1268,7 @@ pub unsafe extern "C" fn lzma_microlzma_decoder( dict_size: u32, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::microlzma_decoder::lzma_microlzma_decoder( + xz_core::common::microlzma_decoder::lzma_microlzma_decoder( strm.cast(), comp_size, uncomp_size, @@ -1283,7 +1285,7 @@ pub unsafe extern "C" fn lzma_file_info_decoder( file_size: u64, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::file_info::lzma_file_info_decoder(strm.cast(), i.cast(), memlimit, file_size) + xz_core::common::file_info::lzma_file_info_decoder(strm.cast(), i.cast(), memlimit, file_size) } /********************* @@ -1299,7 +1301,7 @@ pub unsafe extern "C" fn lzma_stream_encoder_mt( options: *const lzma_mt, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::stream_mt::lzma_stream_encoder_mt(strm.cast(), options.cast()) + xz_core::common::stream_mt::lzma_stream_encoder_mt(strm.cast(), options.cast()) } #[cfg(feature = "parallel")] @@ -1309,11 +1311,11 @@ pub unsafe extern "C" fn lzma_stream_decoder_mt( options: *const lzma_mt, ) -> lzma_ret { normalize_c_stream_allocator(strm); - xz::common::stream_mt::lzma_stream_decoder_mt(strm.cast(), options.cast()) + xz_core::common::stream_mt::lzma_stream_decoder_mt(strm.cast(), options.cast()) } #[cfg(feature = "parallel")] #[unsafe(no_mangle)] pub unsafe extern "C" fn lzma_stream_encoder_mt_memusage(options: *const lzma_mt) -> u64 { - xz::common::stream_mt::lzma_stream_encoder_mt_memusage(options.cast()) + xz_core::common::stream_mt::lzma_stream_encoder_mt_memusage(options.cast()) }