Merge pull request #312 from korpling/fix-ci-errors

Fix CI errors

Author: thomaskrause

core/src/util/disk_collections.rs

@@ -497,9 +497,9 @@ where
 
             let min_key = vec![c0, c1, c3].into_iter().flatten().min();
             if let Some(min_key) = min_key {
-                let c0_is_min = c0.map_or(false, |k| k == min_key);
-                let c1_is_min = c1.map_or(false, |k| k == min_key);
-                let c3_is_min = c3.map_or(false, |k| k == min_key);
+                let c0_is_min = c0 == Some(min_key);
+                let c1_is_min = c1 == Some(min_key);
+                let c3_is_min = c3 == Some(min_key);
 
                 // Advance all iterators with the same (minimal) key
                 let c0 = if c0_is_min {

graphannis/src/annis/db/corpusstorage.rs

@@ -1905,7 +1905,7 @@ impl CorpusStorage {
                 let include_in_output = prep
                     .query
                     .get_variable_by_node_nr(node_nr)
-                    .map_or(false, |var| prep.query.is_included_in_output(&var));
+                    .is_some_and(|var| prep.query.is_included_in_output(&var));
 
                 if include_in_output {
                     if any_nodes_added {
@@ -2526,7 +2526,7 @@ impl Drop for CorpusStorage {
         }
 
         // unlock lock file
-        if let Err(e) = self.lock_file.unlock() {
+        if let Err(e) = FileExt::unlock(&self.lock_file) {
             warn!("Could not unlock CorpusStorage lock file: {:?}", e);
         } else {
             trace!("Unlocked CorpusStorage lock file");