Merge branch 'main' into chore/toolchain-update

Author: tusharmath

Cargo.lock

@@ -8,7 +8,7 @@ use crate::core::jit::builder::Builder;
 use crate::core::jit::store::Store;
 use crate::core::jit::synth::Synth;
 use crate::core::jit::transform::InputResolver;
-use crate::core::jit::{transform, OperationPlan, Variables};
+use crate::core::jit::{transform, Field, OperationPlan, Variables};
 use crate::core::json::{JsonLike, JsonObjectLike};
 use crate::core::valid::Validator;
 use crate::core::Transform;
@@ -119,10 +119,11 @@ impl<'a, Value: Deserialize<'a> + Clone + 'a + JsonLike<'a> + std::fmt::Debug> J
         let ProcessedTestData { posts, users } = self.test_data.to_processed();
         let vars = self.vars.clone();
 
-        let posts_id = self.plan.find_field_path(&["posts"]).unwrap().id.to_owned();
-        let users_id = self
-            .plan
-            .find_field_path(&["posts", "user"])
+        let posts_id = find_field_path(&self.plan, &["posts"])
+            .unwrap()
+            .id
+            .to_owned();
+        let users_id = find_field_path(&self.plan, &["posts", "user"])
             .unwrap()
             .id
             .to_owned();
@@ -137,3 +138,21 @@ impl<'a, Value: Deserialize<'a> + Clone + 'a + JsonLike<'a> + std::fmt::Debug> J
         Synth::new(&self.plan, store, vars)
     }
 }
+
+/// Search for a field by specified path of nested fields
+pub fn find_field_path<'a, S: AsRef<str>, T>(
+    plan: &'a OperationPlan<T>,
+    path: &[S],
+) -> Option<&'a Field<T>> {
+    match path.split_first() {
+        None => None,
+        Some((name, path)) => {
+            let field = plan.iter_dfs().find(|field| field.name == name.as_ref())?;
+            if path.is_empty() {
+                Some(field)
+            } else {
+                find_field_path(plan, path)
+            }
+        }
+    }
+}

src/core/jit/fixtures/jp.rs

@@ -366,21 +366,6 @@ impl<Input> OperationPlan<Input> {
         DFS { stack: vec![self.selection.iter()] }
     }
 
-    /// Search for a field by specified path of nested fields
-    pub fn find_field_path<S: AsRef<str>>(&self, path: &[S]) -> Option<&Field<Input>> {
-        match path.split_first() {
-            None => None,
-            Some((name, path)) => {
-                let field = self.iter_dfs().find(|field| field.name == name.as_ref())?;
-                if path.is_empty() {
-                    Some(field)
-                } else {
-                    self.find_field_path(path)
-                }
-            }
-        }
-    }
-
     /// Returns number of fields in plan
     pub fn size(&self) -> usize {
         fn count<A>(field: &Field<A>) -> usize {