Update tests/examples to use from_join_first

Author: ecstatic-morse

examples/borrow_check.rs

@@ -51,7 +51,7 @@ fn main() {
             //   region_live_at(R1, Q),
             //   region_live_at(R2, Q).
 
-            subset_1.from_join(&subset_p, &cfg_edge_p, |_p: (Point,), (r1, r2), q| (r1, q, r2));
+            subset_1.from_join_first(&subset_p, &cfg_edge_p, |_p, (r1, r2), q| (r1, q, r2));
             subset_2.from_join(&subset_1, &region_live_at, |(r1, q), r2, ()| {
                 (r2, q, r1)
             });
@@ -102,7 +102,7 @@ fn main() {
             //   (region_live_at(R, Q); universal_region(R)).
 
             requires_1.from_antijoin(&requires_bp, &killed, |(b, p, r)| (p, b, r));
-            requires_2.from_join(&requires_1, &cfg_edge_p, |_p: (Point,), (b, r), q| (r, q, b));
+            requires_2.from_join_first(&requires_1, &cfg_edge_p, |_p, (b, r), q| (r, q, b));
             requires.from_join(&requires_2, &region_live_at, |(r, q), b, ()| (r, b, q));
         }
 

examples/graspan1.rs

@@ -49,7 +49,7 @@ fn main() {
     // .. and then start iterating rules!
     while iteration.changed() {
         // N(a,c) <-  N(a,b), E(b,c)
-        variable1.from_join(&variable1, &variable2, |_b: (u32,), a, c| (c, a));
+        variable1.from_join_first(&variable1, &variable2, |_b, a, c| (c, a));
     }
 
     let reachable = variable1.complete();

src/test.rs

@@ -22,7 +22,7 @@ fn reachable_with_var_join(edges: &[(u32, u32)]) -> Relation<(u32, u32)> {
 
     while iteration.changed() {
         // reachable(N1, N3) :- edges(N1, N2), reachable(N2, N3).
-        reachable.from_join(&reachable, &edges_by_successor, |_: (u32,), n3, n1| (n1, n3));
+        reachable.from_join_first(&reachable, &edges_by_successor, |_, n3, n1| (n1, n3));
     }
 
     reachable.complete()
@@ -41,7 +41,7 @@ fn reachable_with_relation_join(edges: &[(u32, u32)]) -> Relation<(u32, u32)> {
 
     while iteration.changed() {
         // reachable(N1, N3) :- edges(N1, N2), reachable(N2, N3).
-        reachable.from_join(&reachable, &edges_by_successor, |_: (u32,), n3, n1| (n1, n3));
+        reachable.from_join_first(&reachable, &edges_by_successor, |_, n3, n1| (n1, n3));
     }
 
     reachable.complete()
@@ -86,7 +86,7 @@ fn sum_join_via_var(
 
     while iteration.changed() {
         // output(K1, V1 * 100 + V2) :- input1(K1, V1), input2(K1, V2).
-        output.from_join(&input1, &input2, |(k1,), v1, v2| (k1, v1 * 100 + v2));
+        output.from_join_first(&input1, &input2, |k1, v1, v2| (k1, v1 * 100 + v2));
     }
 
     output.complete()
@@ -100,7 +100,7 @@ fn sum_join_via_relation(
 ) -> Relation<(u32, u32)> {
     let input1: Relation<(u32, u32)> = input1_slice.iter().collect();
     let input2: Relation<(u32, u32)> = input2_slice.iter().collect();
-    Relation::from_join(&input1, &input2, |(k1,), v1, v2| (k1, v1 * 100 + v2))
+    Relation::from_join_first(&input1, &input2, |k1, v1, v2| (k1, v1 * 100 + v2))
 }
 
 proptest! {