Merge pull request #327 from korpling/fix-windows-runner

Changed GitHub Runner to windows-2025

Author: thomaskrause

.github/workflows/release_capi.yml

@@ -42,7 +42,7 @@ jobs:
           omitPrereleaseDuringUpdate: true
   deploy_windows_binaries:
     if: ${{ github.event.action == 'completed' || github.event.label.name == 'test-release-process' || (github.event_name == 'release' && github.event.action == 'published') }}
-    runs-on: windows-2019
+    runs-on: windows-2025
     steps:
       - id: latest-release
         uses: pozetroninc/github-action-get-latest-release@v0.7.0

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
         run: mdbook build docs/
   test_windows:
     name: Execute automated tests on Windows
-    runs-on: windows-2019
+    runs-on: windows-2025
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rust-lang/setup-rust-toolchain@v1.8.0

CHANGELOG.md

@@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Changed GitHub Runner to windows-2025
+
 ## [3.8.2] - 2025-08-11
 
 ### Fixed

core/src/annostorage/inmemory.rs

@@ -259,7 +259,11 @@ where
         Ok(())
     }
 
-    fn remove_annotation_for_item(&mut self, item: &T, key: &AnnoKey) -> Result<Option<Cow<str>>> {
+    fn remove_annotation_for_item(
+        &mut self,
+        item: &T,
+        key: &AnnoKey,
+    ) -> Result<Option<Cow<'_, str>>> {
         let mut result = None;
 
         let orig_key = key;
@@ -389,7 +393,7 @@ where
         Ok(self.total_number_of_annos == 0)
     }
 
-    fn get_value_for_item(&self, item: &T, key: &AnnoKey) -> Result<Option<Cow<str>>> {
+    fn get_value_for_item(&self, item: &T, key: &AnnoKey) -> Result<Option<Cow<'_, str>>> {
         if let (Some(key_symbol), Some(all_annos)) =
             (self.anno_keys.get_symbol(key), self.by_container.get(item))
         {
@@ -829,7 +833,11 @@ where
         }
     }
 
-    fn guess_most_frequent_value(&self, ns: Option<&str>, name: &str) -> Result<Option<Cow<str>>> {
+    fn guess_most_frequent_value(
+        &self,
+        ns: Option<&str>,
+        name: &str,
+    ) -> Result<Option<Cow<'_, str>>> {
         // find all complete keys which have the given name (and namespace if given)
         let qualified_keys = match ns {
             Some(ns) => vec![AnnoKey {
@@ -868,7 +876,11 @@ where
         }
     }
 
-    fn get_all_values(&self, key: &AnnoKey, most_frequent_first: bool) -> Result<Vec<Cow<str>>> {
+    fn get_all_values(
+        &self,
+        key: &AnnoKey,
+        most_frequent_first: bool,
+    ) -> Result<Vec<Cow<'_, str>>> {
         if let Some(key) = self.anno_keys.get_symbol(key) {
             if let Some(values_for_key) = self.by_anno.get(&key) {
                 if most_frequent_first {

core/src/annostorage/mod.rs

@@ -185,7 +185,11 @@ where
 
     /// Remove the annotation given by its `key` for a specific `item`
     /// Returns the value for that annotation, if it existed.
-    fn remove_annotation_for_item(&mut self, item: &T, key: &AnnoKey) -> Result<Option<Cow<str>>>;
+    fn remove_annotation_for_item(
+        &mut self,
+        item: &T,
+        key: &AnnoKey,
+    ) -> Result<Option<Cow<'_, str>>>;
 
     /// Remove all annotations for the given item. Returns whether the item had
     /// any annotations.
@@ -201,7 +205,7 @@ where
     fn get_annotations_for_item(&self, item: &T) -> Result<Vec<Annotation>>;
 
     /// Get the annotation for a given `item` and the annotation `key`.
-    fn get_value_for_item(&self, item: &T, key: &AnnoKey) -> Result<Option<Cow<str>>>;
+    fn get_value_for_item(&self, item: &T, key: &AnnoKey) -> Result<Option<Cow<'_, str>>>;
 
     /// Returns `true` if the given `item` has an annotation for the given `key`.
     fn has_value_for_item(&self, item: &T, key: &AnnoKey) -> Result<bool>;
@@ -243,7 +247,7 @@ where
     ) -> Box<dyn Iterator<Item = Result<Match>> + 'a>;
 
     /// Returns an iterator for all items where the value matches the regular expression.
-    /// The annotation `name` and the `pattern` for the value must be given as argument, the  
+    /// The annotation `name` and the `pattern` for the value must be given as argument, the
     /// `namespace` argument is optional and can be used as additional constraint.
     ///
     /// - `namespace`- If given, only annotations having this namespace are returned.
@@ -287,11 +291,16 @@ where
     /// Estimate the most frequent value for a given annotation `name` with an optional namespace (`ns`).
     ///
     /// If more than one qualified annotation name matches the defnition, the more frequent value is used.
-    fn guess_most_frequent_value(&self, ns: Option<&str>, name: &str) -> Result<Option<Cow<str>>>;
+    fn guess_most_frequent_value(
+        &self,
+        ns: Option<&str>,
+        name: &str,
+    ) -> Result<Option<Cow<'_, str>>>;
 
     /// Return a list of all existing values for a given annotation `key`.
     /// If the `most_frequent_first` parameter is true, the results are sorted by their frequency.
-    fn get_all_values(&self, key: &AnnoKey, most_frequent_first: bool) -> Result<Vec<Cow<str>>>;
+    fn get_all_values(&self, key: &AnnoKey, most_frequent_first: bool)
+        -> Result<Vec<Cow<'_, str>>>;
 
     /// Get all the annotation keys which are part of this annotation storage
     fn annotation_keys(&self) -> Result<Vec<AnnoKey>>;

core/src/annostorage/ondisk.rs

@@ -463,7 +463,11 @@ where
         Ok(result)
     }
 
-    fn remove_annotation_for_item(&mut self, item: &T, key: &AnnoKey) -> Result<Option<Cow<str>>> {
+    fn remove_annotation_for_item(
+        &mut self,
+        item: &T,
+        key: &AnnoKey,
+    ) -> Result<Option<Cow<'_, str>>> {
         // remove annotation from by_container
         if let Some(symbol_id) = self.anno_key_symbols.get_symbol(key) {
             let by_container_key = create_by_container_key(item.clone(), symbol_id);
@@ -539,7 +543,7 @@ where
         self.by_container.is_empty()
     }
 
-    fn get_value_for_item(&self, item: &T, key: &AnnoKey) -> Result<Option<Cow<str>>> {
+    fn get_value_for_item(&self, item: &T, key: &AnnoKey) -> Result<Option<Cow<'_, str>>> {
         if let Some(symbol_id) = self.anno_key_symbols.get_symbol(key) {
             let raw = self
                 .by_container
@@ -970,7 +974,11 @@ where
         }
     }
 
-    fn guess_most_frequent_value(&self, ns: Option<&str>, name: &str) -> Result<Option<Cow<str>>> {
+    fn guess_most_frequent_value(
+        &self,
+        ns: Option<&str>,
+        name: &str,
+    ) -> Result<Option<Cow<'_, str>>> {
         // find all complete keys which have the given name (and namespace if given)
         let qualified_keys = match ns {
             Some(ns) => vec![AnnoKey {
@@ -1007,7 +1015,11 @@ where
         }
     }
 
-    fn get_all_values(&self, key: &AnnoKey, most_frequent_first: bool) -> Result<Vec<Cow<str>>> {
+    fn get_all_values(
+        &self,
+        key: &AnnoKey,
+        most_frequent_first: bool,
+    ) -> Result<Vec<Cow<'_, str>>> {
         if most_frequent_first {
             let mut values_with_count: HashMap<String, usize> = HashMap::default();
             for item in self.get_by_anno_qname_range(key) {

core/src/util/disk_collections.rs

@@ -117,7 +117,7 @@ where
         Ok(())
     }
 
-    pub fn get(&self, key: &K) -> Result<Option<Cow<V>>> {
+    pub fn get(&self, key: &K) -> Result<Option<Cow<'_, V>>> {
         // Check C0 first
         if let Some(entry) = self.c0.get(key) {
             if let Some(value) = entry {
@@ -204,7 +204,7 @@ where
         Ok(existing)
     }
 
-    pub fn iter(&self) -> Result<ResultIterator<K, V>> {
+    pub fn iter(&self) -> Result<ResultIterator<'_, K, V>> {
         if let Some(c1) = &self.c1 {
             if self.c0.is_empty() && self.c2.is_none() {
                 // Create an iterator that skips the thombstone entries

graphannis/src/annis/db/aql/operators/equal_value.rs

@@ -76,7 +76,7 @@ impl std::fmt::Display for EqualValue<'_> {
 }
 
 impl EqualValue<'_> {
-    fn value_for_match(&self, m: &Match, spec: &NodeSearchSpec) -> Result<Option<Cow<str>>> {
+    fn value_for_match(&self, m: &Match, spec: &NodeSearchSpec) -> Result<Option<Cow<'_, str>>> {
         match spec {
             NodeSearchSpec::ExactValue { .. }
             | NodeSearchSpec::NotExactValue { .. }

graphannis/src/annis/db/exec/mod.rs

@@ -196,7 +196,7 @@ pub struct NodeSearchDesc {
 }
 
 pub trait ExecutionNode: Iterator {
-    fn as_nodesearch(&self) -> Option<&NodeSearch> {
+    fn as_nodesearch(&self) -> Option<&NodeSearch<'_>> {
         None
     }
 
@@ -220,7 +220,7 @@ impl Iterator for EmptyResultSet {
 }
 
 impl ExecutionNode for EmptyResultSet {
-    fn as_nodesearch(&self) -> Option<&NodeSearch> {
+    fn as_nodesearch(&self) -> Option<&NodeSearch<'_>> {
         None
     }
 

graphannis/src/annis/db/exec/nodesearch.rs

@@ -1122,7 +1122,7 @@ impl ExecutionNode for NodeSearch<'_> {
         self.desc.as_ref()
     }
 
-    fn as_nodesearch(&self) -> Option<&NodeSearch> {
+    fn as_nodesearch(&self) -> Option<&NodeSearch<'_>> {
         Some(self)
     }