Update upstream CascLib + minor optimizations

casclib-bindgen/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bindgen = "0.56.0"
+bindgen = "0.60"

casclib-bindgen/src/main.rs

@@ -12,15 +12,15 @@ fn main() {
     // Tell cargo to invalidate the built crate whenever any of the
     // included header files changed.
     .parse_callbacks(Box::new(bindgen::CargoCallbacks))
-    .whitelist_type("^CASC.+")
-    .whitelist_function("^Casc.+")
-    .whitelist_function("SetCascError")
-    .whitelist_function("GetCascError")
-    .whitelist_var("^CASC.+")
-    .whitelist_var("^ERROR_.+")
-    .whitelist_var("FILE_BEGIN")
-    .whitelist_var("FILE_CURRENT")
-    .whitelist_var("FILE_END");
+    .allowlist_type("^CASC.+")
+    .allowlist_function("^Casc.+")
+    .allowlist_function("SetCascError")
+    .allowlist_function("GetCascError")
+    .allowlist_var("^CASC.+")
+    .allowlist_var("^ERROR_.+")
+    .allowlist_var("FILE_BEGIN")
+    .allowlist_var("FILE_CURRENT")
+    .allowlist_var("FILE_END");
 
   let bindings = bindings
     // Finish the builder and generate the bindings.

casclib-sys/Cargo.toml

@@ -6,7 +6,7 @@ build = "build.rs"
 edition = "2018"
 
 [dependencies]
-libc = "0.2.81"
+libc = "0.2"
 
 [build-dependencies]
 cmake = "0.1"

casclib-sys/build.rs

@@ -1,6 +1,6 @@
 extern crate cmake;
 
-use std::env;
+use std::{ env, fs };
 
 fn main() {
     // Gets CacsLib source path from env CASCLIB_DIR
@@ -22,7 +22,14 @@ fn main() {
         .define("CASC_BUILD_STATIC_LIB", "ON")
         .build();
 
-    let lib = dst.join("lib");
+    let mut lib = dst.join("lib");
+    // on some distributions on 64 bit lib dir is called lib64
+    if fs::metadata(&lib).is_err() {
+        lib = dst.join("lib64");
+        if fs::metadata(&lib).is_err() {
+          println!("libcasc is missing");
+        }
+    }
 
     println!("cargo:rustc-link-search=native={}", lib.display());
     println!("cargo:rustc-link-lib=static=casc");

casclib-sys/src/bindings_linux.rs

@@ -109,7 +109,7 @@ pub const ERROR_BUFFER_OVERFLOW: u32 = 1008;
 pub const ERROR_CANCELLED: u32 = 1009;
 pub const ERROR_INDEX_PARSING_DONE: u32 = 1010;
 pub const CASCLIB_VERSION: u32 = 512;
-pub const CASCLIB_VERSION_STRING: &'static [u8; 4usize] = b"2.0\0";
+pub const CASCLIB_VERSION_STRING: &[u8; 4usize] = b"2.0\0";
 pub const CASC_OPEN_BY_NAME: u32 = 0;
 pub const CASC_OPEN_BY_CKEY: u32 = 1;
 pub const CASC_OPEN_BY_EKEY: u32 = 2;
@@ -536,21 +536,17 @@ fn bindgen_test_layout__CASC_FIND_DATA() {
 impl _CASC_FIND_DATA {
     #[inline]
     pub fn bFileAvailable(&self) -> DWORD {
-        unsafe { ::std::mem::transmute(self._bitfield_1.get(0usize, 1u8) as u32) }
+        self._bitfield_1.get(0usize, 1u8) as u32
     }
     #[inline]
     pub fn set_bFileAvailable(&mut self, val: DWORD) {
-        unsafe {
-            let val: u32 = ::std::mem::transmute(val);
-            self._bitfield_1.set(0usize, 1u8, val as u64)
-        }
+        self._bitfield_1.set(0usize, 1u8, val as u64)
     }
     #[inline]
     pub fn new_bitfield_1(bFileAvailable: DWORD) -> __BindgenBitfieldUnit<[u8; 1usize], u8> {
         let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 1usize], u8> =
             Default::default();
         __bindgen_bitfield_unit.set(0usize, 1u8, {
-            let bFileAvailable: u32 = unsafe { ::std::mem::transmute(bFileAvailable) };
             bFileAvailable as u64
         });
         __bindgen_bitfield_unit

casclib/Cargo.toml

@@ -9,4 +9,4 @@ casclib-sys = { path = "../casclib-sys" }
 log = "0.4"
 
 [target.'cfg(windows)'.dependencies]
-widestring = "0.4"
+widestring = "1.0"

casclib/src/lib.rs

@@ -57,7 +57,7 @@ impl error::Error for CascError {
 pub fn open<P: AsRef<Path>>(path: P) -> Result<Storage, CascError> {
     #[cfg(not(target_os = "windows"))]
       let cpath = {
-        let pathstr = path.as_ref().to_str().ok_or_else(|| CascError::NonUtf8)?;
+        let pathstr = path.as_ref().to_str().ok_or(CascError::NonUtf8)?;
         CString::new(pathstr).map_err(|_| CascError::InvalidPath)?
     };
     #[cfg(target_os = "windows")]
@@ -119,14 +119,14 @@ impl Storage {
         self.file_count
     }
 
-    pub fn files<'a, T>(&'a self) -> Find<'a>
+    pub fn files<T>(&self) -> Find
     where
         T: AsRef<[u8]>,
     {
         self.files_with_mask("*")
     }
 
-    pub fn files_with_mask<'a, T>(&'a self, mask: T) -> Find<'a>
+    pub fn files_with_mask<T>(&self, mask: T) -> Find
     where
         T: AsRef<[u8]>,
     {
@@ -138,7 +138,7 @@ impl Storage {
         }
     }
 
-    pub fn entry<'a, T>(&'a self, name: T) -> FileEntry<'a>
+    pub fn entry<T>(&self, name: T) -> FileEntry
     where
         T: Into<String>,
     {
@@ -193,7 +193,7 @@ impl<'a> FindIterator<'a> {
                 &mut self.data as *mut casclib::CASC_FIND_DATA,
                 ptr::null(),
             );
-            if handle == ptr::null_mut() {
+            if handle.is_null() {
                 let code = casclib::GetCascError();
                 if code == casclib::ERROR_NO_MORE_FILES {
                     return None;
@@ -219,7 +219,7 @@ impl<'a> FindIterator<'a> {
 impl<'a> Iterator for FindIterator<'a> {
     type Item = Result<FileEntry<'a>, CascError>;
 
-    fn next<'b>(&'b mut self) -> Option<Self::Item> {
+    fn next(&mut self) -> Option<Self::Item> {
         match self.handle {
             None => self.find_first(),
             Some(handle) => unsafe {
@@ -327,7 +327,7 @@ impl<'a> File<'a> {
             let pos = casclib::CascSetFilePointer(
                 self.handle,
                 0,
-                0 as *mut casclib::LONG,
+                std::ptr::null_mut::<casclib::LONG>(),
                 casclib::FILE_BEGIN as casclib::DWORD,
             );
             if pos == casclib::CASC_INVALID_POS {
@@ -351,8 +351,8 @@ impl<'a> File<'a> {
                 let end_pos = bytes_read as usize;
                 if bytes_read != 0 {
                     w.write_all(&buffer[0..end_pos])
-                        .map_err(|e| CascError::Io(e))?;
-                    bytes_write_total = bytes_write_total + end_pos;
+                        .map_err(CascError::Io)?;
+                    bytes_write_total += end_pos;
                 }
             }
             match casclib::GetCascError() {