Removed wildcard imports to reduce scope / clashes

lib/common/zstd_common.rs

@@ -3,7 +3,7 @@ use libc::size_t;
 use crate::lib::common::error_private::{
     ERR_getErrorCode, ERR_getErrorName, ERR_getErrorString, ERR_isError,
 };
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_ErrorCode, ZSTD_VERSION_NUMBER};
 
 /// Get the zstd version number
 ///

lib/compress/zstd_compress.rs

@@ -944,7 +944,20 @@ use crate::lib::compress::zstdmt_compress::{
     ZSTDMT_getFrameProgression, ZSTDMT_initCStream_internal, ZSTDMT_nextInputSizeHint,
     ZSTDMT_sizeof_CCtx, ZSTDMT_toFlushNow, ZSTDMT_updateCParams_whileCompressing,
 };
-use crate::lib::zstd::*;
+use crate::lib::zstd::{
+    Format, ZSTD_ParamSwitch_e, ZSTD_ResetDirective, ZSTD_bm_buffered, ZSTD_bm_stable,
+    ZSTD_btlazy2, ZSTD_btopt, ZSTD_btultra, ZSTD_btultra2, ZSTD_bufferMode_e, ZSTD_cParameter,
+    ZSTD_compressionParameters, ZSTD_customMem, ZSTD_dct_auto, ZSTD_dct_fullDict,
+    ZSTD_dct_rawContent, ZSTD_dfast, ZSTD_dictAttachPref_e, ZSTD_dictContentType_e,
+    ZSTD_dictLoadMethod_e, ZSTD_dlm_byCopy, ZSTD_dlm_byRef,
+    ZSTD_error_stabilityCondition_notRespected, ZSTD_fast, ZSTD_frameParameters,
+    ZSTD_frameProgression, ZSTD_greedy, ZSTD_inBuffer, ZSTD_inBuffer_s, ZSTD_lazy, ZSTD_lazy2,
+    ZSTD_outBuffer, ZSTD_outBuffer_s, ZSTD_parameters, ZSTD_strategy, ZSTD_BLOCKSIZE_MAX,
+    ZSTD_BLOCKSIZE_MAX_MIN, ZSTD_CLEVEL_DEFAULT, ZSTD_CONTENTSIZE_UNKNOWN, ZSTD_MAGICNUMBER,
+    ZSTD_MAGIC_DICTIONARY, ZSTD_MAGIC_SKIPPABLE_START, ZSTD_SKIPPABLEHEADERSIZE,
+    ZSTD_VERSION_NUMBER, ZSTD_WINDOWLOG_ABSOLUTEMIN, ZSTD_WINDOWLOG_MAX, ZSTD_WINDOWLOG_MAX_32,
+    ZSTD_WINDOWLOG_MAX_64,
+};
 pub const ZSTD_BLOCKHEADERSIZE: core::ffi::c_int = 3;
 static ZSTD_blockHeaderSize: size_t = ZSTD_BLOCKHEADERSIZE as size_t;
 pub const MIN_CBLOCK_SIZE: core::ffi::c_int = 1 + 1;

lib/compress/zstd_compress_literals.rs

@@ -10,7 +10,7 @@ use crate::lib::common::mem::{MEM_writeLE16, MEM_writeLE24, MEM_writeLE32};
 use crate::lib::common::zstd_internal::LitHufLog;
 use crate::lib::compress::huf_compress::{HUF_compress1X_repeat, HUF_compress4X_repeat};
 use crate::lib::compress::zstd_compress::ZSTD_hufCTables_t;
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_btultra, ZSTD_lazy, ZSTD_strategy};
 
 const MIN_LITERALS_FOR_4_STREAMS: usize = 6;
 

lib/compress/zstd_compress_sequences.rs

@@ -15,7 +15,7 @@ use crate::lib::compress::fse_compress::{
     FSE_writeNCount,
 };
 use crate::lib::compress::zstd_compress::SeqDef;
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_lazy, ZSTD_strategy};
 use crate::ZSTD_isError;
 
 pub type SymbolEncodingType_e = core::ffi::c_uint;

lib/compress/zstd_compress_superblock.rs

@@ -28,7 +28,7 @@ use crate::lib::compress::zstd_compress_literals::{
 use crate::lib::compress::zstd_compress_sequences::{
     ZSTD_crossEntropyCost, ZSTD_encodeSequences, ZSTD_fseBitCost,
 };
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_ParamSwitch_e, ZSTD_dictContentType_e};
 
 #[derive(Copy, Clone)]
 #[repr(C)]

lib/compress/zstd_double_fast.rs

@@ -61,7 +61,7 @@ use crate::lib::compress::zstd_compress_internal::{
     ZSTD_OptPrice_e, ZSTD_count, ZSTD_count_2segments, ZSTD_getLowestMatchIndex,
     ZSTD_getLowestPrefixIndex, ZSTD_hashPtr, ZSTD_index_overlap_check, ZSTD_storeSeq,
 };
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_ParamSwitch_e, ZSTD_compressionParameters};
 pub const kSearchStrength: core::ffi::c_int = 8;
 pub const HASH_READ_SIZE: core::ffi::c_int = 8;
 pub const REPCODE1_TO_OFFBASE: core::ffi::c_int = 1;

lib/compress/zstd_fast.rs

@@ -61,7 +61,7 @@ use crate::lib::compress::zstd_compress_internal::{
     ZSTD_OptPrice_e, ZSTD_count, ZSTD_count_2segments, ZSTD_getLowestMatchIndex,
     ZSTD_getLowestPrefixIndex, ZSTD_hashPtr, ZSTD_index_overlap_check, ZSTD_storeSeq,
 };
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_ParamSwitch_e, ZSTD_compressionParameters};
 pub const kSearchStrength: core::ffi::c_int = 8;
 pub const HASH_READ_SIZE: core::ffi::c_int = 8;
 

lib/compress/zstd_lazy.rs

@@ -69,7 +69,7 @@ use crate::lib::compress::zstd_compress_internal::{
     ZSTD_storeSeq,
 };
 use crate::lib::polyfill::{prefetch_read_data, Locality};
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_ParamSwitch_e, ZSTD_compressionParameters};
 pub const kSearchStrength: core::ffi::c_int = 8;
 pub const ZSTD_DUBT_UNSORTED_MARK: core::ffi::c_int = 1;
 pub const ZSTD_ROW_HASH_CACHE_SIZE: core::ffi::c_int = 8;

lib/compress/zstd_ldm.rs

@@ -119,7 +119,7 @@ use crate::lib::compress::zstd_compress_internal::{
 };
 use crate::lib::compress::zstd_double_fast::ZSTD_fillDoubleHashTable;
 use crate::lib::compress::zstd_fast::ZSTD_fillHashTable;
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_ParamSwitch_e, ZSTD_btopt, ZSTD_btultra, ZSTD_compressionParameters};
 pub const HASH_READ_SIZE: core::ffi::c_int = 8;
 pub const ZSTD_WINDOW_START_INDEX: core::ffi::c_int = 2;
 pub const LDM_BATCH_SIZE: core::ffi::c_int = 64;

lib/compress/zstd_opt.rs

@@ -73,7 +73,7 @@ use crate::lib::compress::zstd_compress_internal::{
     zop_dynamic, zop_predef, ZSTD_count, ZSTD_count_2segments, ZSTD_getLowestMatchIndex,
     ZSTD_hash3Ptr, ZSTD_hashPtr, ZSTD_index_overlap_check, ZSTD_storeSeq, ZSTD_updateRep,
 };
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_compressionParameters, ZSTD_BLOCKSIZE_MAX};
 static mut kNullRawSeqStore: RawSeqStore_t = RawSeqStore_t {
     seq: core::ptr::null_mut(),
     pos: 0,

lib/compress/zstdmt_compress.rs

@@ -26,7 +26,12 @@ use crate::lib::compress::zstd_ldm::{
     ldmEntry_t, ldmParams_t, ldmState_t, ZSTD_ldm_adjustParameters, ZSTD_ldm_fillHashTable,
     ZSTD_ldm_generateSequences, ZSTD_ldm_getMaxNbSeq,
 };
-use crate::lib::zstd::*;
+use crate::lib::zstd::{
+    ZSTD_ParamSwitch_e, ZSTD_cParameter, ZSTD_customMem, ZSTD_dct_auto, ZSTD_dct_rawContent,
+    ZSTD_dictContentType_e, ZSTD_dlm_byCopy, ZSTD_dlm_byRef, ZSTD_frameProgression, ZSTD_inBuffer,
+    ZSTD_outBuffer_s, ZSTD_strategy, ZSTD_BLOCKSIZELOG_MAX, ZSTD_BLOCKSIZE_MAX,
+    ZSTD_CONTENTSIZE_UNKNOWN,
+};
 #[repr(C)]
 pub struct ZSTDMT_CCtx {
     factory: *mut ZSTD_threadPool,

lib/decompress/mod.rs

@@ -8,7 +8,7 @@ use crate::lib::common::zstd_trace::ZSTD_TraceCtx;
 use crate::lib::decompress::huf_decompress::DTable;
 use crate::lib::decompress::zstd_ddict::{MultipleDDicts, ZSTD_DDict, ZSTD_DDictHashSet};
 use crate::lib::decompress::zstd_decompress_block::{FseWorkspace, ZSTD_LITBUFFEREXTRASIZE};
-use crate::lib::zstd::*;
+use crate::lib::zstd::{BufferMode, ForceIgnoreChecksum, Format, ZSTD_customMem, ZSTD_outBuffer};
 
 pub mod huf_decompress;
 pub mod zstd_ddict;

lib/decompress/zstd_ddict.rs

@@ -7,7 +7,10 @@ use crate::lib::common::error_private::{ERR_isError, Error};
 use crate::lib::decompress::huf_decompress::DTableDesc;
 use crate::lib::decompress::zstd_decompress::ZSTD_loadDEntropy;
 use crate::lib::decompress::{ZSTD_DCtx, ZSTD_entropyDTables_t};
-use crate::lib::zstd::*;
+use crate::lib::zstd::{
+    ZSTD_customMem, ZSTD_dct_auto, ZSTD_dct_fullDict, ZSTD_dct_rawContent, ZSTD_dictContentType_e,
+    ZSTD_dictLoadMethod_e, ZSTD_dlm_byCopy, ZSTD_dlm_byRef, ZSTD_MAGIC_DICTIONARY,
+};
 
 #[repr(u32)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

lib/decompress/zstd_decompress.rs

@@ -31,7 +31,15 @@ use crate::lib::decompress::{
     ZSTD_frame, ZSTD_skippableFrame,
 };
 use crate::lib::zstd::experimental::ZSTD_FRAMEHEADERSIZE_MIN;
-use crate::lib::zstd::*;
+use crate::lib::zstd::{
+    BufferMode, ForceIgnoreChecksum, Format, ZSTD_ResetDirective, ZSTD_customMem, ZSTD_dParameter,
+    ZSTD_dct_auto, ZSTD_dct_rawContent, ZSTD_dictContentType_e, ZSTD_dictLoadMethod_e,
+    ZSTD_dlm_byCopy, ZSTD_dlm_byRef, ZSTD_format_e, ZSTD_inBuffer, ZSTD_inBuffer_s,
+    ZSTD_outBuffer_s, ZSTD_BLOCKSIZE_MAX, ZSTD_BLOCKSIZE_MAX_MIN, ZSTD_CONTENTSIZE_ERROR,
+    ZSTD_CONTENTSIZE_UNKNOWN, ZSTD_MAGICNUMBER, ZSTD_MAGIC_DICTIONARY, ZSTD_MAGIC_SKIPPABLE_MASK,
+    ZSTD_MAGIC_SKIPPABLE_START, ZSTD_SKIPPABLEHEADERSIZE, ZSTD_VERSION_NUMBER,
+    ZSTD_WINDOWLOG_ABSOLUTEMIN, ZSTD_WINDOWLOG_LIMIT_DEFAULT, ZSTD_WINDOWLOG_MAX,
+};
 
 use crate::lib::common::zstd_trace::{
     ZSTD_Trace, ZSTD_trace_decompress_begin, ZSTD_trace_decompress_end,

lib/decompress/zstd_decompress_block.rs

@@ -26,7 +26,7 @@ use crate::lib::decompress::{
     ZSTD_seqSymbol_header,
 };
 use crate::lib::polyfill::{likely, prefetch_read_data, unlikely, Locality};
-use crate::lib::zstd::*;
+use crate::lib::zstd::{ZSTD_BLOCKSIZE_MAX, ZSTD_WINDOWLOG_MAX, ZSTD_WINDOWLOG_MAX_32};
 
 pub type BIT_DStream_status = core::ffi::c_uint;
 pub const BIT_DStream_overflow: BIT_DStream_status = 3;

lib/dictBuilder/zdict.rs

@@ -26,7 +26,10 @@ use crate::lib::zdict::experimental::{
     ZDICT_fastCover_params_t, ZDICT_legacy_params_t, ZDICT_CONTENTSIZE_MIN, ZDICT_DICTSIZE_MIN,
 };
 use crate::lib::zdict::ZDICT_params_t;
-use crate::lib::zstd::*;
+use crate::lib::zstd::{
+    ZSTD_customMem, ZSTD_dct_rawContent, ZSTD_dlm_byRef, ZSTD_parameters, ZSTD_BLOCKSIZE_MAX,
+    ZSTD_CLEVEL_DEFAULT, ZSTD_MAGIC_DICTIONARY,
+};
 
 #[derive(Clone)]
 #[repr(C)]

lib/zdict.rs

@@ -31,7 +31,7 @@ pub use crate::lib::dictBuilder::zdict::{
 };
 
 pub mod experimental {
-    use super::*;
+    use super::ZDICT_params_t;
 
     pub const ZDICT_DICTSIZE_MIN: usize = 256;
 

programs/benchzstd.rs

@@ -17,7 +17,11 @@ use libzstd_rs_sys::lib::decompress::zstd_decompress::{
     ZSTD_findDecompressedSize, ZSTD_freeDCtx,
 };
 use libzstd_rs_sys::lib::decompress::ZSTD_DCtx;
-use libzstd_rs_sys::lib::zstd::*;
+use libzstd_rs_sys::lib::zstd::{
+    ZSTD_ParamSwitch_e, ZSTD_ResetDirective, ZSTD_cParameter, ZSTD_compressionParameters,
+    ZSTD_error_dstSize_tooSmall, ZSTD_inBuffer_s, ZSTD_outBuffer_s, ZSTD_CONTENTSIZE_ERROR,
+    ZSTD_CONTENTSIZE_UNKNOWN,
+};
 
 use crate::benchfn::{
     BMK_benchParams_t, BMK_benchTimedFn, BMK_createTimedFnState, BMK_extract_runTime,

programs/dibio.rs

@@ -9,7 +9,7 @@ use libzstd_rs_sys::lib::zdict::experimental::{
     ZDICT_trainFromBuffer_cover, ZDICT_trainFromBuffer_fastCover, ZDICT_trainFromBuffer_legacy,
 };
 use libzstd_rs_sys::lib::zdict::{ZDICT_getErrorName, ZDICT_isError};
-use libzstd_rs_sys::lib::zstd::*;
+use libzstd_rs_sys::lib::zstd::ZSTD_error_GENERIC;
 
 use crate::timefn::{PTime, UTIL_clockSpanMicro, UTIL_getTime, UTIL_time_t};
 use crate::util::UTIL_getFileSize;

programs/fileio.rs

@@ -26,7 +26,15 @@ use libzstd_rs_sys::lib::decompress::zstd_decompress::{
     ZSTD_getFrameContentSize, ZSTD_getFrameHeader, ZSTD_isFrame,
 };
 use libzstd_rs_sys::lib::decompress::{ZSTD_DCtx, ZSTD_FrameHeader, ZSTD_frame};
-use libzstd_rs_sys::lib::zstd::*;
+use libzstd_rs_sys::lib::zstd::{
+    ZSTD_ParamSwitch_e, ZSTD_ResetDirective, ZSTD_btlazy2, ZSTD_btopt, ZSTD_cParameter,
+    ZSTD_compressionParameters, ZSTD_dParameter, ZSTD_error_frameParameter_windowTooLarge,
+    ZSTD_frameProgression, ZSTD_inBuffer, ZSTD_inBuffer_s, ZSTD_outBuffer, ZSTD_outBuffer_s,
+    ZSTD_strategy, ZSTD_BLOCKSIZE_MAX, ZSTD_CONTENTSIZE_ERROR, ZSTD_CONTENTSIZE_UNKNOWN,
+    ZSTD_FRAMEHEADERSIZE_MAX, ZSTD_MAGICNUMBER, ZSTD_MAGIC_SKIPPABLE_MASK,
+    ZSTD_MAGIC_SKIPPABLE_START, ZSTD_WINDOWLOG_LIMIT_DEFAULT, ZSTD_WINDOWLOG_MAX_32,
+    ZSTD_WINDOWLOG_MAX_64,
+};
 
 use crate::fileio_asyncio::{
     AIO_ReadPool_closeFile, AIO_ReadPool_consumeAndRefill, AIO_ReadPool_consumeBytes,

programs/zstdcli.rs

@@ -10,7 +10,10 @@ use libzstd_rs_sys::lib::zdict::experimental::{
     ZDICT_cover_params_t, ZDICT_fastCover_params_t, ZDICT_legacy_params_t,
 };
 use libzstd_rs_sys::lib::zdict::ZDICT_params_t;
-use libzstd_rs_sys::lib::zstd::*;
+use libzstd_rs_sys::lib::zstd::{
+    ZSTD_ParamSwitch_e, ZSTD_btultra2, ZSTD_cParameter, ZSTD_compressionParameters, ZSTD_strategy,
+    ZSTD_BLOCKSIZELOG_MAX, ZSTD_WINDOWLOG_MAX_32, ZSTD_WINDOWLOG_MAX_64,
+};
 
 use crate::benchzstd::{BMK_benchFilesAdvanced, BMK_initAdvancedParams, BMK_syntheticTest};
 use crate::dibio::DiB_trainFromFiles;