deps: bump cached to 0.58 (#3594)

* deps: bump cachec to 0.58 and remove git dependency; update lock file

* refactor: adjust to cached 0.58 breaking changes

cached 0.58 switched from std::sync::Mutex to parking_lot::Mutex. parking_lot::Mutex::lock() returns MutexGuard directly (not Result), so .unwrap() and Ok/Err pattern matching are no longer valid.

Author: jqnatividad

Cargo.lock

@@ -91,7 +91,7 @@ bytemuck = { version = "1.24", features = [
 ], optional = true }
 byteorder = "1.5"
 bytes = "1"
-cached = { version = "0.56", features = [
+cached = { version = "0.58", features = [
     "ahash",
     "disk_store",
     "redis_ahash",
@@ -331,9 +331,6 @@ csv-index = { git = "https://github.com/dathere/rust-csv", branch = "qsv-tuned"
 # csv-core = { path = "../rust-csv/csv-core" }
 # csv-index = { path = "../rust-csv/csv-index" }
 
-# use fork with updated redis 1.0 dependency & client-side caching features
-cached = { git = "https://github.com/nihohit/cached", branch = "client-side-caching" }
-
 # use our patched fork to bump dependencies until our PR is merged
 csvlens = { git = "https://github.com/jqnatividad/csvlens", branch = "bump-deps-202602" }
 

Cargo.toml

@@ -837,7 +837,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
                     final_response = intermediate_value.value;
                     was_cached = intermediate_value.was_cached;
                     if !args.flag_cache_error && final_response.status_code != 200 {
-                        let mut cache = GET_CACHED_RESPONSE.lock().unwrap();
+                        let mut cache = GET_CACHED_RESPONSE.lock();
                         cache.cache_remove(&url);
                     }
                 },

src/cmd/fetch.rs

@@ -907,7 +907,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
                     final_response = intermediate_value.value;
                     was_cached = intermediate_value.was_cached;
                     if !args.flag_cache_error && final_response.status_code != 200 {
-                        let mut cache = GET_CACHED_RESPONSE.lock().unwrap();
+                        let mut cache = GET_CACHED_RESPONSE.lock();
                         cache.cache_remove(&url);
                     }
                 },

src/cmd/fetchpost.rs

@@ -814,25 +814,21 @@ macro_rules! update_cache_info {
         use cached::Cached;
         use indicatif::HumanCount;
 
-        match $cache_instance.lock() {
-            Ok(cache) => {
-                let size = cache.cache_size();
-                if size > 0 {
-                    let hits = cache.cache_hits().unwrap_or_default();
-                    let misses = cache.cache_misses().unwrap_or(1);
-                    #[allow(clippy::cast_precision_loss)]
-                    let hit_ratio = (hits as f64 / (hits + misses) as f64) * 100.0;
-                    let capacity = cache.cache_capacity();
-                    $progress.set_message(format!(
-                        " of {} records. Cache {:.2}% entries: {} capacity: {}.",
-                        HumanCount($progress.length().unwrap()),
-                        hit_ratio,
-                        HumanCount(size as u64),
-                        HumanCount(capacity.unwrap() as u64),
-                    ));
-                }
-            },
-            _ => {},
+        let cache = $cache_instance.lock();
+        let size = cache.cache_size();
+        if size > 0 {
+            let hits = cache.cache_hits().unwrap_or_default();
+            let misses = cache.cache_misses().unwrap_or(1);
+            #[allow(clippy::cast_precision_loss)]
+            let hit_ratio = (hits as f64 / (hits + misses) as f64) * 100.0;
+            let capacity = cache.cache_capacity();
+            $progress.set_message(format!(
+                " of {} records. Cache {:.2}% entries: {} capacity: {}.",
+                HumanCount($progress.length().unwrap()),
+                hit_ratio,
+                HumanCount(size as u64),
+                HumanCount(capacity.unwrap() as u64),
+            ));
         }
     };
     ($progress:expr_2021, $cache_hits:expr_2021, $num_rows:expr_2021) => {