Update rust (#68)

* Update rust * Add todo * Use return impl * Fix clippy warnings
quambene · Jan 1, 2024 · 97020ee · 97020ee
1 parent 6585239
commit 97020ee
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.72"
+channel = "1.75"
 profile = "default"
diff --git a/src/bookmark_reader/chromium.rs b/src/bookmark_reader/chromium.rs
@@ -60,7 +60,7 @@ impl Chromium {
                 }
             }
             Value::Array(arr) => {
-                for (_index, val) in arr.iter().enumerate() {
+                for val in arr {
                     Self::traverse_json(val, source_bookmarks, source);
                 }
             }
@@ -81,7 +81,7 @@ impl Chromium {
                 }
             }
             Value::Array(arr) => {
-                for (_index, val) in arr.iter().enumerate() {
+                for val in arr {
                     Self::traverse_children(val, source_bookmarks, source);
                 }
             }

diff --git a/src/bookmark_reader/firefox.rs b/src/bookmark_reader/firefox.rs
@@ -63,7 +63,7 @@ impl Firefox {
                 }
             }
             Value::Array(arr) => {
-                for (_index, val) in arr.iter().enumerate() {
+                for val in arr {
                     Self::traverse_json(val, source_bookmarks, source);
                 }
             }
@@ -84,7 +84,7 @@ impl Firefox {
                 }
             }
             Value::Array(arr) => {
-                for (_index, val) in arr.iter().enumerate() {
+                for val in arr {
                     Self::traverse_children(val, source_bookmarks, source);
                 }
             }

diff --git a/src/bookmarks/target_bookmarks.rs b/src/bookmarks/target_bookmarks.rs
@@ -141,6 +141,7 @@ impl TargetBookmarks {
                 let url = entry.key().clone();
                 let target_bookmark = entry.into_mut();
                 debug!("Overwrite duplicate target bookmark: {}", url);
+                // TODO: use existing bookmark id and bookmark urls
                 *target_bookmark = bookmark;
             }
             Entry::Vacant(entry) => {

diff --git a/src/cache.rs b/src/cache.rs
@@ -77,7 +77,7 @@ pub trait Caching {
 
     /// Open the cached file for a bookmark.
     // TODO: return `Result<Option<impl Read>, anyhow::Error>` (see <https://github.com/rust-lang/rust/issues/91611>).
-    fn open(&self, bookmark: &TargetBookmark) -> Result<Option<File>, BogrepError>;
+    fn open(&self, bookmark: &TargetBookmark) -> Result<Option<impl Read>, BogrepError>;
 
     /// Get the content of a bookmark from cache.
     // TODO: make get async
@@ -153,7 +153,7 @@ impl Caching for Cache {
         bookmark.cache_modes.contains(self.mode())
     }
 
-    fn open(&self, bookmark: &TargetBookmark) -> Result<Option<File>, BogrepError> {
+    fn open(&self, bookmark: &TargetBookmark) -> Result<Option<impl Read>, BogrepError> {
         let cache_path = self.bookmark_path(&bookmark.id);
         debug!("Open website: {}", cache_path.display());
 
@@ -322,8 +322,8 @@ impl Caching for MockCache {
         self.get(bookmark).unwrap().is_some()
     }
 
-    fn open(&self, _bookmark: &TargetBookmark) -> Result<Option<File>, BogrepError> {
-        Ok(None)
+    fn open(&self, _bookmark: &TargetBookmark) -> Result<Option<impl Read>, BogrepError> {
+        Ok(None::<File>)
     }
 
     fn get(&self, bookmark: &TargetBookmark) -> Result<Option<String>, BogrepError> {

diff --git a/tests/test_fetch.rs b/tests/test_fetch.rs
@@ -193,7 +193,7 @@ async fn test_fetch_empty_cache() {
     }
 
     let cache_dir = temp_path.join("cache");
-    let entries = fs::read_dir(&cache_dir);
+    let entries = fs::read_dir(cache_dir);
     assert!(entries.is_ok_and(|mut file| file.next().is_none()));
 
     println!("Execute 'bogrep fetch'");