From f2692b78dd36a2803ead3e713f3f6429ed96c97d Mon Sep 17 00:00:00 2001
From: houseme <housemecn@gmail.com>
Date: Mon, 31 Mar 2025 18:32:22 +0800
Subject: [PATCH] TryInto cover

---
 Cargo.toml                           |  2 +-
 ecstore/src/heal/data_scanner.rs     | 24 +++++++++---------------
 ecstore/src/heal/data_usage_cache.rs |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 29f07cb4..342c1ea5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,7 +100,7 @@ serde_json = "1.0.138"
 sha2 = "0.10.8"
 tempfile = "3.16.0"
 thiserror = "2.0.12"
-time = { version = "0.3.37", features = [
+time = { version = "0.3.41", features = [
     "std",
     "parsing",
     "formatting",
diff --git a/ecstore/src/heal/data_scanner.rs b/ecstore/src/heal/data_scanner.rs
index 52ded12a..6701f7ba 100644
--- a/ecstore/src/heal/data_scanner.rs
+++ b/ecstore/src/heal/data_scanner.rs
@@ -352,7 +352,7 @@ impl CurrentScannerCycle {
 
             let str_len = rmp::decode::read_str_len(&mut cur)?;
 
-            // ！！！ Vec::with_capacity(str_len) 失败，vec!正常
+            // ！！！Vec::with_capacity(str_len) 失败，vec! 正常
             let mut field_buff = vec![0u8; str_len as usize];
 
             cur.read_exact(&mut field_buff)?;
@@ -435,7 +435,7 @@ impl ScannerItem {
 
     pub async fn apply_versions_actions(&self, fivs: &[FileInfo]) -> Result<Vec<ObjectInfo>> {
         let obj_infos = self.apply_newer_noncurrent_version_limit(fivs).await?;
-        if obj_infos.len() >= SCANNER_EXCESS_OBJECT_VERSIONS.load(Ordering::SeqCst).try_into().unwrap() {
+        if obj_infos.len() >= <u64 as TryInto<usize>>::try_into(SCANNER_EXCESS_OBJECT_VERSIONS.load(Ordering::SeqCst)).unwrap() {
             // todo
         }
 
@@ -445,10 +445,7 @@ impl ScannerItem {
         }
 
         if cumulative_size
-            >= SCANNER_EXCESS_OBJECT_VERSIONS_TOTAL_SIZE
-                .load(Ordering::SeqCst)
-                .try_into()
-                .unwrap()
+            >= <u64 as TryInto<usize>>::try_into(SCANNER_EXCESS_OBJECT_VERSIONS_TOTAL_SIZE.load(Ordering::SeqCst)).unwrap()
         {
             //todo
         }
@@ -684,16 +681,13 @@ impl FolderScanner {
             }
 
             let should_compact = self.new_cache.info.name != folder.name
-                && existing_folders.len() + new_folders.len() >= DATA_SCANNER_COMPACT_AT_FOLDERS.try_into().unwrap()
-                || existing_folders.len() + new_folders.len() >= DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS.try_into().unwrap();
+                && existing_folders.len() + new_folders.len()
+                    >= <u64 as TryInto<usize>>::try_into(DATA_SCANNER_COMPACT_AT_FOLDERS).unwrap()
+                || existing_folders.len() + new_folders.len()
+                    >= <u64 as TryInto<usize>>::try_into(DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS).unwrap();
 
             let total_folders = existing_folders.len() + new_folders.len();
-            if total_folders
-                > SCANNER_EXCESS_FOLDERS
-                    .load(std::sync::atomic::Ordering::SeqCst)
-                    .try_into()
-                    .unwrap()
-            {
+            if total_folders > <u64 as TryInto<usize>>::try_into(SCANNER_EXCESS_FOLDERS.load(Ordering::SeqCst)).unwrap() {
                 let _prefix_name = format!("{}/", folder.name.trim_end_matches('/'));
                 // todo: notification
             }
@@ -957,7 +951,7 @@ impl FolderScanner {
         if !into.compacted && self.new_cache.info.name != folder.name {
             let mut flat = self.new_cache.size_recursive(&this_hash.key()).unwrap_or_default();
             flat.compacted = true;
-            let compact = if flat.objects < DATA_SCANNER_COMPACT_LEAST_OBJECT.try_into().unwrap() {
+            let compact = if flat.objects < <u64 as TryInto<usize>>::try_into(DATA_SCANNER_COMPACT_LEAST_OBJECT).unwrap() {
                 true
             } else {
                 // Compact if we only have objects as children...
diff --git a/ecstore/src/heal/data_usage_cache.rs b/ecstore/src/heal/data_usage_cache.rs
index 7bc33df8..9111d2a7 100644
--- a/ecstore/src/heal/data_usage_cache.rs
+++ b/ecstore/src/heal/data_usage_cache.rs
@@ -588,7 +588,7 @@ impl DataUsageCache {
             Some(e) => e,
             None => return,
         };
-        if top_e.children.len() > DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS.try_into().unwrap() {
+        if top_e.children.len() > <u64 as TryInto<usize>>::try_into(DATA_SCANNER_FORCE_COMPACT_AT_FOLDERS).unwrap() {
             self.reduce_children_of(&hash_path(&self.info.name), limit, true);
         }
         if self.cache.len() <= limit {