Merge pull request #50 from balena-io-modules/revert-matchit-update

Revert matchit update

Author: flowzone-app[bot]

Cargo.toml

@@ -14,9 +14,9 @@ repository = "https://github.com/balena-io-modules/mahler-rs"
 anyhow = "1.0.97"
 json-patch = "4"
 jsonptr = "0.7.1"
-# FIXME: this is using the revision for https://github.com/ibraheemdev/matchit/pull/76 
-# revert to using only version once a new release (>0.8.6) of matchit is available
-matchit = { version = "0.8.6", git = "https://github.com/ibraheemdev/matchit.git", rev = "8fef456b044ec84532dea99f1857177b90d416e0" }
+# FIXME: this needs bumping once the fix in https://github.com/ibraheemdev/matchit/pull/76 
+# makes it to a new release
+matchit = { version = "0.8.4" }
 serde = "1.0.197"
 serde_json = "1.0.120"
 thiserror = "2"

src/planner/distance.rs

@@ -91,7 +91,7 @@ impl Distance {
         self.0.is_empty()
     }
 
-    pub fn iter(&self) -> Iter<Operation> {
+    pub fn iter(&self) -> Iter<'_, Operation> {
         self.0.iter()
     }
 

src/planner/domain.rs

@@ -189,7 +189,7 @@ impl Domain {
     /// Find matches for the given path in the domain
     /// the matches are sorted in order that they should be
     /// tested
-    pub(crate) fn find_matching_jobs(&self, path: &str) -> Option<(PathArgs, Iter<Job>)> {
+    pub(crate) fn find_matching_jobs(&self, path: &str) -> Option<(PathArgs, Iter<'_, Job>)> {
         self.router
             .at(path)
             .map(|matched| (PathArgs::from(matched.params), matched.value.iter()))
@@ -326,7 +326,9 @@ mod tests {
     }
 
     // See: https://github.com/ibraheemdev/matchit/issues/75
+    // we ignore it for now until matchit releases a new version
     #[test]
+    #[ignore]
     fn test_finds_jobs_for_empty_paths() {
         let func = |view: View<()>| view;
         let domain = Domain::new()