refactor(hydroflow_lang): cleanup handling of span locations #1268, w…

…orkaround fix #729 (#1432)
hydro-project · Aug 28, 2024 · 9c352f5 · 9c352f5
1 parent 71f69aa
commit 9c352f5
Show file tree

Hide file tree

Showing 33 changed files with 871 additions and 882 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,5 +15,8 @@
     ],
     "files.watcherExclude": {
         "**/target": true
-    }
+    },
+    "rust-analyzer.cargo.features": [
+        "python"
+    ]
 }
diff --git a/...c/snapshots/hydroflow_datalog_core__tests__aggregations_and_comments@datalog_program.snap b/...c/snapshots/hydroflow_datalog_core__tests__aggregations_and_comments@datalog_program.snap
diff --git a/...napshots/hydroflow_datalog_core__tests__aggregations_fold_keyed_expr@datalog_program.snap b/...napshots/hydroflow_datalog_core__tests__aggregations_fold_keyed_expr@datalog_program.snap
@@ -80,7 +80,7 @@ fn main() {
                     let op_7v1 = {
                         #[allow(non_snake_case)]
                         #[inline(always)]
-                        pub fn op_7v1__source_stream__loc_unknown_start_2_25_end_2_44<
+                        pub fn op_7v1__source_stream__loc_nopath_2_25_2_44<
                             Item,
                             Input: ::std::iter::Iterator<Item = Item>,
                         >(input: Input) -> impl ::std::iter::Iterator<Item = Item> {
@@ -107,7 +107,7 @@ fn main() {
                             }
                             Pull { inner: input }
                         }
-                        op_7v1__source_stream__loc_unknown_start_2_25_end_2_44(op_7v1)
+                        op_7v1__source_stream__loc_nopath_2_25_2_44(op_7v1)
                     };
                     let op_2v1 = op_7v1
                         .filter(|item| {
@@ -129,7 +129,7 @@ fn main() {
                     let op_2v1 = {
                         #[allow(non_snake_case)]
                         #[inline(always)]
-                        pub fn op_2v1__unique__loc_unknown_start_2_19_end_2_23<
+                        pub fn op_2v1__unique__loc_nopath_2_19_2_23<
                             Item,
                             Input: ::std::iter::Iterator<Item = Item>,
                         >(input: Input) -> impl ::std::iter::Iterator<Item = Item> {
@@ -156,13 +156,13 @@ fn main() {
                             }
                             Pull { inner: input }
                         }
-                        op_2v1__unique__loc_unknown_start_2_19_end_2_23(op_2v1)
+                        op_2v1__unique__loc_nopath_2_19_2_23(op_2v1)
                     };
                     let op_9v1 = op_2v1.map(|row: (_, _)| ((row.0 % 2,), (row.1,)));
                     let op_9v1 = {
                         #[allow(non_snake_case)]
                         #[inline(always)]
-                        pub fn op_9v1__map__loc_unknown_start_1_0_end_1_0<
+                        pub fn op_9v1__map__loc_nopath_1_0_1_0<
                             Item,
                             Input: ::std::iter::Iterator<Item = Item>,
                         >(input: Input) -> impl ::std::iter::Iterator<Item = Item> {
@@ -189,7 +189,7 @@ fn main() {
                             }
                             Pull { inner: input }
                         }
-                        op_9v1__map__loc_unknown_start_1_0_end_1_0(op_9v1)
+                        op_9v1__map__loc_nopath_1_0_1_0(op_9v1)
                     };
                     #[inline(always)]
                     fn pivot_run_sg_2v1<
@@ -260,7 +260,7 @@ fn main() {
                     let op_10v1 = {
                         #[allow(non_snake_case)]
                         #[inline(always)]
-                        pub fn op_10v1__fold_keyed__loc_unknown_start_1_0_end_1_0<
+                        pub fn op_10v1__fold_keyed__loc_nopath_1_0_1_0<
                             Item,
                             Input: ::std::iter::Iterator<Item = Item>,
                         >(input: Input) -> impl ::std::iter::Iterator<Item = Item> {
@@ -287,13 +287,13 @@ fn main() {
                             }
                             Pull { inner: input }
                         }
-                        op_10v1__fold_keyed__loc_unknown_start_1_0_end_1_0(op_10v1)
+                        op_10v1__fold_keyed__loc_nopath_1_0_1_0(op_10v1)
                     };
                     let op_11v1 = op_10v1.map(|(g, a): ((_,), _)| (g.0, a.0.unwrap()));
                     let op_11v1 = {
                         #[allow(non_snake_case)]
                         #[inline(always)]
-                        pub fn op_11v1__map__loc_unknown_start_1_0_end_1_0<
+                        pub fn op_11v1__map__loc_nopath_1_0_1_0<
                             Item,
                             Input: ::std::iter::Iterator<Item = Item>,
                         >(input: Input) -> impl ::std::iter::Iterator<Item = Item> {
@@ -320,7 +320,7 @@ fn main() {
                             }
                             Pull { inner: input }
                         }
-                        op_11v1__map__loc_unknown_start_1_0_end_1_0(op_11v1)
+                        op_11v1__map__loc_nopath_1_0_1_0(op_11v1)
                     };
                     let op_5v1 = op_11v1
                         .filter(|item| {
@@ -342,7 +342,7 @@ fn main() {
                     let op_5v1 = {
                         #[allow(non_snake_case)]
                         #[inline(always)]
-                        pub fn op_5v1__unique__loc_unknown_start_3_20_end_3_26<
+                        pub fn op_5v1__unique__loc_nopath_3_20_3_26<
                             Item,
                             Input: ::std::iter::Iterator<Item = Item>,
                         >(input: Input) -> impl ::std::iter::Iterator<Item = Item> {
@@ -369,15 +369,15 @@ fn main() {
                             }
                             Pull { inner: input }
                         }
-                        op_5v1__unique__loc_unknown_start_3_20_end_3_26(op_5v1)
+                        op_5v1__unique__loc_nopath_3_20_3_26(op_5v1)
                     };
                     let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| {
                         result.send(v).unwrap()
                     });
                     let op_8v1 = {
                         #[allow(non_snake_case)]
                         #[inline(always)]
-                        pub fn op_8v1__for_each__loc_unknown_start_3_28_end_3_65<
+                        pub fn op_8v1__for_each__loc_nopath_3_28_3_65<
                             Item,
                             Input: hydroflow::pusherator::Pusherator<Item = Item>,
                         >(
@@ -402,7 +402,7 @@ fn main() {
                             }
                             Push { inner: input }
                         }
-                        op_8v1__for_each__loc_unknown_start_3_28_end_3_65(op_8v1)
+                        op_8v1__for_each__loc_nopath_3_28_3_65(op_8v1)
                     };
                     #[inline(always)]
                     fn pivot_run_sg_1v1<
@@ -419,4 +419,3 @@ fn main() {
         }
     }
 }
-