rust-ext: upgrade zstd-safe and zstd-bytes to latest using zstd 1.5.2

There were some API changes in newer versions of the crate that
forced minor code changes to get things to compile.

Author: indygreg

Cargo.lock

@@ -18,11 +18,11 @@ num_cpus = "1.15.0"
 rayon = "1.6.1"
 
 [dependencies.zstd-safe]
-version = "5.0.2+zstd.1.5.2"
+version = "=6.0.3+zstd.1.5.2"
 features = ["experimental", "legacy", "zstdmt"]
 
 [dependencies.zstd-sys]
-version = "2.0.1+zstd.1.5.2"
+version = "=2.0.6+zstd.1.5.2"
 features = ["experimental", "legacy", "zstdmt"]
 
 [dependencies.pyo3]

Cargo.toml

@@ -122,7 +122,9 @@ impl ZstdCompressionDict {
     }
 
     fn dict_id(&self) -> u32 {
-        zstd_safe::get_dict_id(&self.data).unwrap_or(0)
+        zstd_safe::get_dict_id(&self.data)
+            .map(u32::from)
+            .unwrap_or(0)
     }
 
     #[args(level = "None", compression_params = "None")]

rust-ext/src/compression_dict.rs

@@ -190,13 +190,17 @@ fn decompress_from_datasources(
                 };
 
                 let decompressed_size = if source.decompressed_size == 0 {
-                    let frame_size = zstd_safe::get_frame_content_size(source.data);
-
-                    if frame_size == zstd_safe::CONTENTSIZE_ERROR
-                        || frame_size == zstd_safe::CONTENTSIZE_UNKNOWN
-                    {
-                        result.error = WorkerError::NoSize;
-                    }
+                    let frame_size = match zstd_safe::get_frame_content_size(source.data) {
+                        Err(zstd_safe::ContentSizeError) => {
+                            result.error = WorkerError::NoSize;
+                            zstd_safe::CONTENTSIZE_ERROR
+                        }
+                        Ok(None) => {
+                            result.error = WorkerError::NoSize;
+                            zstd_safe::CONTENTSIZE_UNKNOWN
+                        }
+                        Ok(Some(frame_size)) => frame_size,
+                    };
 
                     frame_size as _
                 } else {