fixup! refactor(hydroflow_lang): require lifetime on perist*() oper…

…ators
hydro-project · Jun 12, 2024 · 1a7b7bc · 1a7b7bc
1 parent 6cd71e7
commit 1a7b7bc
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 28 deletions.
diff --git a/hydroflow/tests/compile-fail/surface_singleton_nostate.rs b/hydroflow/tests/compile-fail/surface_singleton_nostate.rs
@@ -3,7 +3,7 @@ pub fn main() {
     let mut df = hydroflow::hydroflow_syntax! {
         my_ref = source_iter(15..=25) -> null();
         source_iter(10..=30)
-            -> persist()
+            -> persist::<'static>()
             -> filter(|value| value <= #my_ref.as_reveal_ref())
             -> null();
 

diff --git a/hydroflow/tests/compile-fail/surface_singleton_nostate.stderr b/hydroflow/tests/compile-fail/surface_singleton_nostate.stderr
@@ -1,9 +1,3 @@
-error: `persist` should have exactly 1 persistence lifetime arguments, actually has 0.
- --> tests/compile-fail/surface_singleton_nostate.rs:6:16
-  |
-6 |             -> persist()
-  |                ^^^^^^^^^
-
 error: Cannot reference operator `null`. Only operators with singleton state can be referenced.
  --> tests/compile-fail/surface_singleton_nostate.rs:7:41
   |

diff --git a/hydroflow/tests/compile-fail/surface_singleton_nostate_undefined.rs b/hydroflow/tests/compile-fail/surface_singleton_nostate_undefined.rs
@@ -2,7 +2,7 @@ pub fn main() {
     let mut df = hydroflow::hydroflow_syntax! {
         my_ref = source_iter(15..=25) -> null();
         source_iter(10..=30)
-            -> persist()
+            -> persist::<'static>()
             -> filter(|value| value <= #my_ref.as_reveal_ref() && value <= #unknown.as_reveal_ref())
             -> null();
     };

diff --git a/hydroflow/tests/compile-fail/surface_singleton_nostate_undefined.stderr b/hydroflow/tests/compile-fail/surface_singleton_nostate_undefined.stderr
@@ -4,12 +4,6 @@ error: Cannot find referenced name `unknown`; name was never assigned.
 6 |             -> filter(|value| value <= #my_ref.as_reveal_ref() && value <= #unknown.as_reveal_ref())
   |                                                                             ^^^^^^^
 
-error: `persist` should have exactly 1 persistence lifetime arguments, actually has 0.
- --> tests/compile-fail/surface_singleton_nostate_undefined.rs:5:16
-  |
-5 |             -> persist()
-  |                ^^^^^^^^^
-
 error: Cannot reference operator `null`. Only operators with singleton state can be referenced.
  --> tests/compile-fail/surface_singleton_nostate_undefined.rs:6:41
   |

diff --git a/hydroflow/tests/compile-fail/surface_singleton_undefined.rs b/hydroflow/tests/compile-fail/surface_singleton_undefined.rs
@@ -1,7 +1,7 @@
 pub fn main() {
     let mut df = hydroflow::hydroflow_syntax! {
         source_iter(10..=30)
-            -> persist()
+            -> persist::<'static>()
             -> filter(|value| value <= #unknown.as_reveal_ref())
         -> null();
     };

diff --git a/hydroflow/tests/compile-fail/surface_singleton_undefined.stderr b/hydroflow/tests/compile-fail/surface_singleton_undefined.stderr
@@ -3,9 +3,3 @@ error: Cannot find referenced name `unknown`; name was never assigned.
   |
 5 |             -> filter(|value| value <= #unknown.as_reveal_ref())
   |                                         ^^^^^^^
-
-error: `persist` should have exactly 1 persistence lifetime arguments, actually has 0.
- --> tests/compile-fail/surface_singleton_undefined.rs:4:16
-  |
-4 |             -> persist()
-  |                ^^^^^^^^^
diff --git a/hydroflow/tests/compile-fail/surface_singleton_undefined_nostate.rs b/hydroflow/tests/compile-fail/surface_singleton_undefined_nostate.rs
@@ -2,7 +2,7 @@ pub fn main() {
     let mut df = hydroflow::hydroflow_syntax! {
         my_ref = source_iter(15..=25) -> null();
         source_iter(10..=30)
-            -> persist()
+            -> persist::<'static>()
             -> filter(|value| value <= #unknown.as_reveal_ref() && value <= #my_ref.as_reveal_ref())
             -> null();
     };

diff --git a/hydroflow/tests/compile-fail/surface_singleton_undefined_nostate.stderr b/hydroflow/tests/compile-fail/surface_singleton_undefined_nostate.stderr
@@ -4,12 +4,6 @@ error: Cannot find referenced name `unknown`; name was never assigned.
 6 |             -> filter(|value| value <= #unknown.as_reveal_ref() && value <= #my_ref.as_reveal_ref())
   |                                         ^^^^^^^
 
-error: `persist` should have exactly 1 persistence lifetime arguments, actually has 0.
- --> tests/compile-fail/surface_singleton_undefined_nostate.rs:5:16
-  |
-5 |             -> persist()
-  |                ^^^^^^^^^
-
 error: Cannot reference operator `null`. Only operators with singleton state can be referenced.
  --> tests/compile-fail/surface_singleton_undefined_nostate.rs:6:78
   |