hack the Cargo.toml file

Author: folkertdev

zstd-safe/Cargo.toml

@@ -17,29 +17,31 @@ exclude = ["update_consts.sh"]
 features = ["experimental", "arrays", "std", "zdict_builder", "doc-cfg"]
 
 [dependencies]
-zstd-sys = { path = "zstd-sys", version = "2.0.15", default-features = false }
+# zstd-sys = { path = "zstd-sys", version = "2.0.15", default-features = false }
+zstd-sys = { git = "https://github.com/trifectatechfoundation/libzstd-rs-sys.git", rev = "edd8e07b9fe21e477848e9221efed2bd39e32013", package = "libzstd-rs-sys" }
 
 [features]
-default = ["legacy", "arrays", "zdict_builder"]
+default = ["legacy", "arrays", "zdict_builder", "libzstd-rs-sys"]
+libzstd-rs-sys = []
 
-bindgen = ["zstd-sys/bindgen"]
-debug = ["zstd-sys/debug"]
-experimental = ["zstd-sys/experimental"]
-legacy = ["zstd-sys/legacy"]
-pkg-config = ["zstd-sys/pkg-config"]
-std = ["zstd-sys/std"] # Implements WriteBuf for std types like Cursor and Vec.
-zstdmt = ["zstd-sys/zstdmt"]
-thin = ["zstd-sys/thin"]
+bindgen = []
+debug = []
+experimental = []
+legacy = []
+pkg-config = []
+std = [] # Implements WriteBuf for std types like Cursor and Vec.
+zstdmt = []
+thin = []
 arrays = []
-no_asm = ["zstd-sys/no_asm"]
+no_asm = []
 doc-cfg = []
-zdict_builder = ["zstd-sys/zdict_builder"]
-seekable = ["zstd-sys/seekable"]
+zdict_builder = []
+seekable = []
 
 # These two are for cross-language LTO.
 # Will only work if `clang` is used to build the C library.
-fat-lto = ["zstd-sys/fat-lto"]
-thin-lto = ["zstd-sys/thin-lto"]
+fat-lto = []
+thin-lto = []
 
 [lints.rust]
 non_upper_case_globals = "allow"

zstd-safe/src/constants.rs

@@ -1,6 +1,6 @@
-// This file has been generated by ./update_consts.sh
-pub const BLOCKSIZELOG_MAX: u32 = zstd_sys::ZSTD_BLOCKSIZELOG_MAX;
-pub const BLOCKSIZE_MAX: u32 = zstd_sys::ZSTD_BLOCKSIZE_MAX;
+// This file has been generated by update_consts.sh
+pub const BLOCKSIZELOG_MAX: u32 = zstd_sys::ZSTD_BLOCKSIZELOG_MAX as u32;
+pub const BLOCKSIZE_MAX: u32 = zstd_sys::ZSTD_BLOCKSIZE_MAX as u32;
 pub const CLEVEL_DEFAULT: CompressionLevel = zstd_sys::ZSTD_CLEVEL_DEFAULT as CompressionLevel;
 pub const CONTENTSIZE_ERROR: u64 = zstd_sys::ZSTD_CONTENTSIZE_ERROR as u64;
 pub const CONTENTSIZE_UNKNOWN: u64 = zstd_sys::ZSTD_CONTENTSIZE_UNKNOWN as u64;

zstd-safe/src/constants_experimental.rs

@@ -1,4 +1,4 @@
-// This file has been generated by ./update_consts.sh
+// This file has been generated by update_consts.sh
 pub const BLOCKSIZE_MAX_MIN: u32 = zstd_sys::ZSTD_BLOCKSIZE_MAX_MIN;
 pub const BLOCKSPLITTER_LEVEL_MAX: u32 = zstd_sys::ZSTD_BLOCKSPLITTER_LEVEL_MAX;
 pub const CHAINLOG_MAX_32: u32 = zstd_sys::ZSTD_CHAINLOG_MAX_32;

zstd-safe/src/constants_seekable.rs

@@ -1,4 +1,4 @@
-// This file has been generated by ./update_consts.sh
+// This file has been generated by update_consts.sh
 pub const SEEKABLE_FRAMEINDEX_TOOLARGE: u64 = zstd_sys::ZSTD_SEEKABLE_FRAMEINDEX_TOOLARGE as u64;
 pub const SEEKABLE_MAGICNUMBER: u32 = zstd_sys::ZSTD_SEEKABLE_MAGICNUMBER;
 pub const SEEKABLE_MAX_FRAME_DECOMPRESSED_SIZE: u32 = zstd_sys::ZSTD_SEEKABLE_MAX_FRAME_DECOMPRESSED_SIZE;

zstd-safe/update_consts.sh

@@ -6,6 +6,9 @@ varTypes[CONTENTSIZE_ERROR]=u64
 # This is originally (0ULL-2) and gets falsely translated to -2 by bindgen.
 # Casting it to u64 "fixes" this to the right number
 varTypes[SEEKABLE_FRAMEINDEX_TOOLARGE]=u64
+# zlib-rs defines these as i32, this crate expects u32
+varTypes[BLOCKSIZELOG_MAX]=u32
+varTypes[BLOCKSIZE_MAX]=u32
 
 header() {
     echo "// This file has been generated by $0"