From 126493b48d855eb21113cf059891f359cb20bc63 Mon Sep 17 00:00:00 2001 From: Rohit Kulshreshtha Date: Fri, 20 Dec 2024 08:26:24 -0800 Subject: [PATCH] chore: Renamed hydroflow to dfir_rs. --- .github/workflows/ci.yml | 2 +- Cargo.lock | 110 ++-- Cargo.toml | 2 +- Dockerfile | 2 +- RELEASING.md | 2 +- benches/Cargo.toml | 2 +- benches/benches/arithmetic.rs | 12 +- benches/benches/fan_in.rs | 10 +- benches/benches/fan_out.rs | 10 +- benches/benches/fork_join.rs | 14 +- benches/benches/identity.rs | 16 +- benches/benches/micro_ops.rs | 2 +- benches/benches/reachability.rs | 28 +- benches/benches/symmetric_hash_join.rs | 2 +- benches/benches/words_diamond.rs | 4 +- datastores/gossip_kv/Cargo.toml | 2 +- datastores/gossip_kv/cli/main.rs | 6 +- datastores/gossip_kv/kv/lattices/mod.rs | 4 +- datastores/gossip_kv/kv/model.rs | 8 +- datastores/gossip_kv/kv/server.rs | 57 +- datastores/gossip_kv/kv/util.rs | 2 +- .../gossip_kv/load_test_server/server.rs | 10 +- datastores/gossip_kv/server/config/mod.rs | 6 +- datastores/gossip_kv/server/main.rs | 18 +- dfir_datalog/src/lib.rs | 6 +- dfir_datalog_core/src/join_plan.rs | 2 +- dfir_datalog_core/src/lib.rs | 10 +- ...egations_and_comments@datalog_program.snap | 8 +- ...gregations_and_comments@surface_graph.snap | 2 +- ...ore__tests__anti_join@datalog_program.snap | 10 +- ..._core__tests__anti_join@surface_graph.snap | 2 +- ...e__tests__collect_vec@datalog_program.snap | 14 +- ...ore__tests__collect_vec@surface_graph.snap | 4 +- ...og_core__tests__index@datalog_program.snap | 14 +- ...alog_core__tests__index@surface_graph.snap | 4 +- ...ests__join_with_other@datalog_program.snap | 10 +- ..._tests__join_with_other@surface_graph.snap | 2 +- ...tests__join_with_self@datalog_program.snap | 10 +- ...__tests__join_with_self@surface_graph.snap | 2 +- ..._core__tests__persist@datalog_program.snap | 18 +- ...og_core__tests__persist@surface_graph.snap | 4 +- ...s__persist_uniqueness@datalog_program.snap | 8 +- ...sts__persist_uniqueness@surface_graph.snap | 2 +- ...single_column_program@datalog_program.snap | 10 +- ...__single_column_program@surface_graph.snap | 2 +- ...s__transitive_closure@datalog_program.snap | 10 +- ...sts__transitive_closure@surface_graph.snap | 2 +- ..._triple_relation_join@datalog_program.snap | 18 +- ...s__triple_relation_join@surface_graph.snap | 4 +- ...ests__wildcard_fields@datalog_program.snap | 10 +- ..._tests__wildcard_fields@surface_graph.snap | 2 +- ...__wildcard_join_count@datalog_program.snap | 24 +- ...ts__wildcard_join_count@surface_graph.snap | 6 +- ...egations_and_comments@datalog_program.snap | 156 +++--- ...tions_fold_keyed_expr@datalog_program.snap | 44 +- ...ore__tests__anti_join@datalog_program.snap | 106 ++-- ...e__tests__collect_vec@datalog_program.snap | 72 +-- ..._core__tests__detuple@datalog_program.snap | 34 +- ...ts__detuple_then_flat@datalog_program.snap | 34 +- ...core__tests__expr_lhs@datalog_program.snap | 82 +-- ...tests__expr_predicate@datalog_program.snap | 118 ++-- ...ts__flat_then_detuple@datalog_program.snap | 34 +- ..._core__tests__flatten@datalog_program.snap | 34 +- ...og_core__tests__index@datalog_program.snap | 420 +++++++-------- ...ests__join_with_other@datalog_program.snap | 58 +- ...tests__join_with_self@datalog_program.snap | 72 +-- ...__local_constraints@datalog_program-2.snap | 34 +- ...ts__local_constraints@datalog_program.snap | 34 +- ...alog_core__tests__max@datalog_program.snap | 44 +- ..._core__tests__max_all@datalog_program.snap | 44 +- ...ests__minimal_program@datalog_program.snap | 34 +- ..._tests__multi_detuple@datalog_program.snap | 34 +- ...multiple_contributors@datalog_program.snap | 44 +- ...s__non_copy_but_clone@datalog_program.snap | 34 +- ..._core__tests__persist@datalog_program.snap | 508 +++++++++--------- ...s__persist_uniqueness@datalog_program.snap | 110 ++-- ...__tests__send_to_node@datalog_program.snap | 60 +-- ..._tests__simple_filter@datalog_program.snap | 34 +- ...single_column_program@datalog_program.snap | 58 +- ...s__transitive_closure@datalog_program.snap | 74 +-- ..._triple_relation_join@datalog_program.snap | 82 +-- ...ests__wildcard_fields@datalog_program.snap | 72 +-- ...__wildcard_join_count@datalog_program.snap | 166 +++--- dfir_lang/build.rs | 6 +- .../src/graph/ops/_lattice_join_fused_join.rs | 8 +- dfir_lang/src/graph/ops/cross_join.rs | 4 +- dfir_lang/src/graph/ops/defer_tick.rs | 6 +- dfir_lang/src/graph/ops/dest_sink.rs | 12 +- dfir_lang/src/graph/ops/dest_sink_serde.rs | 8 +- dfir_lang/src/graph/ops/fold_keyed.rs | 4 +- dfir_lang/src/graph/ops/join.rs | 8 +- dfir_lang/src/graph/ops/lattice_fold.rs | 6 +- dfir_lang/src/graph/ops/lattice_reduce.rs | 4 +- dfir_lang/src/graph/ops/mod.rs | 6 +- dfir_lang/src/graph/ops/multiset_delta.rs | 4 +- dfir_lang/src/graph/ops/persist.rs | 4 +- dfir_lang/src/graph/ops/persist_mut.rs | 2 +- dfir_lang/src/graph/ops/persist_mut_keyed.rs | 2 +- dfir_lang/src/graph/ops/reduce_keyed.rs | 4 +- dfir_lang/src/graph/ops/source_interval.rs | 6 +- dfir_lang/src/graph/ops/source_json.rs | 2 +- dfir_lang/src/graph/ops/source_stream.rs | 4 +- .../src/graph/ops/source_stream_serde.rs | 6 +- dfir_lang/src/graph/ops/spin.rs | 2 +- dfir_lang/src/graph/ops/unique.rs | 4 +- dfir_macro/build.rs | 2 +- dfir_macro/src/lib.rs | 8 +- {hydroflow => dfir_rs}/.gitignore | 0 {hydroflow => dfir_rs}/CHANGELOG.md | 0 {hydroflow => dfir_rs}/Cargo.toml | 4 +- {hydroflow => dfir_rs}/README.md | 0 .../covid_tracing/README.md | 0 .../deprecated_examples/covid_tracing/main.rs | 16 +- .../covid_tracing/people.rs | 0 .../covid_tracing_dist/database.rs | 18 +- .../covid_tracing_dist/main.rs | 4 +- .../covid_tracing_dist/people.rs | 0 .../covid_tracing_dist/tracker.rs | 14 +- {hydroflow => dfir_rs}/example.json | 0 .../example_utils/chat_driver.py | 0 {hydroflow => dfir_rs}/example_utils/web2a | 0 .../examples/chat/README.md | 28 +- .../examples/chat/client.rs | 4 +- {hydroflow => dfir_rs}/examples/chat/main.rs | 8 +- .../examples/chat/protocol.rs | 0 .../chat/randomized_gossiping_server.rs | 4 +- .../examples/chat/server.rs | 6 +- .../examples/deadlock_detector/README.md | 0 .../examples/deadlock_detector/helpers.rs | 0 .../examples/deadlock_detector/main.rs | 6 +- .../examples/deadlock_detector/peer.rs | 6 +- .../examples/deadlock_detector/peers.json | 0 .../examples/deadlock_detector/protocol.rs | 0 .../examples/echo_serde_json/README.md | 0 .../examples/echo_serde_json/client.rs | 4 +- .../examples/echo_serde_json/helpers.rs | 0 .../examples/echo_serde_json/main.rs | 6 +- .../examples/echo_serde_json/protocol.rs | 0 .../examples/echo_serde_json/server.rs | 6 +- .../examples/echoserver/README.md | 0 .../examples/echoserver/client.rs | 4 +- .../examples/echoserver/main.rs | 6 +- .../examples/echoserver/protocol.rs | 0 .../examples/echoserver/server.rs | 6 +- .../examples/example_1_simplest.rs | 2 +- .../examples/example_2_simple_1.rs | 2 +- .../examples/example_2_simple_2.rs | 2 +- .../examples/example_3_stream.rs | 4 +- .../examples/example_4_neighbors.rs | 4 +- .../examples/example_5_reachability.rs | 4 +- .../examples/example_6_unreachability.rs | 4 +- .../examples/example_naturals.rs | 2 +- .../examples/example_surface_flows_1_basic.rs | 2 +- .../example_surface_flows_2_varname.rs | 2 +- .../examples/example_surface_flows_3_ports.rs | 2 +- .../example_surface_flows_4_context.rs | 2 +- .../examples/example_syntax_empty.rs | 2 +- .../examples/example_syntax_hello_world.rs | 2 +- .../examples/example_syntax_input.rs | 4 +- .../examples/example_syntax_output.rs | 6 +- .../examples/hello_world/README.md | 0 .../examples/hello_world/main.rs | 2 +- {hydroflow => dfir_rs}/examples/kvs/README.md | 0 .../examples/kvs}/client.rs | 4 +- .../examples/kvs/helpers.rs | 0 {hydroflow => dfir_rs}/examples/kvs/main.rs | 8 +- .../examples/kvs/protocol.rs | 0 {hydroflow => dfir_rs}/examples/kvs/server.rs | 6 +- .../examples/kvs_bench/README.md | 0 .../examples/kvs_bench/buffer_pool/mod.rs | 0 .../kvs_bench/buffer_pool/serialization.rs | 0 .../examples/kvs_bench/main.rs | 4 +- .../examples/kvs_bench/protocol/mod.rs | 0 .../kvs_request_delete_visitor.rs | 0 .../serialization/kvs_request_get_visitor.rs | 0 .../kvs_request_gossip_visitor.rs | 0 .../serialization/kvs_request_put_visitor.rs | 0 .../serialization/lattices/map_union.rs | 0 .../protocol/serialization/lattices/mod.rs | 0 .../lattices/my_last_write_wins.rs | 0 .../protocol/serialization/lattices/point.rs | 0 .../serialization/lattices/with_bot.rs | 0 .../kvs_bench/protocol/serialization/mod.rs | 0 .../kvs_bench/protocol/test/magic_buffer.rs | 0 .../examples/kvs_bench/protocol/test/mod.rs | 0 .../examples/kvs_bench/protocol/test/util.rs | 0 .../examples/kvs_bench/server.rs | 12 +- .../examples/kvs_mut/README.md | 0 .../examples/kvs_mut}/client.rs | 4 +- .../examples/kvs_mut/helpers.rs | 0 .../examples/kvs_mut/main.rs | 8 +- .../examples/kvs_mut/protocol.rs | 0 .../examples/kvs_mut/server.rs | 6 +- .../examples/kvs_replicated/README.md | 0 .../examples/kvs_replicated/client.rs | 4 +- .../examples/kvs_replicated/helpers.rs | 0 .../examples/kvs_replicated/main.rs | 8 +- .../examples/kvs_replicated/protocol.rs | 0 .../examples/kvs_replicated/server.rs | 6 +- .../examples/lamport_clock/README.md | 0 .../examples/lamport_clock/client.rs | 6 +- .../examples/lamport_clock/main.rs | 6 +- .../examples/lamport_clock/protocol.rs | 2 +- .../examples/lamport_clock/server.rs | 8 +- .../examples/python_udf/main.rs | 2 +- {hydroflow => dfir_rs}/examples/rga/README.md | 0 .../examples/rga/adjacency.rs | 4 +- .../examples/rga/datalog.rs | 4 +- .../examples/rga/datalog_agg.rs | 4 +- {hydroflow => dfir_rs}/examples/rga/main.rs | 12 +- .../examples/rga/minimal.rs | 4 +- .../examples/rga/protocol.rs | 0 .../examples/shopping/README.md | 0 .../examples/shopping/driver.rs | 16 +- .../examples/shopping/flows/bp_flow.rs | 6 +- .../shopping/flows/client_state_flow.rs | 8 +- .../examples/shopping/flows/listener_flow.rs | 6 +- .../examples/shopping/flows/mod.rs | 0 .../examples/shopping/flows/orig_flow.rs | 4 +- .../shopping/flows/push_group_flow.rs | 6 +- .../shopping/flows/rep_server_flow.rs | 10 +- .../shopping/flows/server_state_flow.rs | 8 +- .../examples/shopping/flows/ssiv_flow.rs | 6 +- .../examples/shopping/lattices.rs | 2 +- .../examples/shopping/main.rs | 4 +- .../examples/shopping/misc/replicated2.dot | 0 .../examples/shopping/misc/replicated2.pdf | Bin .../examples/shopping/structs.rs | 0 .../examples/shopping/test_data.rs | 0 .../examples/shopping/wrappers.rs | 0 .../examples/three_clique/README.md | 0 .../examples/three_clique/main.rs | 6 +- .../examples/two_pc_hf/README.md | 0 .../examples/two_pc_hf/coordinator.rs | 16 +- .../examples/two_pc_hf/helpers.rs | 0 .../examples/two_pc_hf/main.rs | 6 +- .../examples/two_pc_hf/members.json | 0 .../examples/two_pc_hf/protocol.rs | 0 .../examples/two_pc_hf/subordinate.rs | 6 +- .../examples/vector_clock/README.md | 0 .../examples/vector_clock/client.rs | 4 +- .../examples/vector_clock/main.rs | 6 +- .../examples/vector_clock/protocol.rs | 0 .../examples/vector_clock/server.rs | 6 +- {hydroflow => dfir_rs}/src/compiled/mod.rs | 0 .../src/compiled/pull/anti_join.rs | 0 .../src/compiled/pull/cross_join.rs | 0 .../src/compiled/pull/half_join_state/fold.rs | 0 .../pull/half_join_state/fold_from.rs | 0 .../src/compiled/pull/half_join_state/mod.rs | 0 .../compiled/pull/half_join_state/multiset.rs | 0 .../compiled/pull/half_join_state/reduce.rs | 0 .../src/compiled/pull/half_join_state/set.rs | 0 .../src/compiled/pull/mod.rs | 0 .../src/compiled/pull/symmetric_hash_join.rs | 0 .../src/declarative_macro.rs | 0 {hydroflow => dfir_rs}/src/lib.rs | 2 +- .../src/scheduled/context.rs | 0 {hydroflow => dfir_rs}/src/scheduled/graph.rs | 4 +- .../src/scheduled/graph_ext.rs | 0 .../src/scheduled/handoff/handoff_list.rs | 0 .../src/scheduled/handoff/mod.rs | 0 .../src/scheduled/handoff/tee.rs | 0 .../src/scheduled/handoff/vector.rs | 0 {hydroflow => dfir_rs}/src/scheduled/input.rs | 0 {hydroflow => dfir_rs}/src/scheduled/mod.rs | 0 .../src/scheduled/net/mod.rs | 0 .../src/scheduled/net/network_vertex.rs | 0 {hydroflow => dfir_rs}/src/scheduled/port.rs | 0 {hydroflow => dfir_rs}/src/scheduled/query.rs | 0 .../src/scheduled/reactor.rs | 0 {hydroflow => dfir_rs}/src/scheduled/state.rs | 0 .../src/scheduled/subgraph.rs | 0 {hydroflow => dfir_rs}/src/scheduled/ticks.rs | 10 +- {hydroflow => dfir_rs}/src/util/clear.rs | 0 {hydroflow => dfir_rs}/src/util/demux_enum.rs | 2 +- {hydroflow => dfir_rs}/src/util/deploy.rs | 0 {hydroflow => dfir_rs}/src/util/mod.rs | 4 +- {hydroflow => dfir_rs}/src/util/monotonic.rs | 0 .../src/util/monotonic_map.rs | 0 {hydroflow => dfir_rs}/src/util/multiset.rs | 0 {hydroflow => dfir_rs}/src/util/simulation.rs | 0 {hydroflow => dfir_rs}/src/util/socket.rs | 0 {hydroflow => dfir_rs}/src/util/sparse_vec.rs | 0 {hydroflow => dfir_rs}/src/util/tcp.rs | 0 {hydroflow => dfir_rs}/src/util/udp.rs | 0 {hydroflow => dfir_rs}/src/util/unsync/mod.rs | 0 .../src/util/unsync/mpsc.rs | 0 .../tests/compile-fail/datalog_badparse.rs | 2 +- .../compile-fail/datalog_badparse.stderr | 0 .../compile-fail/datalog_filter_badtypes.rs | 2 +- .../datalog_filter_badtypes.stderr | 0 .../compile-fail/datalog_join_badtypes.rs | 2 +- .../compile-fail/datalog_join_badtypes.stderr | 0 .../surface_anti_join_badtypes.rs | 2 +- .../surface_anti_join_badtypes.stderr | 0 .../compile-fail/surface_badgeneric_both.rs | 2 +- .../surface_badgeneric_both.stderr | 0 .../compile-fail/surface_badgeneric_extra.rs | 2 +- .../surface_badgeneric_extra.stderr | 0 .../surface_badgeneric_lifetime.rs | 2 +- .../surface_badgeneric_lifetime.stderr | 0 .../surface_badgeneric_nocolon.rs | 2 +- .../surface_badgeneric_nocolon.stderr | 0 .../compile-fail/surface_badgeneric_type.rs | 2 +- .../surface_badgeneric_type.stderr | 0 .../compile-fail/surface_conflicting_name.rs | 2 +- .../surface_conflicting_name.stderr | 0 .../compile-fail/surface_degenerate_merge.rs | 2 +- .../surface_degenerate_merge.stderr | 0 .../compile-fail/surface_degenerate_null.rs | 2 +- .../surface_degenerate_null.stderr | 0 .../compile-fail/surface_degenerate_tee.rs | 2 +- .../surface_degenerate_tee.stderr | 0 .../compile-fail/surface_demux_badarg.rs | 2 +- .../compile-fail/surface_demux_badarg.stderr | 0 .../compile-fail/surface_demux_badclosure.rs | 2 +- .../surface_demux_badclosure.stderr | 6 +- .../surface_demux_port_duplicate.rs | 2 +- .../surface_demux_port_duplicate.stderr | 6 +- .../compile-fail/surface_demux_port_elided.rs | 2 +- .../surface_demux_port_elided.stderr | 6 +- .../compile-fail/surface_demux_port_extra.rs | 2 +- .../surface_demux_port_extra.stderr | 6 +- .../surface_demux_port_extramissing.rs | 2 +- .../surface_demux_port_extramissing.stderr | 6 +- .../surface_demux_port_missing.rs | 2 +- .../surface_demux_port_missing.stderr | 6 +- .../surface_demuxenum_missingtypeparam.rs | 4 +- .../surface_demuxenum_missingtypeparam.stderr | 0 .../compile-fail/surface_demuxenum_notenum.rs | 2 +- .../surface_demuxenum_notenum.stderr | 2 +- .../surface_demuxenum_port_duplicate.rs | 4 +- .../surface_demuxenum_port_duplicate.stderr | 0 .../surface_demuxenum_port_duplicate_one.rs | 4 +- ...urface_demuxenum_port_duplicate_one.stderr | 0 .../surface_demuxenum_port_elided.rs | 4 +- .../surface_demuxenum_port_elided.stderr | 0 .../surface_demuxenum_port_extra.rs | 4 +- .../surface_demuxenum_port_extra.stderr | 0 .../surface_demuxenum_port_extra_zero.rs | 4 +- .../surface_demuxenum_port_extra_zero.stderr | 0 .../surface_demuxenum_port_extramissing.rs | 4 +- ...surface_demuxenum_port_extramissing.stderr | 0 .../surface_demuxenum_port_missing.rs | 4 +- .../surface_demuxenum_port_missing.stderr | 0 .../surface_demuxenum_port_missing_one.rs | 4 +- .../surface_demuxenum_port_missing_one.stderr | 0 .../surface_demuxenum_port_wrong_one.rs | 4 +- .../surface_demuxenum_port_wrong_one.stderr | 0 .../surface_demuxenum_wrongenum.rs | 4 +- .../surface_demuxenum_wrongenum.stderr | 2 +- .../surface_demuxenum_wrongfields_1.rs | 4 +- .../surface_demuxenum_wrongfields_1.stderr | 0 .../surface_demuxenum_wrongfields_2.rs | 4 +- .../surface_demuxenum_wrongfields_2.stderr | 0 .../surface_demuxenum_wrongtype.rs | 4 +- .../surface_demuxenum_wrongtype.stderr | 0 .../surface_dest_sink_baditem.ci.stderr | 0 .../surface_dest_sink_baditem.rs.ignore | 6 +- .../surface_dest_sink_baditem.stderr | 0 .../surface_dest_sink_badsink.rs.ignore | 2 +- .../surface_dest_sink_badsink.stderr | 28 + .../surface_fold_keyed_badtype_int.rs | 2 +- .../surface_fold_keyed_badtype_int.stderr | 0 .../surface_fold_keyed_badtype_option.rs | 2 +- .../surface_fold_keyed_badtype_option.stderr | 0 .../surface_fold_keyed_generics_bad.ci.stderr | 4 +- .../surface_fold_keyed_generics_bad.rs.ignore | 2 +- .../surface_fold_keyed_generics_bad.stderr | 4 +- .../surface_fold_keyed_generics_extra.rs | 4 +- .../surface_fold_keyed_generics_extra.stderr | 6 +- .../surface_forwardref_chain_double.rs | 2 +- .../surface_forwardref_chain_double.stderr | 0 .../surface_forwardref_chain_single.rs | 2 +- .../surface_forwardref_chain_single.stderr | 0 .../compile-fail/surface_forwardref_self1.rs | 2 +- .../surface_forwardref_self1.stderr | 0 .../compile-fail/surface_forwardref_self2.rs | 2 +- .../surface_forwardref_self2.stderr | 0 .../surface_forwardref_self2_indirect.rs | 2 +- .../surface_forwardref_self2_indirect.stderr | 0 .../compile-fail/surface_forwardref_self3.rs | 2 +- .../surface_forwardref_self3.stderr | 0 .../surface_identity_wronggeneric.rs | 2 +- .../surface_identity_wronggeneric.stderr | 0 .../compile-fail/surface_join_badtypes.rs | 2 +- .../compile-fail/surface_join_badtypes.stderr | 0 .../surface_join_generics_extra.rs | 2 +- .../surface_join_generics_extra.stderr | 0 .../surface_join_persistence_bad.rs | 2 +- .../surface_join_persistence_bad.stderr | 0 .../surface_join_persistence_extra.rs | 2 +- .../surface_join_persistence_extra.stderr | 0 .../surface_lattice_fold_badgeneric.rs.ignore | 2 +- .../surface_lattice_fold_badgeneric.stderr | 0 .../surface_lattice_fold_noarg.rs | 4 +- .../surface_lattice_fold_noarg.stderr | 8 +- .../surface_lattice_fold_wronggeneric.rs | 10 + .../surface_lattice_fold_wronggeneric.stderr | 4 +- ...urface_lattice_reduce_badgeneric.rs.ignore | 2 +- .../surface_lattice_reduce_badgeneric.stderr | 0 .../surface_lattice_reduce_wronggeneric.rs | 4 +- ...surface_lattice_reduce_wronggeneric.stderr | 4 +- .../surface_latticereduce_wronggeneric.stderr | 4 +- .../tests/compile-fail/surface_loop_cycle.rs | 2 +- .../compile-fail/surface_loop_cycle.stderr | 0 .../surface_loop_missing_unwindowing.rs | 2 +- .../surface_loop_missing_unwindowing.stderr | 0 .../surface_loop_missing_windowing.rs | 2 +- .../surface_loop_missing_windowing.stderr | 0 .../surface_loop_multiple_window.rs | 2 +- .../surface_loop_multiple_window.stderr | 0 .../tests/compile-fail/surface_loop_source.rs | 2 +- .../compile-fail/surface_loop_source.stderr | 0 .../compile-fail/surface_map_badtypes.rs | 2 +- .../compile-fail/surface_map_badtypes.stderr | 0 .../compile-fail/surface_merge_badtypes.rs | 2 +- .../surface_merge_badtypes.stderr | 0 .../compile-fail/surface_missing_args.rs | 2 +- .../compile-fail/surface_missing_args.stderr | 0 .../compile-fail/surface_negative_loop.rs | 2 +- .../compile-fail/surface_negative_loop.stderr | 0 .../tests/compile-fail/surface_null.rs | 2 +- .../tests/compile-fail/surface_null.stderr | 0 .../compile-fail/surface_partition_badarg.rs | 2 +- .../surface_partition_badarg.stderr | 0 .../surface_partition_badclosure.rs | 2 +- .../surface_partition_badclosure.stderr | 0 .../surface_partition_port_duplicate.rs | 2 +- .../surface_partition_port_duplicate.stderr | 0 .../surface_partition_port_elided.rs | 2 +- .../surface_partition_port_elided.stderr | 0 .../surface_partition_port_extra.rs | 2 +- .../surface_partition_port_extra.stderr | 0 .../surface_partition_port_extramissing.rs | 2 +- ...surface_partition_port_extramissing.stderr | 0 .../surface_partition_port_inconsistent.rs | 2 +- ...surface_partition_port_inconsistent.stderr | 0 .../surface_partition_port_indexgap.rs | 2 +- .../surface_partition_port_indexgap.stderr | 0 .../surface_partition_port_missing.rs | 2 +- .../surface_partition_port_missing.stderr | 0 .../compile-fail/surface_port_conflict.rs | 2 +- .../compile-fail/surface_port_conflict.stderr | 0 .../tests/compile-fail/surface_port_join.rs | 2 +- .../compile-fail/surface_port_join.stderr | 0 .../surface_port_join_forwardref.rs | 2 +- .../surface_port_join_forwardref.stderr | 0 .../surface_port_naked_overwrite_knot_a.rs | 2 +- ...surface_port_naked_overwrite_knot_a.stderr | 0 ..._port_naked_overwrite_knot_a_forwardref.rs | 2 +- ...t_naked_overwrite_knot_a_forwardref.stderr | 0 ...surface_port_naked_overwrite_knot_b_inn.rs | 2 +- ...ace_port_naked_overwrite_knot_b_inn.stderr | 0 ...surface_port_naked_overwrite_knot_b_out.rs | 2 +- ...ace_port_naked_overwrite_knot_b_out.stderr | 0 .../surface_port_naked_overwrite_simple.rs | 2 +- ...surface_port_naked_overwrite_simple.stderr | 0 .../compile-fail/surface_port_unused_both.rs | 2 +- .../surface_port_unused_both.stderr | 0 .../surface_port_unused_both_indirect.rs | 2 +- .../surface_port_unused_both_indirect.stderr | 0 .../surface_port_unused_both_parens.rs | 2 +- .../surface_port_unused_both_parens.stderr | 0 .../compile-fail/surface_port_unused_in.rs | 2 +- .../surface_port_unused_in.stderr | 0 .../compile-fail/surface_port_unused_out.rs | 2 +- .../surface_port_unused_out.stderr | 0 .../surface_reduce_keyed_badtype_int.rs | 2 +- .../surface_reduce_keyed_badtype_int.stderr | 0 .../surface_reduce_keyed_badtype_option.rs | 2 +- ...surface_reduce_keyed_badtype_option.stderr | 0 .../compile-fail/surface_singleton_badexpr.rs | 2 +- .../surface_singleton_badexpr.stderr | 0 .../compile-fail/surface_singleton_nostate.rs | 2 +- .../surface_singleton_nostate.stderr | 0 .../surface_singleton_nostate_undefined.rs | 2 +- ...surface_singleton_nostate_undefined.stderr | 0 .../surface_singleton_undefined.rs | 2 +- .../surface_singleton_undefined.stderr | 0 .../surface_singleton_undefined_nostate.rs | 2 +- ...surface_singleton_undefined_nostate.stderr | 0 .../surface_source_interval_badarg.rs | 4 +- .../surface_source_interval_badarg.stderr | 0 .../surface_source_iter_badtype.rs.ignore | 2 +- .../surface_source_iter_badtype.stderr | 0 .../compile-fail/surface_syntax_eol_arrow.rs | 2 +- .../surface_syntax_eol_arrow.stderr | 0 .../surface_syntax_eol_indexing.rs | 2 +- .../surface_syntax_eol_indexing.stderr | 0 .../surface_syntax_eol_missingop.rs | 2 +- .../surface_syntax_eol_missingop.stderr | 0 .../compile-fail/surface_syntax_eol_op.rs | 2 +- .../compile-fail/surface_syntax_eol_op.stderr | 0 .../surface_syntax_indexing_empty.rs | 2 +- .../surface_syntax_indexing_empty.stderr | 0 .../surface_syntax_noarrow_indexing.rs | 2 +- .../surface_syntax_noarrow_indexing.stderr | 0 .../compile-fail/surface_syntax_noarrow_op.rs | 2 +- .../surface_syntax_noarrow_op.stderr | 0 .../surface_syntax_noarrow_paren.rs | 2 +- .../surface_syntax_noarrow_paren.stderr | 0 .../compile-fail/surface_syntax_paren.rs | 2 +- .../compile-fail/surface_syntax_paren.stderr | 0 .../surface_syntax_paren_arrow.rs | 2 +- .../surface_syntax_paren_arrow.stderr | 0 .../surface_syntax_paren_indexing.rs | 2 +- .../surface_syntax_paren_indexing.stderr | 0 .../surface_syntax_paren_missingop.rs | 2 +- .../surface_syntax_paren_missingop.stderr | 0 .../surface_syntax_paren_noarrow_op.rs | 2 +- .../surface_syntax_paren_noarrow_op.stderr | 0 .../surface_syntax_paren_noarrow_paren.rs | 2 +- .../surface_syntax_paren_noarrow_paren.stderr | 0 .../surface_syntax_paren_semicolon.rs | 2 +- .../surface_syntax_paren_semicolon.stderr | 0 .../compile-fail/surface_unknown_operators.rs | 2 +- .../surface_unknown_operators.stderr | 0 .../tests/compile-fail/surface_use_bad1.rs | 2 +- .../compile-fail/surface_use_bad1.stderr | 0 .../tests/compile-fail/surface_use_bad2.rs | 2 +- .../compile-fail/surface_use_bad2.stderr | 0 .../tests/compile-fail/surface_use_bad3.rs | 2 +- .../compile-fail/surface_use_bad3.stderr | 0 .../tests/compile-fail/surface_use_unknown.rs | 2 +- .../compile-fail/surface_use_unknown.stderr | 0 .../compile-fail/surface_varname_undefined.rs | 2 +- .../surface_varname_undefined.stderr | 0 .../tests/datalog_compile_fail.rs | 0 .../tests/datalog_frontend.rs | 242 ++++----- .../tests/datalog_minimal.rs | 8 +- {hydroflow => dfir_rs}/tests/groupby.rs | 10 +- .../tests/scheduled_teeing_handoff.rs | 6 +- .../tests/scheduled_test.rs | 24 +- .../surface_async__echo@graphvis_dot.snap | 0 .../surface_async__echo@graphvis_mermaid.snap | 0 .../surface_batch__basic_2@graphvis_dot.snap | 0 ...rface_batch__basic_2@graphvis_mermaid.snap | 0 ...ce_book__surface_flows_1@graphvis_dot.snap | 0 ...ook__surface_flows_1@graphvis_mermaid.snap | 0 ...surface_codegen__basic_2@graphvis_dot.snap | 0 ...ace_codegen__basic_2@graphvis_mermaid.snap | 0 ...surface_codegen__basic_3@graphvis_dot.snap | 0 ...ace_codegen__basic_3@graphvis_mermaid.snap | 0 ...ace_codegen__basic_union@graphvis_dot.snap | 0 ...codegen__basic_union@graphvis_mermaid.snap | 0 ...e_codegen__covid_tracing@graphvis_dot.snap | 0 ...degen__covid_tracing@graphvis_mermaid.snap | 0 ...rface_codegen__recv_expr@graphvis_dot.snap | 0 ...e_codegen__recv_expr@graphvis_mermaid.snap | 0 .../surface_codegen__sort@graphvis_dot.snap | 0 ...urface_codegen__sort@graphvis_mermaid.snap | 0 ...ace_codegen__sort_by_key@graphvis_dot.snap | 0 ...codegen__sort_by_key@graphvis_mermaid.snap | 0 ...x_reachability_generated@graphvis_dot.snap | 0 ...achability_generated@graphvis_mermaid.snap | 0 ...egen__transitive_closure@graphvis_dot.snap | 0 ...__transitive_closure@graphvis_mermaid.snap | 0 ...ntext_current_tick_start@graphvis_dot.snap | 4 +- ...t_current_tick_start@graphvis_mermaid.snap | 4 +- ...time_between_ticks_async@graphvis_dot.snap | 0 ..._between_ticks_async@graphvis_mermaid.snap | 0 ...ace_context__context_mut@graphvis_dot.snap | 0 ...context__context_mut@graphvis_mermaid.snap | 0 ...ace_context__context_ref@graphvis_dot.snap | 0 ...context__context_ref@graphvis_mermaid.snap | 0 ...e_cross_singleton__basic@graphvis_dot.snap | 0 ...oss_singleton__basic@graphvis_mermaid.snap | 0 ...gleton__union_defer_tick@graphvis_dot.snap | 0 ...on__union_defer_tick@graphvis_mermaid.snap | 0 ...ce__diff_multiset_static@graphvis_dot.snap | 0 ...diff_multiset_static@graphvis_mermaid.snap | 0 ...iff_multiset_static_tick@graphvis_dot.snap | 0 ...multiset_static_tick@graphvis_mermaid.snap | 0 ...iff_multiset_tick_static@graphvis_dot.snap | 0 ...multiset_tick_static@graphvis_mermaid.snap | 0 ...ce__diff_multiset_timing@graphvis_dot.snap | 0 ...diff_multiset_timing@graphvis_mermaid.snap | 0 ..._difference__diff_static@graphvis_dot.snap | 0 ...ference__diff_static@graphvis_mermaid.snap | 0 ..._difference__diff_timing@graphvis_dot.snap | 0 ...ference__diff_timing@graphvis_mermaid.snap | 0 .../surface_examples__example_1_simplest.snap | 0 .../surface_examples__example_2_simple_1.snap | 0 .../surface_examples__example_2_simple_2.snap | 0 .../surface_examples__example_3_stream.snap | 0 ...surface_examples__example_4_neighbors.snap | 0 ...face_examples__example_5_reachability.snap | 0 ...ce_examples__example_6_unreachability.snap | 0 .../surface_examples__example_naturals.snap | 0 ...amples__example_surface_flows_1_basic.snap | 0 ...ples__example_surface_flows_2_varname.snap | 0 ...amples__example_surface_flows_3_ports.snap | 0 ...ples__example_surface_flows_4_context.snap | 0 ...urface_examples__example_syntax_empty.snap | 0 ..._examples__example_syntax_hello_world.snap | 0 ...urface_examples__example_syntax_input.snap | 0 ...rface_examples__example_syntax_output.snap | 0 ...urface_flow_props__basic@graphvis_dot.snap | 0 ...ce_flow_props__basic@graphvis_mermaid.snap | 0 ...low_props__union_warning@graphvis_dot.snap | 0 ...props__union_warning@graphvis_mermaid.snap | 0 .../surface_fold__fold_sort@graphvis_dot.snap | 0 ...face_fold__fold_sort@graphvis_mermaid.snap | 0 ...urface_fold__fold_static@graphvis_dot.snap | 0 ...ce_fold__fold_static@graphvis_mermaid.snap | 0 ...e_fold__fold_static_join@graphvis_dot.snap | 0 ...ld__fold_static_join@graphvis_mermaid.snap | 0 .../surface_fold__fold_tick@graphvis_dot.snap | 0 ...face_fold__fold_tick@graphvis_mermaid.snap | 0 ...__fold_keyed_infer_basic@graphvis_dot.snap | 0 ...ld_keyed_infer_basic@graphvis_mermaid.snap | 0 ...keyed__fold_keyed_static@graphvis_dot.snap | 0 ...d__fold_keyed_static@graphvis_mermaid.snap | 0 ...d_keyed__fold_keyed_tick@graphvis_dot.snap | 0 ...yed__fold_keyed_tick@graphvis_mermaid.snap | 0 ...orwardref_basic_backward@graphvis_dot.snap | 0 ...rdref_basic_backward@graphvis_mermaid.snap | 0 ...forwardref_basic_forward@graphvis_dot.snap | 0 ...ardref_basic_forward@graphvis_mermaid.snap | 0 ..._forwardref_basic_middle@graphvis_dot.snap | 0 ...wardref_basic_middle@graphvis_mermaid.snap | 0 ...face_join__static_static@graphvis_dot.snap | 0 ..._join__static_static@graphvis_mermaid.snap | 0 ...urface_join__static_tick@graphvis_dot.snap | 0 ...ce_join__static_tick@graphvis_mermaid.snap | 0 ...urface_join__tick_static@graphvis_dot.snap | 0 ...ce_join__tick_static@graphvis_mermaid.snap | 0 .../surface_join__tick_tick@graphvis_dot.snap | 0 ...face_join__tick_tick@graphvis_mermaid.snap | 0 ...s_blocking_rhs_streaming@graphvis_dot.snap | 0 ...ocking_rhs_streaming@graphvis_mermaid.snap | 0 ...s_streaming_rhs_blocking@graphvis_dot.snap | 0 ...reaming_rhs_blocking@graphvis_mermaid.snap | 0 ...s_blocking_rhs_streaming@graphvis_dot.snap | 0 ...ocking_rhs_streaming@graphvis_mermaid.snap | 0 ...s_streaming_rhs_blocking@graphvis_dot.snap | 0 ...reaming_rhs_blocking@graphvis_mermaid.snap | 0 ...s_blocking_rhs_streaming@graphvis_dot.snap | 0 ...ocking_rhs_streaming@graphvis_mermaid.snap | 0 ...tick_lhs_fold_rhs_reduce@graphvis_dot.snap | 0 ..._lhs_fold_rhs_reduce@graphvis_mermaid.snap | 0 ...s_streaming_rhs_blocking@graphvis_dot.snap | 0 ...reaming_rhs_blocking@graphvis_mermaid.snap | 0 ...phism__cartesian_product@graphvis_dot.snap | 0 ...m__cartesian_product@graphvis_mermaid.snap | 0 ...__cartesian_product_1401@graphvis_dot.snap | 0 ...rtesian_product_1401@graphvis_mermaid.snap | 0 ...esian_product_tick_state@graphvis_dot.snap | 0 ...n_product_tick_state@graphvis_mermaid.snap | 0 ...lattice_bimorphism__join@graphvis_dot.snap | 0 ...ice_bimorphism__join@graphvis_mermaid.snap | 0 ...esian_product_multi_tick@graphvis_dot.snap | 0 ...n_product_multi_tick@graphvis_mermaid.snap | 0 ...duct_multi_tick_identity@graphvis_dot.snap | 0 ..._multi_tick_identity@graphvis_mermaid.snap | 0 ...n_product_multi_tick_tee@graphvis_dot.snap | 0 ...oduct_multi_tick_tee@graphvis_mermaid.snap | 0 ...surface_loop__flo_nested@graphvis_dot.snap | 0 ...ace_loop__flo_nested@graphvis_mermaid.snap | 0 ...surface_loop__flo_syntax@graphvis_dot.snap | 0 ...ace_loop__flo_syntax@graphvis_mermaid.snap | 0 ...et_delta__multiset_delta@graphvis_dot.snap | 0 ...elta__multiset_delta@graphvis_mermaid.snap | 0 ...surface_persist__persist@graphvis_dot.snap | 0 ...ace_persist__persist@graphvis_mermaid.snap | 0 ...e_persist__persist_basic@graphvis_dot.snap | 0 ...rsist__persist_basic@graphvis_mermaid.snap | 0 ...ace_persist__persist_mut@graphvis_dot.snap | 0 ...persist__persist_mut@graphvis_mermaid.snap | 0 ...rsist__persist_mut_keyed@graphvis_dot.snap | 0 ...t__persist_mut_keyed@graphvis_mermaid.snap | 0 ...ce_persist__persist_pull@graphvis_dot.snap | 0 ...ersist__persist_pull@graphvis_mermaid.snap | 0 ...ce_persist__persist_push@graphvis_dot.snap | 0 ...ersist__persist_push@graphvis_mermaid.snap | 0 ...ist__persist_replay_join@graphvis_dot.snap | 0 ..._persist_replay_join@graphvis_mermaid.snap | 0 ...ace_python__python_basic@graphvis_dot.snap | 0 ...python__python_basic@graphvis_mermaid.snap | 0 ...on__python_too_many_args@graphvis_dot.snap | 0 ...python_too_many_args@graphvis_mermaid.snap | 0 ..._python__python_two_args@graphvis_dot.snap | 0 ...hon__python_two_args@graphvis_mermaid.snap | 0 .../surface_reduce__reduce@graphvis_dot.snap | 0 ...rface_reduce__reduce@graphvis_mermaid.snap | 0 ...ce_reduce__reduce_static@graphvis_dot.snap | 0 ...educe__reduce_static@graphvis_mermaid.snap | 0 ...rface_reduce__reduce_sum@graphvis_dot.snap | 0 ...e_reduce__reduce_sum@graphvis_mermaid.snap | 0 ...face_reduce__reduce_tick@graphvis_dot.snap | 0 ..._reduce__reduce_tick@graphvis_mermaid.snap | 0 ...ssue_800_1050_fold_keyed@graphvis_dot.snap | 0 ..._800_1050_fold_keyed@graphvis_mermaid.snap | 0 ...__issue_800_1050_persist@graphvis_dot.snap | 0 ...sue_800_1050_persist@graphvis_mermaid.snap | 0 ...ue_800_1050_reduce_keyed@graphvis_dot.snap | 0 ...00_1050_reduce_keyed@graphvis_mermaid.snap | 0 ...duling__nospin_issue_961@graphvis_dot.snap | 0 ...ng__nospin_issue_961@graphvis_mermaid.snap | 0 ...in_issue_961_complicated@graphvis_dot.snap | 0 ...ssue_961_complicated@graphvis_mermaid.snap | 0 ...ersist_stratum_run_async@graphvis_dot.snap | 0 ...st_stratum_run_async@graphvis_mermaid.snap | 0 ...st_stratum_run_available@graphvis_dot.snap | 0 ...tratum_run_available@graphvis_mermaid.snap | 0 ...scheduling__stratum_loop@graphvis_dot.snap | 0 ...duling__stratum_loop@graphvis_mermaid.snap | 0 ...ce_scheduling__tick_loop@graphvis_dot.snap | 0 ...cheduling__tick_loop@graphvis_mermaid.snap | 0 ...ce_singleton__fold_cross@graphvis_dot.snap | 0 ...ingleton__fold_cross@graphvis_mermaid.snap | 0 ...ingleton__fold_singleton@graphvis_dot.snap | 0 ...eton__fold_singleton@graphvis_mermaid.snap | 0 ...ton__fold_singleton_push@graphvis_dot.snap | 0 ..._fold_singleton_push@graphvis_mermaid.snap | 0 ...ce_singleton__multi_tick@graphvis_dot.snap | 0 ...ingleton__multi_tick@graphvis_mermaid.snap | 0 ...gleton__reduce_singleton@graphvis_dot.snap | 0 ...on__reduce_singleton@graphvis_mermaid.snap | 0 ...n__reduce_singleton_push@graphvis_dot.snap | 0 ...educe_singleton_push@graphvis_mermaid.snap | 0 ...surface_singleton__state@graphvis_dot.snap | 0 ...ace_singleton__state@graphvis_mermaid.snap | 0 ..._singleton__state_unused@graphvis_dot.snap | 0 ...gleton__state_unused@graphvis_mermaid.snap | 0 ...face_stratum__defer_lazy@graphvis_dot.snap | 0 ..._stratum__defer_lazy@graphvis_mermaid.snap | 0 ...ce_stratum__difference_a@graphvis_dot.snap | 0 ...tratum__difference_a@graphvis_mermaid.snap | 0 ...ce_stratum__difference_b@graphvis_dot.snap | 0 ...tratum__difference_b@graphvis_mermaid.snap | 0 ...ph_stratum_consolidation@graphvis_dot.snap | 0 ...tratum_consolidation@graphvis_mermaid.snap | 0 ...tax_graph_unreachability@graphvis_dot.snap | 0 ...graph_unreachability@graphvis_mermaid.snap | 0 ...ace_stratum__tick_loop_1@graphvis_dot.snap | 0 ...stratum__tick_loop_1@graphvis_mermaid.snap | 0 ...ace_stratum__tick_loop_2@graphvis_dot.snap | 0 ...stratum__tick_loop_2@graphvis_mermaid.snap | 0 ...ace_stratum__tick_loop_3@graphvis_dot.snap | 0 ...stratum__tick_loop_3@graphvis_mermaid.snap | 0 .../surface_unique__unique@graphvis_dot.snap | 0 ...rface_unique__unique@graphvis_mermaid.snap | 0 ...ique__unique_static_pull@graphvis_dot.snap | 0 ...__unique_static_pull@graphvis_mermaid.snap | 0 ...ique__unique_static_push@graphvis_dot.snap | 0 ...__unique_static_push@graphvis_mermaid.snap | 0 ...unique__unique_tick_pull@graphvis_dot.snap | 0 ...ue__unique_tick_pull@graphvis_mermaid.snap | 0 ...unique__unique_tick_push@graphvis_dot.snap | 0 ...ue__unique_tick_push@graphvis_mermaid.snap | 0 {hydroflow => dfir_rs}/tests/surface_async.rs | 84 ++- {hydroflow => dfir_rs}/tests/surface_batch.rs | 8 +- {hydroflow => dfir_rs}/tests/surface_book.rs | 8 +- .../tests/surface_codegen.rs | 106 ++-- .../tests/surface_compile_fail.rs | 0 .../tests/surface_context.rs | 4 +- .../tests/surface_cross_singleton.rs | 12 +- .../tests/surface_demux_enum.rs | 6 +- .../tests/surface_demux_partition.rs | 6 +- .../tests/surface_difference.rs | 48 +- .../tests/surface_examples.rs | 2 +- {hydroflow => dfir_rs}/tests/surface_fold.rs | 34 +- .../tests/surface_fold_keyed.rs | 31 +- .../tests/surface_forwardref.rs | 10 +- {hydroflow => dfir_rs}/tests/surface_join.rs | 4 +- .../tests/surface_join_fused.rs | 6 +- .../tests/surface_lattice_batch.rs | 2 +- .../tests/surface_lattice_bimorphism.rs | 16 +- ...ce_lattice_bimorphism_persist_insertion.rs | 24 +- .../tests/surface_lattice_fold.rs | 10 +- .../surface_lattice_generalized_hash_trie.rs | 14 +- .../tests/surface_lattice_join.rs | 18 +- .../tests/surface_lattice_reduce.rs | 4 +- {hydroflow => dfir_rs}/tests/surface_loop.rs | 4 +- .../tests/surface_multiset_delta.rs | 28 +- .../tests/surface_parser.rs | 2 +- .../tests/surface_persist.rs | 64 +-- .../tests/surface_python.rs | 2 +- .../tests/surface_reduce.rs | 28 +- .../tests/surface_scheduling.rs | 28 +- .../tests/surface_singleton.rs | 65 +-- .../tests/surface_state_scheduling.rs | 24 +- .../tests/surface_stratum.rs | 10 +- .../tests/surface_unique.rs | 14 +- .../tests/surface_warnings.rs | 10 +- .../tests/surface_zip_unzip.rs | 16 +- {hydroflow => dfir_rs}/wasm.md | 0 docs/docs/deploy/your-first-deploy.md | 12 +- docs/docs/hydroflow/architecture/index.mdx | 4 +- .../hydroflow/quickstart/example_3_stream.mdx | 4 +- docs/docs/hydroflow/syntax/surface_data.mdx | 2 +- docs/src/pages/playground.js | 2 +- docs/src/pages/research.js | 2 +- hydro_deploy/hydro_cli_examples/Cargo.toml | 2 +- .../examples/dedalus_2pc_coordinator/main.rs | 8 +- .../examples/dedalus_2pc_participant/main.rs | 8 +- .../examples/dedalus_receiver/main.rs | 10 +- .../examples/dedalus_sender/main.rs | 12 +- .../examples/dedalus_vote_leader/main.rs | 8 +- .../examples/dedalus_vote_participant/main.rs | 8 +- .../examples/empty_program/main.rs | 4 +- .../examples/panic_program/main.rs | 4 +- .../examples/stdout_receiver/main.rs | 10 +- .../examples/tagged_stdout_receiver/main.rs | 10 +- .../examples/ws_chat_server/main.rs | 18 +- .../examples/ws_chat_server/util.rs | 8 +- hydro_lang/Cargo.toml | 2 +- hydro_lang/src/builder/compiled.rs | 10 +- hydro_lang/src/builder/deploy.rs | 4 +- hydro_lang/src/deploy/deploy_graph.rs | 6 +- hydro_lang/src/deploy/macro_runtime.rs | 6 +- hydro_lang/src/deploy/mod.rs | 4 +- hydro_lang/src/deploy/trybuild.rs | 8 +- hydro_lang/src/deploy_runtime.rs | 2 +- hydro_lang/src/lib.rs | 2 +- hydro_lang/src/location/external_process.rs | 2 +- hydro_lang/src/location/mod.rs | 4 +- hydro_lang/src/rewrites/profiler.rs | 2 +- hydro_lang/src/runtime_context.rs | 4 +- hydro_lang/src/stream.rs | 6 +- hydro_test_local/Cargo.toml | 2 +- hydro_test_local/src/local/chat_app.rs | 22 +- hydro_test_local/src/local/compute_pi.rs | 2 +- hydro_test_local/src/local/count_elems.rs | 14 +- hydro_test_local/src/local/first_ten.rs | 2 +- .../src/local/graph_reachability.rs | 16 +- hydro_test_local/src/local/negation.rs | 24 +- hydro_test_local/src/local/teed_join.rs | 24 +- .../surface_dest_sink_badsink.stderr | 28 - .../surface_lattice_fold_wronggeneric.rs | 10 - multiplatform_test/README.md | 2 +- multiplatform_test/src/lib.rs | 8 +- precheck.bash | 2 +- relalg/Cargo.toml | 2 +- relalg/src/runtime.rs | 8 +- template/hydro/src/first_ten_cluster.rs | 2 +- template/hydro/src/first_ten_distributed.rs | 2 +- template/hydroflow/Cargo.toml | 2 +- template/hydroflow/src/client.rs | 4 +- template/hydroflow/src/helpers.rs | 4 +- template/hydroflow/src/main.rs | 8 +- template/hydroflow/src/server.rs | 8 +- topolotree/Cargo.toml | 2 +- topolotree/src/latency_measure.rs | 8 +- topolotree/src/main.rs | 20 +- topolotree/src/pn.rs | 16 +- topolotree/src/pn_delta.rs | 16 +- topolotree/src/tests.rs | 24 +- website_playground/Cargo.toml | 2 +- website_playground/src/lib.rs | 16 +- 853 files changed, 2897 insertions(+), 2910 deletions(-) rename {hydroflow => dfir_rs}/.gitignore (100%) rename {hydroflow => dfir_rs}/CHANGELOG.md (100%) rename {hydroflow => dfir_rs}/Cargo.toml (98%) rename {hydroflow => dfir_rs}/README.md (100%) rename {hydroflow => dfir_rs}/deprecated_examples/covid_tracing/README.md (100%) rename {hydroflow => dfir_rs}/deprecated_examples/covid_tracing/main.rs (93%) rename {hydroflow => dfir_rs}/deprecated_examples/covid_tracing/people.rs (100%) rename {hydroflow => dfir_rs}/deprecated_examples/covid_tracing_dist/database.rs (92%) rename {hydroflow => dfir_rs}/deprecated_examples/covid_tracing_dist/main.rs (98%) rename {hydroflow => dfir_rs}/deprecated_examples/covid_tracing_dist/people.rs (100%) rename {hydroflow => dfir_rs}/deprecated_examples/covid_tracing_dist/tracker.rs (91%) rename {hydroflow => dfir_rs}/example.json (100%) rename {hydroflow => dfir_rs}/example_utils/chat_driver.py (100%) rename {hydroflow => dfir_rs}/example_utils/web2a (100%) rename {hydroflow => dfir_rs}/examples/chat/README.md (64%) rename {hydroflow => dfir_rs}/examples/chat/client.rs (96%) rename {hydroflow => dfir_rs}/examples/chat/main.rs (96%) rename {hydroflow => dfir_rs}/examples/chat/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/chat/randomized_gossiping_server.rs (98%) rename {hydroflow => dfir_rs}/examples/chat/server.rs (94%) rename {hydroflow => dfir_rs}/examples/deadlock_detector/README.md (100%) rename {hydroflow => dfir_rs}/examples/deadlock_detector/helpers.rs (100%) rename {hydroflow => dfir_rs}/examples/deadlock_detector/main.rs (95%) rename {hydroflow => dfir_rs}/examples/deadlock_detector/peer.rs (97%) rename {hydroflow => dfir_rs}/examples/deadlock_detector/peers.json (100%) rename {hydroflow => dfir_rs}/examples/deadlock_detector/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/echo_serde_json/README.md (100%) rename {hydroflow => dfir_rs}/examples/echo_serde_json/client.rs (91%) rename {hydroflow => dfir_rs}/examples/echo_serde_json/helpers.rs (100%) rename {hydroflow => dfir_rs}/examples/echo_serde_json/main.rs (94%) rename {hydroflow => dfir_rs}/examples/echo_serde_json/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/echo_serde_json/server.rs (86%) rename {hydroflow => dfir_rs}/examples/echoserver/README.md (100%) rename {hydroflow => dfir_rs}/examples/echoserver/client.rs (94%) rename {hydroflow => dfir_rs}/examples/echoserver/main.rs (93%) rename {hydroflow => dfir_rs}/examples/echoserver/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/echoserver/server.rs (88%) rename {hydroflow => dfir_rs}/examples/example_1_simplest.rs (89%) rename {hydroflow => dfir_rs}/examples/example_2_simple_1.rs (91%) rename {hydroflow => dfir_rs}/examples/example_2_simple_2.rs (93%) rename {hydroflow => dfir_rs}/examples/example_3_stream.rs (88%) rename {hydroflow => dfir_rs}/examples/example_4_neighbors.rs (89%) rename {hydroflow => dfir_rs}/examples/example_5_reachability.rs (91%) rename {hydroflow => dfir_rs}/examples/example_6_unreachability.rs (93%) rename {hydroflow => dfir_rs}/examples/example_naturals.rs (91%) rename {hydroflow => dfir_rs}/examples/example_surface_flows_1_basic.rs (88%) rename {hydroflow => dfir_rs}/examples/example_surface_flows_2_varname.rs (89%) rename {hydroflow => dfir_rs}/examples/example_surface_flows_3_ports.rs (94%) rename {hydroflow => dfir_rs}/examples/example_surface_flows_4_context.rs (89%) rename {hydroflow => dfir_rs}/examples/example_syntax_empty.rs (85%) rename {hydroflow => dfir_rs}/examples/example_syntax_hello_world.rs (88%) rename {hydroflow => dfir_rs}/examples/example_syntax_input.rs (71%) rename {hydroflow => dfir_rs}/examples/example_syntax_output.rs (56%) rename {hydroflow => dfir_rs}/examples/hello_world/README.md (100%) rename {hydroflow => dfir_rs}/examples/hello_world/main.rs (87%) rename {hydroflow => dfir_rs}/examples/kvs/README.md (100%) rename {hydroflow/examples/kvs_mut => dfir_rs/examples/kvs}/client.rs (94%) rename {hydroflow => dfir_rs}/examples/kvs/helpers.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs/main.rs (93%) rename {hydroflow => dfir_rs}/examples/kvs/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs/server.rs (93%) rename {hydroflow => dfir_rs}/examples/kvs_bench/README.md (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/buffer_pool/mod.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/buffer_pool/serialization.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/main.rs (97%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/mod.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/kvs_request_delete_visitor.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/kvs_request_get_visitor.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/kvs_request_gossip_visitor.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/kvs_request_put_visitor.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/lattices/map_union.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/lattices/mod.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/lattices/my_last_write_wins.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/lattices/point.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/lattices/with_bot.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/serialization/mod.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/test/magic_buffer.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/test/mod.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/protocol/test/util.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_bench/server.rs (97%) rename {hydroflow => dfir_rs}/examples/kvs_mut/README.md (100%) rename {hydroflow/examples/kvs => dfir_rs/examples/kvs_mut}/client.rs (94%) rename {hydroflow => dfir_rs}/examples/kvs_mut/helpers.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_mut/main.rs (93%) rename {hydroflow => dfir_rs}/examples/kvs_mut/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_mut/server.rs (94%) rename {hydroflow => dfir_rs}/examples/kvs_replicated/README.md (100%) rename {hydroflow => dfir_rs}/examples/kvs_replicated/client.rs (94%) rename {hydroflow => dfir_rs}/examples/kvs_replicated/helpers.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_replicated/main.rs (93%) rename {hydroflow => dfir_rs}/examples/kvs_replicated/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/kvs_replicated/server.rs (96%) rename {hydroflow => dfir_rs}/examples/lamport_clock/README.md (100%) rename {hydroflow => dfir_rs}/examples/lamport_clock/client.rs (95%) rename {hydroflow => dfir_rs}/examples/lamport_clock/main.rs (94%) rename {hydroflow => dfir_rs}/examples/lamport_clock/protocol.rs (85%) rename {hydroflow => dfir_rs}/examples/lamport_clock/server.rs (92%) rename {hydroflow => dfir_rs}/examples/python_udf/main.rs (97%) rename {hydroflow => dfir_rs}/examples/rga/README.md (100%) rename {hydroflow => dfir_rs}/examples/rga/adjacency.rs (97%) rename {hydroflow => dfir_rs}/examples/rga/datalog.rs (98%) rename {hydroflow => dfir_rs}/examples/rga/datalog_agg.rs (98%) rename {hydroflow => dfir_rs}/examples/rga/main.rs (95%) rename {hydroflow => dfir_rs}/examples/rga/minimal.rs (87%) rename {hydroflow => dfir_rs}/examples/rga/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/shopping/README.md (100%) rename {hydroflow => dfir_rs}/examples/shopping/driver.rs (94%) rename {hydroflow => dfir_rs}/examples/shopping/flows/bp_flow.rs (93%) rename {hydroflow => dfir_rs}/examples/shopping/flows/client_state_flow.rs (90%) rename {hydroflow => dfir_rs}/examples/shopping/flows/listener_flow.rs (90%) rename {hydroflow => dfir_rs}/examples/shopping/flows/mod.rs (100%) rename {hydroflow => dfir_rs}/examples/shopping/flows/orig_flow.rs (94%) rename {hydroflow => dfir_rs}/examples/shopping/flows/push_group_flow.rs (94%) rename {hydroflow => dfir_rs}/examples/shopping/flows/rep_server_flow.rs (88%) rename {hydroflow => dfir_rs}/examples/shopping/flows/server_state_flow.rs (91%) rename {hydroflow => dfir_rs}/examples/shopping/flows/ssiv_flow.rs (93%) rename {hydroflow => dfir_rs}/examples/shopping/lattices.rs (99%) rename {hydroflow => dfir_rs}/examples/shopping/main.rs (98%) rename {hydroflow => dfir_rs}/examples/shopping/misc/replicated2.dot (100%) rename {hydroflow => dfir_rs}/examples/shopping/misc/replicated2.pdf (100%) rename {hydroflow => dfir_rs}/examples/shopping/structs.rs (100%) rename {hydroflow => dfir_rs}/examples/shopping/test_data.rs (100%) rename {hydroflow => dfir_rs}/examples/shopping/wrappers.rs (100%) rename {hydroflow => dfir_rs}/examples/three_clique/README.md (100%) rename {hydroflow => dfir_rs}/examples/three_clique/main.rs (94%) rename {hydroflow => dfir_rs}/examples/two_pc_hf/README.md (100%) rename {hydroflow => dfir_rs}/examples/two_pc_hf/coordinator.rs (87%) rename {hydroflow => dfir_rs}/examples/two_pc_hf/helpers.rs (100%) rename {hydroflow => dfir_rs}/examples/two_pc_hf/main.rs (96%) rename {hydroflow => dfir_rs}/examples/two_pc_hf/members.json (100%) rename {hydroflow => dfir_rs}/examples/two_pc_hf/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/two_pc_hf/subordinate.rs (95%) rename {hydroflow => dfir_rs}/examples/vector_clock/README.md (100%) rename {hydroflow => dfir_rs}/examples/vector_clock/client.rs (97%) rename {hydroflow => dfir_rs}/examples/vector_clock/main.rs (94%) rename {hydroflow => dfir_rs}/examples/vector_clock/protocol.rs (100%) rename {hydroflow => dfir_rs}/examples/vector_clock/server.rs (93%) rename {hydroflow => dfir_rs}/src/compiled/mod.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/anti_join.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/cross_join.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/half_join_state/fold.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/half_join_state/fold_from.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/half_join_state/mod.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/half_join_state/multiset.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/half_join_state/reduce.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/half_join_state/set.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/mod.rs (100%) rename {hydroflow => dfir_rs}/src/compiled/pull/symmetric_hash_join.rs (100%) rename {hydroflow => dfir_rs}/src/declarative_macro.rs (100%) rename {hydroflow => dfir_rs}/src/lib.rs (97%) rename {hydroflow => dfir_rs}/src/scheduled/context.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/graph.rs (99%) rename {hydroflow => dfir_rs}/src/scheduled/graph_ext.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/handoff/handoff_list.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/handoff/mod.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/handoff/tee.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/handoff/vector.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/input.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/mod.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/net/mod.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/net/network_vertex.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/port.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/query.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/reactor.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/state.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/subgraph.rs (100%) rename {hydroflow => dfir_rs}/src/scheduled/ticks.rs (95%) rename {hydroflow => dfir_rs}/src/util/clear.rs (100%) rename {hydroflow => dfir_rs}/src/util/demux_enum.rs (94%) rename {hydroflow => dfir_rs}/src/util/deploy.rs (100%) rename {hydroflow => dfir_rs}/src/util/mod.rs (99%) rename {hydroflow => dfir_rs}/src/util/monotonic.rs (100%) rename {hydroflow => dfir_rs}/src/util/monotonic_map.rs (100%) rename {hydroflow => dfir_rs}/src/util/multiset.rs (100%) rename {hydroflow => dfir_rs}/src/util/simulation.rs (100%) rename {hydroflow => dfir_rs}/src/util/socket.rs (100%) rename {hydroflow => dfir_rs}/src/util/sparse_vec.rs (100%) rename {hydroflow => dfir_rs}/src/util/tcp.rs (100%) rename {hydroflow => dfir_rs}/src/util/udp.rs (100%) rename {hydroflow => dfir_rs}/src/util/unsync/mod.rs (100%) rename {hydroflow => dfir_rs}/src/util/unsync/mpsc.rs (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/datalog_badparse.rs (91%) rename {hydroflow => dfir_rs}/tests/compile-fail/datalog_badparse.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/datalog_filter_badtypes.rs (92%) rename {hydroflow => dfir_rs}/tests/compile-fail/datalog_filter_badtypes.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/datalog_join_badtypes.rs (92%) rename {hydroflow => dfir_rs}/tests/compile-fail/datalog_join_badtypes.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_anti_join_badtypes.rs (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_anti_join_badtypes.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_both.rs (85%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_both.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_extra.rs (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_extra.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_lifetime.rs (85%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_lifetime.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_nocolon.rs (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_nocolon.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_type.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_badgeneric_type.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_conflicting_name.rs (83%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_conflicting_name.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_degenerate_merge.rs (77%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_degenerate_merge.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_degenerate_null.rs (86%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_degenerate_null.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_degenerate_tee.rs (76%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_degenerate_tee.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_badarg.rs (91%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_badarg.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_badclosure.rs (91%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_badclosure.stderr (77%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_duplicate.rs (92%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_duplicate.stderr (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_elided.rs (91%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_elided.stderr (81%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_extra.rs (92%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_extra.stderr (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_extramissing.rs (92%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_extramissing.stderr (87%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_missing.rs (91%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demux_port_missing.stderr (72%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_missingtypeparam.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_missingtypeparam.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_notenum.rs (94%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_notenum.stderr (98%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_duplicate.rs (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_duplicate.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_duplicate_one.rs (83%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_duplicate_one.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_elided.rs (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_elided.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_extra.rs (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_extra.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_extra_zero.rs (77%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_extra_zero.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_extramissing.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_extramissing.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_missing.rs (87%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_missing.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_missing_one.rs (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_missing_one.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_wrong_one.rs (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_port_wrong_one.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_wrongenum.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_wrongenum.stderr (98%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_wrongfields_1.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_wrongfields_1.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_wrongfields_2.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_wrongfields_2.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_wrongtype.rs (85%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_demuxenum_wrongtype.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_dest_sink_baditem.ci.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_dest_sink_baditem.rs.ignore (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_dest_sink_baditem.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_dest_sink_badsink.rs.ignore (84%) create mode 100644 dfir_rs/tests/compile-fail/surface_dest_sink_badsink.stderr rename {hydroflow => dfir_rs}/tests/compile-fail/surface_fold_keyed_badtype_int.rs (81%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_fold_keyed_badtype_int.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_fold_keyed_badtype_option.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_fold_keyed_badtype_option.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_fold_keyed_generics_bad.ci.stderr (95%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_fold_keyed_generics_bad.rs.ignore (86%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_fold_keyed_generics_bad.stderr (96%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_fold_keyed_generics_extra.rs (81%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_fold_keyed_generics_extra.stderr (79%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_chain_double.rs (90%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_chain_double.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_chain_single.rs (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_chain_single.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_self1.rs (77%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_self1.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_self2.rs (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_self2.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_self2_indirect.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_self2_indirect.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_self3.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_forwardref_self3.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_identity_wronggeneric.rs (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_identity_wronggeneric.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_join_badtypes.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_join_badtypes.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_join_generics_extra.rs (90%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_join_generics_extra.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_join_persistence_bad.rs (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_join_persistence_bad.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_join_persistence_extra.rs (90%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_join_persistence_extra.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_lattice_fold_badgeneric.rs.ignore (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_lattice_fold_badgeneric.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_lattice_fold_noarg.rs (61%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_lattice_fold_noarg.stderr (62%) create mode 100644 dfir_rs/tests/compile-fail/surface_lattice_fold_wronggeneric.rs rename {hydroflow => dfir_rs}/tests/compile-fail/surface_lattice_fold_wronggeneric.stderr (56%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_lattice_reduce_badgeneric.rs.ignore (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_lattice_reduce_badgeneric.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_lattice_reduce_wronggeneric.rs (59%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_lattice_reduce_wronggeneric.stderr (62%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_latticereduce_wronggeneric.stderr (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_cycle.rs (78%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_cycle.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_missing_unwindowing.rs (78%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_missing_unwindowing.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_missing_windowing.rs (74%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_missing_windowing.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_multiple_window.rs (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_multiple_window.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_source.rs (72%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_loop_source.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_map_badtypes.rs (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_map_badtypes.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_merge_badtypes.rs (87%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_merge_badtypes.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_missing_args.rs (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_missing_args.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_negative_loop.rs (86%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_negative_loop.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_null.rs (77%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_null.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_badarg.rs (91%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_badarg.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_badclosure.rs (93%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_badclosure.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_duplicate.rs (94%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_duplicate.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_elided.rs (93%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_elided.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_extra.rs (94%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_extra.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_extramissing.rs (94%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_extramissing.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_inconsistent.rs (93%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_inconsistent.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_indexgap.rs (91%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_indexgap.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_missing.rs (93%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_partition_port_missing.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_conflict.rs (87%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_conflict.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_join.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_join.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_join_forwardref.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_join_forwardref.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_knot_a.rs (91%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_knot_a.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.rs (91%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.rs (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.rs (89%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_simple.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_naked_overwrite_simple.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_both.rs (85%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_both.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_both_indirect.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_both_indirect.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_both_parens.rs (86%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_both_parens.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_in.rs (83%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_in.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_out.rs (83%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_port_unused_out.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_reduce_keyed_badtype_int.rs (81%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_reduce_keyed_badtype_int.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_reduce_keyed_badtype_option.rs (83%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_reduce_keyed_badtype_option.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_badexpr.rs (88%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_badexpr.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_nostate.rs (87%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_nostate.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_nostate_undefined.rs (86%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_nostate_undefined.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_undefined.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_undefined.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_undefined_nostate.rs (86%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_singleton_undefined_nostate.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_source_interval_badarg.rs (79%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_source_interval_badarg.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_source_iter_badtype.rs.ignore (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_source_iter_badtype.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_eol_arrow.rs (79%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_eol_arrow.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_eol_indexing.rs (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_eol_indexing.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_eol_missingop.rs (79%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_eol_missingop.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_eol_op.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_eol_op.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_indexing_empty.rs (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_indexing_empty.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_noarrow_indexing.rs (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_noarrow_indexing.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_noarrow_op.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_noarrow_op.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_noarrow_paren.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_noarrow_paren.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_arrow.rs (79%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_arrow.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_indexing.rs (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_indexing.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_missingop.rs (80%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_missingop.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_noarrow_op.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_noarrow_op.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_noarrow_paren.rs (82%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_noarrow_paren.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_semicolon.rs (79%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_syntax_paren_semicolon.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_unknown_operators.rs (81%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_unknown_operators.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_use_bad1.rs (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_use_bad1.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_use_bad2.rs (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_use_bad2.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_use_bad3.rs (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_use_bad3.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_use_unknown.rs (84%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_use_unknown.stderr (100%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_varname_undefined.rs (81%) rename {hydroflow => dfir_rs}/tests/compile-fail/surface_varname_undefined.stderr (100%) rename {hydroflow => dfir_rs}/tests/datalog_compile_fail.rs (100%) rename {hydroflow => dfir_rs}/tests/datalog_frontend.rs (76%) rename {hydroflow => dfir_rs}/tests/datalog_minimal.rs (64%) rename {hydroflow => dfir_rs}/tests/groupby.rs (97%) rename {hydroflow => dfir_rs}/tests/scheduled_teeing_handoff.rs (98%) rename {hydroflow => dfir_rs}/tests/scheduled_test.rs (94%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_async__echo@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_async__echo@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_batch__basic_2@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_batch__basic_2@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_book__surface_flows_1@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_book__surface_flows_1@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__basic_2@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__basic_2@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__basic_3@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__basic_3@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__basic_union@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__basic_union@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__covid_tracing@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__covid_tracing@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__recv_expr@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__recv_expr@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__sort@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__sort@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__sort_by_key@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__sort_by_key@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__transitive_closure@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_codegen__transitive_closure@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_context__context_current_tick_start@graphvis_dot.snap (81%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_context__context_current_tick_start@graphvis_mermaid.snap (81%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_context__context_mut@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_context__context_mut@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_context__context_ref@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_context__context_ref@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_cross_singleton__basic@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_cross_singleton__basic@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_multiset_static@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_multiset_static@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_static@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_static@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_timing@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_difference__diff_timing@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_1_simplest.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_2_simple_1.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_2_simple_2.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_3_stream.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_4_neighbors.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_5_reachability.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_6_unreachability.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_naturals.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_surface_flows_1_basic.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_surface_flows_2_varname.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_surface_flows_3_ports.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_surface_flows_4_context.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_syntax_empty.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_syntax_hello_world.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_syntax_input.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_examples__example_syntax_output.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_flow_props__basic@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_flow_props__basic@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_flow_props__union_warning@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_flow_props__union_warning@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold__fold_sort@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold__fold_sort@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold__fold_static@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold__fold_static@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold__fold_static_join@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold__fold_static_join@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold__fold_tick@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold__fold_tick@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join__static_static@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join__static_static@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join__static_tick@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join__static_tick@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join__tick_static@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join__tick_static@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join__tick_tick@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join__tick_tick@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism__join@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism__join@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_loop__flo_nested@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_loop__flo_nested@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_loop__flo_syntax@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_loop__flo_syntax@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_basic@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_basic@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_mut@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_mut@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_pull@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_pull@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_push@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_push@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_replay_join@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_persist__persist_replay_join@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_python__python_basic@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_python__python_basic@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_python__python_too_many_args@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_python__python_too_many_args@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_python__python_two_args@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_python__python_two_args@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_reduce__reduce@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_reduce__reduce@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_reduce__reduce_static@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_reduce__reduce_static@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_reduce__reduce_sum@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_reduce__reduce_sum@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_reduce__reduce_tick@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_reduce__reduce_tick@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__stratum_loop@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__stratum_loop@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__tick_loop@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_scheduling__tick_loop@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__fold_cross@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__fold_cross@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__fold_singleton@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__fold_singleton@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__multi_tick@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__multi_tick@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__reduce_singleton@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__reduce_singleton@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__state@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__state@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__state_unused@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_singleton__state_unused@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__defer_lazy@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__defer_lazy@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__difference_a@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__difference_a@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__difference_b@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__difference_b@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__tick_loop_1@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__tick_loop_1@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__tick_loop_2@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__tick_loop_2@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__tick_loop_3@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_stratum__tick_loop_3@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique_static_pull@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique_static_pull@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique_static_push@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique_static_push@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique_tick_pull@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique_tick_pull@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique_tick_push@graphvis_dot.snap (100%) rename {hydroflow => dfir_rs}/tests/snapshots/surface_unique__unique_tick_push@graphvis_mermaid.snap (100%) rename {hydroflow => dfir_rs}/tests/surface_async.rs (84%) rename {hydroflow => dfir_rs}/tests/surface_batch.rs (71%) rename {hydroflow => dfir_rs}/tests/surface_book.rs (86%) rename {hydroflow => dfir_rs}/tests/surface_codegen.rs (85%) rename {hydroflow => dfir_rs}/tests/surface_compile_fail.rs (100%) rename {hydroflow => dfir_rs}/tests/surface_context.rs (96%) rename {hydroflow => dfir_rs}/tests/surface_cross_singleton.rs (82%) rename {hydroflow => dfir_rs}/tests/surface_demux_enum.rs (96%) rename {hydroflow => dfir_rs}/tests/surface_demux_partition.rs (96%) rename {hydroflow => dfir_rs}/tests/surface_difference.rs (79%) rename {hydroflow => dfir_rs}/tests/surface_examples.rs (94%) rename {hydroflow => dfir_rs}/tests/surface_fold.rs (84%) rename {hydroflow => dfir_rs}/tests/surface_fold_keyed.rs (79%) rename {hydroflow => dfir_rs}/tests/surface_forwardref.rs (78%) rename {hydroflow => dfir_rs}/tests/surface_join.rs (98%) rename {hydroflow => dfir_rs}/tests/surface_join_fused.rs (98%) rename {hydroflow => dfir_rs}/tests/surface_lattice_batch.rs (97%) rename {hydroflow => dfir_rs}/tests/surface_lattice_bimorphism.rs (92%) rename {hydroflow => dfir_rs}/tests/surface_lattice_bimorphism_persist_insertion.rs (81%) rename {hydroflow => dfir_rs}/tests/surface_lattice_fold.rs (85%) rename {hydroflow => dfir_rs}/tests/surface_lattice_generalized_hash_trie.rs (84%) rename {hydroflow => dfir_rs}/tests/surface_lattice_join.rs (88%) rename {hydroflow => dfir_rs}/tests/surface_lattice_reduce.rs (82%) rename {hydroflow => dfir_rs}/tests/surface_loop.rs (93%) rename {hydroflow => dfir_rs}/tests/surface_multiset_delta.rs (82%) rename {hydroflow => dfir_rs}/tests/surface_parser.rs (99%) rename {hydroflow => dfir_rs}/tests/surface_persist.rs (79%) rename {hydroflow => dfir_rs}/tests/surface_python.rs (96%) rename {hydroflow => dfir_rs}/tests/surface_reduce.rs (81%) rename {hydroflow => dfir_rs}/tests/surface_scheduling.rs (85%) rename {hydroflow => dfir_rs}/tests/surface_singleton.rs (83%) rename {hydroflow => dfir_rs}/tests/surface_state_scheduling.rs (90%) rename {hydroflow => dfir_rs}/tests/surface_stratum.rs (95%) rename {hydroflow => dfir_rs}/tests/surface_unique.rs (87%) rename {hydroflow => dfir_rs}/tests/surface_warnings.rs (91%) rename {hydroflow => dfir_rs}/tests/surface_zip_unzip.rs (81%) rename {hydroflow => dfir_rs}/wasm.md (100%) delete mode 100644 hydroflow/tests/compile-fail/surface_dest_sink_badsink.stderr delete mode 100644 hydroflow/tests/compile-fail/surface_lattice_fold_wronggeneric.rs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef4966e56d7f..292c6fb1cfab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -275,7 +275,7 @@ jobs: CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER: wasm-bindgen-test-runner with: command: test - args: -p hydroflow --target wasm32-unknown-unknown --tests --no-fail-fast + args: -p dfir_rs --target wasm32-unknown-unknown --tests --no-fail-fast build-website: name: Build Website diff --git a/Cargo.lock b/Cargo.lock index db37b8ec66a4..87c120c5c50d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -317,8 +317,8 @@ name = "benches" version = "0.0.0" dependencies = [ "criterion", + "dfir_rs", "differential-dataflow-master", - "hydroflow", "nameof", "rand", "rand_distr", @@ -930,6 +930,53 @@ dependencies = [ "syn 2.0.75", ] +[[package]] +name = "dfir_rs" +version = "0.10.0" +dependencies = [ + "bincode", + "byteorder", + "bytes", + "chrono", + "clap", + "colored", + "criterion", + "dfir_datalog", + "dfir_lang", + "dfir_macro", + "futures", + "getrandom", + "hydroflow_deploy_integration", + "insta", + "itertools", + "lattices", + "multiplatform_test", + "pusherator", + "pyo3", + "rand", + "rand_distr", + "ref-cast", + "regex", + "rustc-hash 1.1.0", + "sealed 0.5.0", + "serde", + "serde_json", + "slotmap", + "smallvec", + "static_assertions", + "time", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "tracing-subscriber", + "trybuild", + "variadics", + "wasm-bindgen-test", + "web-time", + "zipf", +] + [[package]] name = "differential-dataflow-master" version = "0.13.0-dev.1" @@ -1246,9 +1293,9 @@ version = "0.1.0" dependencies = [ "clap", "config", + "dfir_rs", "governor", "hostname", - "hydroflow", "lattices", "lazy_static", "notify", @@ -1477,8 +1524,8 @@ name = "hydro_cli_examples" version = "0.0.0" dependencies = [ "dfir_datalog", + "dfir_rs", "futures", - "hydroflow", "rand", "serde", "serde_json", @@ -1526,8 +1573,8 @@ dependencies = [ "bincode", "ctor", "dfir_lang", + "dfir_rs", "hydro_deploy", - "hydroflow", "insta", "match_box", "nameof", @@ -1581,10 +1628,10 @@ dependencies = [ name = "hydro_test_local" version = "0.0.0" dependencies = [ + "dfir_rs", "futures", "hydro_lang", "hydro_test_local_macro", - "hydroflow", "insta", "rand", "stageleft", @@ -1601,53 +1648,6 @@ dependencies = [ "stageleft_tool", ] -[[package]] -name = "hydroflow" -version = "0.10.0" -dependencies = [ - "bincode", - "byteorder", - "bytes", - "chrono", - "clap", - "colored", - "criterion", - "dfir_datalog", - "dfir_lang", - "dfir_macro", - "futures", - "getrandom", - "hydroflow_deploy_integration", - "insta", - "itertools", - "lattices", - "multiplatform_test", - "pusherator", - "pyo3", - "rand", - "rand_distr", - "ref-cast", - "regex", - "rustc-hash 1.1.0", - "sealed 0.5.0", - "serde", - "serde_json", - "slotmap", - "smallvec", - "static_assertions", - "time", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-subscriber", - "trybuild", - "variadics", - "wasm-bindgen-test", - "web-time", - "zipf", -] - [[package]] name = "hydroflow_deploy_integration" version = "0.10.0" @@ -2955,7 +2955,7 @@ version = "0.0.0" dependencies = [ "anyhow", "datadriven", - "hydroflow", + "dfir_rs", "prettyplease", "proc-macro2", "quote", @@ -3789,8 +3789,8 @@ name = "topolotree" version = "0.0.0" dependencies = [ "dfir_datalog", + "dfir_rs", "futures", - "hydroflow", "procinfo", "rand", "serde", @@ -4345,8 +4345,8 @@ dependencies = [ "console_error_panic_hook", "dfir_datalog_core", "dfir_lang", + "dfir_rs", "futures", - "hydroflow", "prettyplease", "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 4aea3ee66414..9bf1954c9be0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ "hydro_deploy/hydro_cli", "hydro_deploy/hydro_cli_examples", "hydro_deploy/hydroflow_deploy_integration", - "hydroflow", + "dfir_rs", "dfir_datalog", "dfir_datalog_core", "dfir_lang", diff --git a/Dockerfile b/Dockerfile index 67786648c559..65768b2b5b78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ RUN mkdir -p xfer/examples RUN ls -dR target/*/release/examples/* | grep -vE '^.*/[a-z_]+\-.*$' | grep -vE '^.*\.d$' | xargs -I{} cp {} xfer/examples/ -RUN mkdir -p xfer/example_utils && cp hydroflow/example_utils/* xfer/example_utils/. +RUN mkdir -p xfer/example_utils && cp dfir_rs/example_utils/* xfer/example_utils/. # Runtime stage FROM rust:slim-buster diff --git a/RELEASING.md b/RELEASING.md index 2a8ce911deed..743b22789a35 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -28,7 +28,7 @@ To (dry) run the command locally to spot-check for errors and warnings: cargo smart-release --update-crates-index \ --no-changelog-preview --allow-fully-generated-changelogs \ --bump-dependencies auto --bump minor \ # or `patch`, `major`, `keep`, `auto` - hydroflow dfir_lang dfir_macro hydro_lang \ + dfir_rs dfir_lang dfir_macro hydro_lang \ dfir_datalog dfir_datalog_core \ hydro_deploy hydro_cli hydroflow_cli_integration \ hydroflow_plus_cli_integration \ diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 82c024eba660..bcfbbfa78b59 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -14,7 +14,7 @@ workspace = true [dev-dependencies] criterion = { version = "0.5.0", features = [ "async_tokio", "html_reports" ] } -hydroflow = { path = "../hydroflow", features = [ "debugging" ] } +dfir_rs = { path = "../dfir_rs", features = [ "debugging" ] } nameof = "1.0.0" rand = "0.8.0" rand_distr = "0.4.3" diff --git a/benches/benches/arithmetic.rs b/benches/benches/arithmetic.rs index f6e4b8067352..0ea16d34a404 100644 --- a/benches/benches/arithmetic.rs +++ b/benches/benches/arithmetic.rs @@ -2,7 +2,7 @@ use std::sync::mpsc::channel; use std::thread; use criterion::{black_box, criterion_group, criterion_main, Criterion}; -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; use static_assertions::const_assert; use timely::dataflow::operators::{Inspect, Map, ToStream}; @@ -94,9 +94,9 @@ fn benchmark_iter_collect(c: &mut Criterion) { } fn benchmark_hydroflow_compiled(c: &mut Criterion) { - use hydroflow::pusherator::{InputBuild, Pusherator, PusheratorBuild}; + use dfir_rs::pusherator::{InputBuild, Pusherator, PusheratorBuild}; - c.bench_function("arithmetic/hydroflow/compiled", |b| { + c.bench_function("arithmetic/dfir_rs/compiled", |b| { b.iter(|| { let mut pusherator = InputBuild::::new() .map(|x| x + 1) @@ -131,9 +131,9 @@ fn benchmark_hydroflow_compiled(c: &mut Criterion) { } fn benchmark_hydroflow_compiled_no_cheating(c: &mut Criterion) { - use hydroflow::pusherator::{InputBuild, Pusherator, PusheratorBuild}; + use dfir_rs::pusherator::{InputBuild, Pusherator, PusheratorBuild}; - c.bench_function("arithmetic/hydroflow/compiled_no_cheating", |b| { + c.bench_function("arithmetic/dfir_rs/compiled_no_cheating", |b| { b.iter(|| { let mut pusherator = InputBuild::::new() .map(|x| black_box(x + 1)) @@ -169,7 +169,7 @@ fn benchmark_hydroflow_compiled_no_cheating(c: &mut Criterion) { fn benchmark_hydroflow_surface(c: &mut Criterion) { const_assert!(NUM_OPS == 20); // This benchmark is hardcoded for 20 ops, so assert that NUM_OPS is 20. - c.bench_function("arithmetic/hydroflow/surface", |b| { + c.bench_function("arithmetic/dfir_rs/surface", |b| { b.iter_batched( || { dfir_syntax! { diff --git a/benches/benches/fan_in.rs b/benches/benches/fan_in.rs index 88dfe1253b6e..064ecec7f286 100644 --- a/benches/benches/fan_in.rs +++ b/benches/benches/fan_in.rs @@ -1,7 +1,7 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion}; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::handoff::Iter; -use hydroflow::scheduled::query::Query as Q; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::handoff::Iter; +use dfir_rs::scheduled::query::Query as Q; use static_assertions::const_assert; use timely::dataflow::operators::{Concatenate, Inspect, ToStream}; @@ -13,7 +13,7 @@ fn make_ints(i: usize) -> impl Iterator { } fn benchmark_hydroflow(c: &mut Criterion) { - c.bench_function("fan_in/hydroflow", |b| { + c.bench_function("fan_in/dfir_rs", |b| { b.iter(|| { let mut q = Q::new(); @@ -38,7 +38,7 @@ fn benchmark_hydroflow(c: &mut Criterion) { fn benchmark_hydroflow_surface(c: &mut Criterion) { const_assert!(NUM_OPS == 20); // This benchmark is hardcoded for 20 ops, so assert that NUM_OPS is 20. - c.bench_function("fan_in/hydroflow/surface", |b| { + c.bench_function("fan_in/dfir_rs/surface", |b| { b.iter(|| { let mut df = dfir_syntax! { diff --git a/benches/benches/fan_out.rs b/benches/benches/fan_out.rs index 8fe5c6707f7f..5eb144cd1336 100644 --- a/benches/benches/fan_out.rs +++ b/benches/benches/fan_out.rs @@ -1,7 +1,7 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion}; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::handoff::Iter; -use hydroflow::scheduled::query::Query as Q; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::handoff::Iter; +use dfir_rs::scheduled::query::Query as Q; use static_assertions::const_assert; use timely::dataflow::operators::{Map, ToStream}; @@ -9,7 +9,7 @@ const NUM_OPS: usize = 20; const NUM_INTS: usize = 1_000_000; fn benchmark_hydroflow_scheduled(c: &mut Criterion) { - c.bench_function("fan_out/hydroflow/scheduled", |b| { + c.bench_function("fan_out/dfir_rs/scheduled", |b| { b.iter(|| { let mut q = Q::new(); @@ -30,7 +30,7 @@ fn benchmark_hydroflow_scheduled(c: &mut Criterion) { fn benchmark_hydroflow_surface(c: &mut Criterion) { const_assert!(NUM_OPS == 20); // This benchmark is hardcoded for 20 ops, so assert that NUM_OPS is 20. - c.bench_function("fan_out/hydroflow/surface", |b| { + c.bench_function("fan_out/dfir_rs/surface", |b| { b.iter(|| { let mut df = dfir_syntax! { my_tee = tee(); diff --git a/benches/benches/fork_join.rs b/benches/benches/fork_join.rs index ce402811c134..bf958549dc06 100644 --- a/benches/benches/fork_join.rs +++ b/benches/benches/fork_join.rs @@ -1,9 +1,9 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion}; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::scheduled::graph_ext::GraphExt; -use hydroflow::scheduled::handoff::{Iter, VecHandoff}; -use hydroflow::scheduled::query::Query as Q; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::scheduled::graph_ext::GraphExt; +use dfir_rs::scheduled::handoff::{Iter, VecHandoff}; +use dfir_rs::scheduled::query::Query as Q; use timely::dataflow::operators::{Concatenate, Filter, Inspect, ToStream}; const NUM_OPS: usize = 20; @@ -11,7 +11,7 @@ const NUM_INTS: usize = 100_000; const BRANCH_FACTOR: usize = 2; fn benchmark_hydroflow(c: &mut Criterion) { - c.bench_function("fork_join/hydroflow", |b| { + c.bench_function("fork_join/dfir_rs", |b| { b.iter(|| { let mut df = Hydroflow::new(); @@ -84,7 +84,7 @@ fn benchmark_hydroflow(c: &mut Criterion) { } fn benchmark_hydroflow_surface(c: &mut Criterion) { - c.bench_function("fork_join/hydroflow/surface", |b| { + c.bench_function("fork_join/dfir_rs/surface", |b| { b.iter(|| { let mut hf = include!("fork_join_20.hf"); hf.run_available(); diff --git a/benches/benches/identity.rs b/benches/benches/identity.rs index 13c60af37db2..e51c5efb856d 100644 --- a/benches/benches/identity.rs +++ b/benches/benches/identity.rs @@ -2,8 +2,8 @@ use std::sync::mpsc::channel; use std::thread; use criterion::{black_box, criterion_group, criterion_main, Criterion}; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph_ext::GraphExt; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph_ext::GraphExt; use static_assertions::const_assert; use timely::dataflow::operators::{Inspect, Map, ToStream}; @@ -112,9 +112,9 @@ fn benchmark_timely(c: &mut Criterion) { } fn benchmark_hydroflow_compiled(c: &mut Criterion) { - use hydroflow::pusherator::{InputBuild, Pusherator, PusheratorBuild}; + use dfir_rs::pusherator::{InputBuild, Pusherator, PusheratorBuild}; - c.bench_function("identity/hydroflow/compiled", |b| { + c.bench_function("identity/dfir_rs/compiled", |b| { b.iter(|| { let mut pusherator = InputBuild::::new() .map(black_box) @@ -149,10 +149,10 @@ fn benchmark_hydroflow_compiled(c: &mut Criterion) { } fn benchmark_hydroflow(c: &mut Criterion) { - use hydroflow::scheduled::graph::Hydroflow; - use hydroflow::scheduled::handoff::{Iter, VecHandoff}; + use dfir_rs::scheduled::graph::Hydroflow; + use dfir_rs::scheduled::handoff::{Iter, VecHandoff}; - c.bench_function("identity/hydroflow", |b| { + c.bench_function("identity/dfir_rs", |b| { b.iter(|| { let mut df = Hydroflow::new(); @@ -188,7 +188,7 @@ fn benchmark_hydroflow(c: &mut Criterion) { fn benchmark_hydroflow_surface(c: &mut Criterion) { const_assert!(NUM_OPS == 20); // This benchmark is hardcoded for 20 ops, so assert that NUM_OPS is 20. - c.bench_function("identity/hydroflow/surface", |b| { + c.bench_function("identity/dfir_rs/surface", |b| { b.iter(|| { let mut df = dfir_syntax! { source_iter(black_box(0..NUM_INTS)) diff --git a/benches/benches/micro_ops.rs b/benches/benches/micro_ops.rs index 62eb73e162ed..6eaef2ccec49 100644 --- a/benches/benches/micro_ops.rs +++ b/benches/benches/micro_ops.rs @@ -1,5 +1,5 @@ use criterion::{black_box, criterion_group, criterion_main, BatchSize, Criterion}; -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; use rand::distributions::{Distribution, Uniform}; use rand::rngs::StdRng; use rand::SeedableRng; diff --git a/benches/benches/reachability.rs b/benches/benches/reachability.rs index a6aef98698cb..ad3a9af6b534 100644 --- a/benches/benches/reachability.rs +++ b/benches/benches/reachability.rs @@ -5,10 +5,10 @@ use std::rc::Rc; use std::sync::LazyLock; use criterion::{criterion_group, criterion_main, Criterion}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph_ext::GraphExt; use differential_dataflow::input::Input; use differential_dataflow::operators::{Iterate, Join, Threshold}; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph_ext::GraphExt; static EDGES: LazyLock>> = LazyLock::new(|| { let cursor = Cursor::new(include_bytes!("reachability_edges.txt")); @@ -119,14 +119,14 @@ fn benchmark_differential(c: &mut Criterion) { } fn benchmark_hydroflow_scheduled(c: &mut Criterion) { - use hydroflow::scheduled::graph::Hydroflow; - use hydroflow::scheduled::handoff::{Iter, VecHandoff}; - use hydroflow::{var_args, var_expr}; + use dfir_rs::scheduled::graph::Hydroflow; + use dfir_rs::scheduled::handoff::{Iter, VecHandoff}; + use dfir_rs::{var_args, var_expr}; let edges = &*EDGES; let reachable = &*REACHABLE; - c.bench_function("reachability/hydroflow/scheduled", |b| { + c.bench_function("reachability/dfir_rs/scheduled", |b| { b.iter(|| { // A dataflow that represents graph reachability. let mut df = Hydroflow::new(); @@ -213,16 +213,16 @@ fn benchmark_hydroflow_scheduled(c: &mut Criterion) { } fn benchmark_hydroflow(c: &mut Criterion) { - use hydroflow::pusherator::for_each::ForEach; - use hydroflow::pusherator::{IteratorToPusherator, PusheratorBuild}; - use hydroflow::scheduled::graph::Hydroflow; - use hydroflow::scheduled::handoff::VecHandoff; - use hydroflow::{var_args, var_expr}; + use dfir_rs::pusherator::for_each::ForEach; + use dfir_rs::pusherator::{IteratorToPusherator, PusheratorBuild}; + use dfir_rs::scheduled::graph::Hydroflow; + use dfir_rs::scheduled::handoff::VecHandoff; + use dfir_rs::{var_args, var_expr}; let edges = &*EDGES; let reachable = &*REACHABLE; - c.bench_function("reachability/hydroflow", |b| { + c.bench_function("reachability/dfir_rs", |b| { b.iter(|| { // A dataflow that represents graph reachability. let mut df = Hydroflow::new(); @@ -290,7 +290,7 @@ fn benchmark_hydroflow(c: &mut Criterion) { } fn benchmark_hydroflow_surface_cheating(c: &mut Criterion) { - c.bench_function("reachability/hydroflow/surface_cheating", |b| { + c.bench_function("reachability/dfir_rs/surface_cheating", |b| { b.iter_batched( || { let reachable_verts = Rc::new(RefCell::new(HashSet::new())); @@ -320,7 +320,7 @@ fn benchmark_hydroflow_surface_cheating(c: &mut Criterion) { } fn benchmark_hydroflow_surface(c: &mut Criterion) { - c.bench_function("reachability/hydroflow/surface", |b| { + c.bench_function("reachability/dfir_rs/surface", |b| { let edges: Vec<_> = EDGES .iter() .flat_map(|(&k, v)| v.iter().map(move |v| (k, *v))) diff --git a/benches/benches/symmetric_hash_join.rs b/benches/benches/symmetric_hash_join.rs index 1834c767cc27..a4dce40df415 100644 --- a/benches/benches/symmetric_hash_join.rs +++ b/benches/benches/symmetric_hash_join.rs @@ -1,7 +1,7 @@ use std::hint::black_box; use criterion::{criterion_group, criterion_main, Criterion}; -use hydroflow::compiled::pull::{symmetric_hash_join_into_iter, HalfSetJoinState}; +use dfir_rs::compiled::pull::{symmetric_hash_join_into_iter, HalfSetJoinState}; use rand::distributions::Distribution; use rand::rngs::StdRng; use rand::SeedableRng; diff --git a/benches/benches/words_diamond.rs b/benches/benches/words_diamond.rs index 120da48c0765..82d2c279c3d1 100644 --- a/benches/benches/words_diamond.rs +++ b/benches/benches/words_diamond.rs @@ -3,8 +3,8 @@ use std::path::PathBuf; use std::sync::LazyLock; use criterion::{criterion_group, criterion_main, Criterion}; -use hydroflow::dfir_syntax; -use hydroflow::itertools::Itertools; +use dfir_rs::dfir_syntax; +use dfir_rs::itertools::Itertools; use nameof::name_of; const OUTPUT: usize = 5_123_595; diff --git a/datastores/gossip_kv/Cargo.toml b/datastores/gossip_kv/Cargo.toml index c2b7e8dc243b..bc7dee089815 100644 --- a/datastores/gossip_kv/Cargo.toml +++ b/datastores/gossip_kv/Cargo.toml @@ -11,7 +11,7 @@ clap = { version = "4.5.4", features = ["derive", "env"] } config = "0.14.0" governor = "0.7.0" hostname = "0.4.0" -hydroflow = { path="../../hydroflow" } +dfir_rs = { path= "../../dfir_rs" } lattices = { path = '../../lattices'} lazy_static = "1.5.0" # The specific set of features for Notify are picked to disable the default cross-beam channels (cause problems with diff --git a/datastores/gossip_kv/cli/main.rs b/datastores/gossip_kv/cli/main.rs index 5cf5919bb737..d008387b900c 100644 --- a/datastores/gossip_kv/cli/main.rs +++ b/datastores/gossip_kv/cli/main.rs @@ -1,9 +1,9 @@ use std::net::SocketAddr; use clap::{CommandFactory, Parser, Subcommand}; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::{dfir_syntax, tokio, DemuxEnum}; use gossip_kv::{ClientRequest, ClientResponse, Key}; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; -use hydroflow::{dfir_syntax, tokio, DemuxEnum}; use tracing::error; /// CLI program to interact with Layer 0 gossip store. @@ -80,7 +80,7 @@ fn parse_command(line: String) -> Option { } } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { tracing_subscriber::fmt::init(); diff --git a/datastores/gossip_kv/kv/lattices/mod.rs b/datastores/gossip_kv/kv/lattices/mod.rs index 1aa5883b4bda..d9d6098638d5 100644 --- a/datastores/gossip_kv/kv/lattices/mod.rs +++ b/datastores/gossip_kv/kv/lattices/mod.rs @@ -2,7 +2,7 @@ use std::cmp::Ordering; use std::collections::HashSet; use std::hash::Hash; -use hydroflow::lattices::{IsBot, IsTop, LatticeFrom, LatticeOrd, Merge}; +use dfir_rs::lattices::{IsBot, IsTop, LatticeFrom, LatticeOrd, Merge}; use serde::{Deserialize, Serialize}; /// A bounded set union lattice with a fixed size N. @@ -191,7 +191,7 @@ where #[cfg(test)] mod tests { - use hydroflow::lattices::test::check_all; + use dfir_rs::lattices::test::check_all; use super::*; diff --git a/datastores/gossip_kv/kv/model.rs b/datastores/gossip_kv/kv/model.rs index 3d17d78d3b68..5a4d349496c2 100644 --- a/datastores/gossip_kv/kv/model.rs +++ b/datastores/gossip_kv/kv/model.rs @@ -1,6 +1,6 @@ -use hydroflow::lattices::map_union::MapUnionHashMap; -use hydroflow::lattices::set_union::SetUnionHashSet; -use hydroflow::lattices::{DomPair, Max}; +use dfir_rs::lattices::map_union::MapUnionHashMap; +use dfir_rs::lattices::set_union::SetUnionHashSet; +use dfir_rs::lattices::{DomPair, Max}; use crate::Namespace; @@ -77,7 +77,7 @@ pub fn delete_row( mod tests { use std::collections::HashSet; - use hydroflow::lattices::Merge; + use dfir_rs::lattices::Merge; use crate::model::{delete_row, upsert_row, Clock, Namespaces, RowKey, TableName}; use crate::Namespace::System; diff --git a/datastores/gossip_kv/kv/server.rs b/datastores/gossip_kv/kv/server.rs index c491a5d3dcea..35c1f4c56b2e 100644 --- a/datastores/gossip_kv/kv/server.rs +++ b/datastores/gossip_kv/kv/server.rs @@ -2,13 +2,13 @@ use std::collections::{HashMap, HashSet}; use std::fmt::Debug; use std::hash::Hash; -use hydroflow::dfir_syntax; -use hydroflow::futures::{Sink, Stream}; -use hydroflow::itertools::Itertools; -use hydroflow::lattices::map_union::{KeyedBimorphism, MapUnionHashMap, MapUnionSingletonMap}; -use hydroflow::lattices::set_union::SetUnionHashSet; -use hydroflow::lattices::{Lattice, PairBimorphism}; -use hydroflow::scheduled::graph::Hydroflow; +use dfir_rs::dfir_syntax; +use dfir_rs::futures::{Sink, Stream}; +use dfir_rs::itertools::Itertools; +use dfir_rs::lattices::map_union::{KeyedBimorphism, MapUnionHashMap, MapUnionSingletonMap}; +use dfir_rs::lattices::set_union::SetUnionHashSet; +use dfir_rs::lattices::{Lattice, PairBimorphism}; +use dfir_rs::scheduled::graph::Hydroflow; use lattices::set_union::SetUnion; use lattices::{IsTop, Max, Pair}; use lazy_static::lazy_static; @@ -351,13 +351,13 @@ where mod tests { use std::collections::HashSet; - use hydroflow::tokio_stream::empty; - use hydroflow::util::simulation::{Address, Fleet, Hostname}; + use dfir_rs::tokio_stream::empty; + use dfir_rs::util::simulation::{Address, Fleet, Hostname}; use super::*; use crate::membership::{MemberDataBuilder, Protocol}; - #[hydroflow::test] + #[dfir_rs::test] async fn test_member_init() { let mut fleet = Fleet::new(); @@ -366,7 +366,7 @@ mod tests { let server_client_address = Address::new(server_name.clone(), "client".to_string()); let server_gossip_address = Address::new(server_name.clone(), "gossip".to_string()); - let (_, gossip_trigger_rx) = hydroflow::util::unbounded_channel::<()>(); + let (_, gossip_trigger_rx) = dfir_rs::util::unbounded_channel::<()>(); // Create the kv server fleet.add_host(server_name.clone(), |ctx| { @@ -403,8 +403,8 @@ mod tests { let key = "/sys/members/server".parse::().unwrap(); - let (trigger_tx, trigger_rx) = hydroflow::util::unbounded_channel::<()>(); - let (response_tx, mut response_rx) = hydroflow::util::unbounded_channel::(); + let (trigger_tx, trigger_rx) = dfir_rs::util::unbounded_channel::<()>(); + let (response_tx, mut response_rx) = dfir_rs::util::unbounded_channel::(); let key_clone = key.clone(); let server_client_address_clone = server_client_address.clone(); @@ -444,8 +444,7 @@ mod tests { loop { fleet.run_single_tick_all_hosts().await; - let responses = - hydroflow::util::collect_ready_async::, _>(&mut response_rx).await; + let responses = dfir_rs::util::collect_ready_async::, _>(&mut response_rx).await; if !responses.is_empty() { assert_eq!( @@ -462,7 +461,7 @@ mod tests { } } - #[hydroflow::test] + #[dfir_rs::test] async fn test_multiple_values_same_tick() { let mut fleet = Fleet::new(); @@ -470,7 +469,7 @@ mod tests { let server_client_address = Address::new(server_name.clone(), "client".to_string()); - let (_, gossip_trigger_rx) = hydroflow::util::unbounded_channel::<()>(); + let (_, gossip_trigger_rx) = dfir_rs::util::unbounded_channel::<()>(); // Create the kv server fleet.add_host(server_name.clone(), |ctx| { @@ -514,7 +513,7 @@ mod tests { let writer_name: Hostname = "writer".to_string(); - let (writer_trigger_tx, writer_trigger_rx) = hydroflow::util::unbounded_channel::(); + let (writer_trigger_tx, writer_trigger_rx) = dfir_rs::util::unbounded_channel::(); let key_clone = key.clone(); let server_client_address_clone = server_client_address.clone(); @@ -547,8 +546,8 @@ mod tests { // Read the value back. let reader_name: Hostname = "reader".to_string(); - let (reader_trigger_tx, reader_trigger_rx) = hydroflow::util::unbounded_channel::<()>(); - let (response_tx, mut response_rx) = hydroflow::util::unbounded_channel::(); + let (reader_trigger_tx, reader_trigger_rx) = dfir_rs::util::unbounded_channel::<()>(); + let (response_tx, mut response_rx) = dfir_rs::util::unbounded_channel::(); let key_clone = key.clone(); let server_client_address_clone = server_client_address.clone(); @@ -575,8 +574,7 @@ mod tests { loop { fleet.run_single_tick_all_hosts().await; - let responses = - hydroflow::util::collect_ready_async::, _>(&mut response_rx).await; + let responses = dfir_rs::util::collect_ready_async::, _>(&mut response_rx).await; if !responses.is_empty() { assert_eq!( @@ -591,7 +589,7 @@ mod tests { } } - #[hydroflow::test] + #[dfir_rs::test] async fn test_gossip() { let subscriber = tracing_subscriber::FmtSubscriber::builder() .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) @@ -622,7 +620,7 @@ mod tests { }, ]; - let (gossip_trigger_tx_a, gossip_trigger_rx_a) = hydroflow::util::unbounded_channel::<()>(); + let (gossip_trigger_tx_a, gossip_trigger_rx_a) = dfir_rs::util::unbounded_channel::<()>(); let seed_nodes_clone = seed_nodes.clone(); fleet.add_host(server_a.clone(), |ctx| { @@ -655,7 +653,7 @@ mod tests { ) }); - let (_, gossip_trigger_rx_b) = hydroflow::util::unbounded_channel::<()>(); + let (_, gossip_trigger_rx_b) = dfir_rs::util::unbounded_channel::<()>(); let seed_nodes_clone = seed_nodes.clone(); fleet.add_host(server_b.clone(), |ctx| { @@ -696,7 +694,7 @@ mod tests { let writer_name: Hostname = "writer".to_string(); - let (writer_trigger_tx, writer_trigger_rx) = hydroflow::util::unbounded_channel::(); + let (writer_trigger_tx, writer_trigger_rx) = dfir_rs::util::unbounded_channel::(); let key_clone = key.clone(); let server_a_client_address_clone = server_a_client_address.clone(); @@ -714,8 +712,8 @@ mod tests { let reader_name: Hostname = "reader".to_string(); - let (reader_trigger_tx, reader_trigger_rx) = hydroflow::util::unbounded_channel::<()>(); - let (response_tx, mut response_rx) = hydroflow::util::unbounded_channel::(); + let (reader_trigger_tx, reader_trigger_rx) = dfir_rs::util::unbounded_channel::<()>(); + let (response_tx, mut response_rx) = dfir_rs::util::unbounded_channel::(); let key_clone = key.clone(); let server_b_client_address_clone = server_b_client_address.clone(); @@ -743,8 +741,7 @@ mod tests { loop { reader_trigger_tx.send(()).unwrap(); fleet.run_single_tick_all_hosts().await; - let responses = - hydroflow::util::collect_ready_async::, _>(&mut response_rx).await; + let responses = dfir_rs::util::collect_ready_async::, _>(&mut response_rx).await; if !responses.is_empty() { assert_eq!( diff --git a/datastores/gossip_kv/kv/util.rs b/datastores/gossip_kv/kv/util.rs index 4cc391da6e7a..a34d8f2246f8 100644 --- a/datastores/gossip_kv/kv/util.rs +++ b/datastores/gossip_kv/kv/util.rs @@ -1,4 +1,4 @@ -use hydroflow::DemuxEnum; +use dfir_rs::DemuxEnum; use crate::model::{Clock, Namespaces}; use crate::{ClientRequest, GossipMessage, Key}; diff --git a/datastores/gossip_kv/load_test_server/server.rs b/datastores/gossip_kv/load_test_server/server.rs index 88bd40e3fb32..df9df93699a4 100644 --- a/datastores/gossip_kv/load_test_server/server.rs +++ b/datastores/gossip_kv/load_test_server/server.rs @@ -4,10 +4,10 @@ use std::thread::sleep; use std::time::Duration; use clap::Parser; +use dfir_rs::util::{unbounded_channel, unsync_channel}; use gossip_kv::membership::{MemberDataBuilder, Protocol}; use gossip_kv::{ClientRequest, GossipMessage}; use governor::{Quota, RateLimiter}; -use hydroflow::util::{unbounded_channel, unsync_channel}; use prometheus::{gather, Encoder, TextEncoder}; use tokio::sync::mpsc::UnboundedSender; use tokio::task; @@ -16,11 +16,11 @@ use warp::Filter; type LoadTestAddress = u64; +use dfir_rs::futures::sink::drain; +use dfir_rs::futures::stream; +use dfir_rs::tokio_stream::wrappers::UnboundedReceiverStream; +use dfir_rs::tokio_stream::StreamExt; use gossip_kv::server::{server, SeedNode}; -use hydroflow::futures::sink::drain; -use hydroflow::futures::stream; -use hydroflow::tokio_stream::wrappers::UnboundedReceiverStream; -use hydroflow::tokio_stream::StreamExt; use lattices::cc_traits::Iter; const UNKNOWN_ADDRESS: LoadTestAddress = 9999999999; diff --git a/datastores/gossip_kv/server/config/mod.rs b/datastores/gossip_kv/server/config/mod.rs index 13ff54873ad2..8df2aae8e96f 100644 --- a/datastores/gossip_kv/server/config/mod.rs +++ b/datastores/gossip_kv/server/config/mod.rs @@ -1,8 +1,8 @@ use std::path::PathBuf; use config::{Config, ConfigError, File}; -use hydroflow::futures::future::ready; -use hydroflow::futures::{Stream, StreamExt}; +use dfir_rs::futures::future::ready; +use dfir_rs::futures::{Stream, StreamExt}; use notify::{Event, EventHandler, EventKind, RecommendedWatcher, RecursiveMode, Watcher}; use serde::{Deserialize, Serialize}; use tokio::sync::mpsc::UnboundedSender; @@ -76,7 +76,7 @@ pub fn setup_settings_watch() -> ( ServerSettings, impl Stream, ) { - let (tx, rx) = hydroflow::util::unbounded_channel(); + let (tx, rx) = dfir_rs::util::unbounded_channel(); // Setup the watcher let mut watcher = notify::RecommendedWatcher::new( diff --git a/datastores/gossip_kv/server/main.rs b/datastores/gossip_kv/server/main.rs index bca640e9449b..656232842e75 100644 --- a/datastores/gossip_kv/server/main.rs +++ b/datastores/gossip_kv/server/main.rs @@ -8,12 +8,12 @@ use std::num::ParseFloatError; use std::time::Duration; use clap::Parser; +use dfir_rs::futures::{Sink, SinkExt, StreamExt}; +use dfir_rs::tokio_stream::wrappers::IntervalStream; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::{bincode, bytes, tokio}; use gossip_kv::membership::{MemberDataBuilder, Protocol}; use gossip_kv::server::{server, SeedNode}; -use hydroflow::futures::{Sink, SinkExt, StreamExt}; -use hydroflow::tokio_stream::wrappers::IntervalStream; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; -use hydroflow::{bincode, bytes, tokio}; use prometheus::{gather, Encoder, TextEncoder}; use serde::Serialize; use tracing::{error, info, trace}; @@ -82,7 +82,7 @@ where { outbound.with(|(msg, addr): (Message, SocketAddr)| { ready(Ok::<(bytes::Bytes, SocketAddr), Error>(( - hydroflow::util::serialize_to_bytes(msg), + dfir_rs::util::serialize_to_bytes(msg), addr, ))) }) @@ -91,15 +91,15 @@ where /// Setup deserialization for inbound networking messages. fn setup_inbound_deserialization( inbound: Inbound, -) -> impl hydroflow::futures::Stream +) -> impl dfir_rs::futures::Stream where - Inbound: hydroflow::futures::Stream>, + Inbound: dfir_rs::futures::Stream>, Message: for<'de> serde::Deserialize<'de> + Debug + Send + 'static, { inbound.filter_map(|input| { let mapped = match input { Ok((bytes, addr)) => { - let msg: bincode::Result = hydroflow::util::deserialize_from_bytes(&bytes); + let msg: bincode::Result = dfir_rs::util::deserialize_from_bytes(&bytes); match msg { Ok(msg) => Some((msg, addr)), Err(e) => { @@ -117,7 +117,7 @@ where }) } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { tracing_subscriber::fmt::init(); diff --git a/dfir_datalog/src/lib.rs b/dfir_datalog/src/lib.rs index bf09dabf4c44..d8b0853f4d9d 100644 --- a/dfir_datalog/src/lib.rs +++ b/dfir_datalog/src/lib.rs @@ -16,8 +16,8 @@ pub fn datalog(item: proc_macro::TokenStream) -> proc_macro::TokenStream { #item }; - let hydroflow_crate = proc_macro_crate::crate_name("hydroflow") - .expect("hydroflow should be present in `Cargo.toml`"); + let hydroflow_crate = + proc_macro_crate::crate_name("dfir_rs").expect("dfir_rs should be present in `Cargo.toml`"); let root = match hydroflow_crate { proc_macro_crate::FoundCrate::Itself => quote! { hydroflow }, proc_macro_crate::FoundCrate::Name(name) => { @@ -38,7 +38,7 @@ pub fn datalog(item: proc_macro::TokenStream) -> proc_macro::TokenStream { proc_macro::TokenStream::from(quote! { { #diagnostic_tokens - hydroflow::scheduled::graph::Hydroflow::new() + dfir_rs::scheduled::graph::Hydroflow::new() } }) } diff --git a/dfir_datalog_core/src/join_plan.rs b/dfir_datalog_core/src/join_plan.rs index b9e4f93a6859..66739bf39e9b 100644 --- a/dfir_datalog_core/src/join_plan.rs +++ b/dfir_datalog_core/src/join_plan.rs @@ -568,7 +568,7 @@ pub fn expand_join_plan( } else { flat_graph_builder.add_statement( parse_quote_spanned! {get_span(rule_span)=> - #join_node = join::<#lt_left, #lt_right, hydroflow::compiled::pull::HalfMultisetJoinState>() -> map(#flatten_closure); + #join_node = join::<#lt_left, #lt_right, dfir_rs::compiled::pull::HalfMultisetJoinState>() -> map(#flatten_closure); } ); } diff --git a/dfir_datalog_core/src/lib.rs b/dfir_datalog_core/src/lib.rs index 9d8384409f22..1b1b60eacdee 100644 --- a/dfir_datalog_core/src/lib.rs +++ b/dfir_datalog_core/src/lib.rs @@ -744,8 +744,8 @@ fn apply_aggregations( } Aggregation::CountUnique(..) => { parse_quote!({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(#val_at_index) { (set, prev.1 + 1) } else { @@ -755,7 +755,7 @@ fn apply_aggregations( } Aggregation::CollectVec(..) => { parse_quote!({ - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev; set.insert(#val_at_index); set }) @@ -777,14 +777,14 @@ fn apply_aggregations( } Aggregation::CountUnique(..) => { parse_quote!({ - let mut set = hydroflow::rustc_hash::FxHashSet::<_>::default(); + let mut set = dfir_rs::rustc_hash::FxHashSet::<_>::default(); set.insert(#val_at_index); (set, 1) }) } Aggregation::CollectVec(..) => { parse_quote!({ - let mut set = hydroflow::rustc_hash::FxHashSet::<_>::default(); + let mut set = dfir_rs::rustc_hash::FxHashSet::<_>::default(); set.insert(#val_at_index); set }) diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__aggregations_and_comments@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__aggregations_and_comments@datalog_program.snap index 6e6227b694c3..a5cbc8ce5665 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__aggregations_and_comments@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__aggregations_and_comments@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"union ()\"},\"version\":1},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , ((row . 0) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () . 1 , g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , (row . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev + val . 0) } else { Some (val . 0) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () , g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , (row . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev) } else { Some (val . 0) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () , g . 0 ,))\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1},{\"value\":{\"Operator\":\"identity ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":24,\"version\":1}],\"version\":5},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":14,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":1,\"version\":3},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":7,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":1,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":3},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":2,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":\"ints\",\"version\":1},{\"value\":\"result_insert\",\"version\":1},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":false,\"version\":1}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"union ()\"},\"version\":1},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , ((row . 0) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () . 1 , g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , (row . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev + val . 0) } else { Some (val . 0) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () , g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , (row . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev) } else { Some (val . 0) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () , g . 0 ,))\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1},{\"value\":{\"Operator\":\"identity ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":24,\"version\":1}],\"version\":5},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":14,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":1,\"version\":3},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":7,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":1,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":3},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":2,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":\"ints\",\"version\":1},{\"value\":\"result_insert\",\"version\":1},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":false,\"version\":1}]}", ); df.__assign_diagnostics("[]"); let (hoff_1v3_send, hoff_1v3_recv) = df @@ -414,8 +414,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -424,7 +424,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__aggregations_and_comments@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__aggregations_and_comments@surface_graph.snap index ecf12f46d17e..a5de206f275c 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__aggregations_and_comments@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__aggregations_and_comments@surface_graph.snap @@ -11,7 +11,7 @@ expression: flat_graph_ref.surface_syntax_string() 11v1 = for_each (| v | result . send (v) . unwrap ()); 12v1 = for_each (| v | result2 . send (v) . unwrap ()); 13v1 = map (| row : (_ , _ ,) | ((row . 1 ,) , ((row . 0) ,))); -14v1 = fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); +14v1 = fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); 15v1 = map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () . 1 , g . 0 ,)); 16v1 = map (| row : (_ , _ ,) | ((row . 1 ,) , (row . 0 ,))); 17v1 = fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev + val . 0) } else { Some (val . 0) } ; }); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__anti_join@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__anti_join@datalog_program.snap index eed00f58b001..136b066aec94 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__anti_join@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__anti_join@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints_1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints_2)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints_3)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"anti_join ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , (_ , _ ,)) | (kv . 0 . 0 , kv . 1 . 0 , kv . 1 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ , _ ,) | ((_v . 0 ,) , (_v . 1 , _v . 2 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (_v . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ ,) | ((row . 1 , row . 2 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":5},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":3},{\"idx\":21,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":12,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_4\",\"version\":1},{\"value\":\"join_4\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints_1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints_2)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints_3)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"anti_join ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , (_ , _ ,)) | (kv . 0 . 0 , kv . 1 . 0 , kv . 1 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ , _ ,) | ((_v . 0 ,) , (_v . 1 , _v . 2 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (_v . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ ,) | ((row . 1 , row . 2 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":5},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":3},{\"idx\":21,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":12,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_4\",\"version\":1},{\"value\":\"join_4\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let (hoff_6v3_send, hoff_6v3_recv) = df @@ -102,7 +102,7 @@ fn main() { let sg_1v1_node_17v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -112,7 +112,7 @@ fn main() { let sg_1v1_node_17v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -624,12 +624,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__anti_join@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__anti_join@surface_graph.snap index 033ca1cf572a..6c6b388656a1 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__anti_join@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__anti_join@surface_graph.snap @@ -10,7 +10,7 @@ expression: flat_graph_ref.surface_syntax_string() 14v1 = source_stream (ints_2); 15v1 = source_stream (ints_3); 16v1 = for_each (| v | result . send (v) . unwrap ()); -17v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +17v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 18v1 = map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,)); 19v1 = map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,))); 20v1 = map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,))); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__collect_vec@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__collect_vec@datalog_program.snap index e84a86da4748..63623ec13d9b 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__collect_vec@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__collect_vec@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : (() , ((_ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , ((row . 0 , row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev ; set . insert (val . 0) ; set }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; set }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () . into_iter () . collect :: < Vec < _ > > () ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : (() , ((_ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , ((row . 0 , row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev ; set . insert (val . 0) ; set }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; set }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () . into_iter () . collect :: < Vec < _ > > () ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let (hoff_9v3_send, hoff_9v3_recv) = df @@ -68,7 +68,7 @@ fn main() { let sg_2v1_node_13v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -78,7 +78,7 @@ fn main() { let sg_2v1_node_13v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -377,12 +377,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -577,13 +577,13 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev; set.insert(val.0); set }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__collect_vec@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__collect_vec@surface_graph.snap index dadacd2d8f15..869912b4e3da 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__collect_vec@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__collect_vec@surface_graph.snap @@ -8,12 +8,12 @@ expression: flat_graph_ref.surface_syntax_string() 10v1 = source_stream (ints1); 11v1 = source_stream (ints2); 12v1 = for_each (| v | result . send (v) . unwrap ()); -13v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +13v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 14v1 = map (| kv : (() , ((_ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,)); 15v1 = map (| _v : (_ ,) | (() , (_v . 0 ,))); 16v1 = map (| _v : (_ ,) | (() , (_v . 0 ,))); 17v1 = map (| row : (_ , _ ,) | (() , ((row . 0 , row . 1) ,))); -18v1 = fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev ; set . insert (val . 0) ; set }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; set }) } ; }); +18v1 = fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev ; set . insert (val . 0) ; set }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; set }) } ; }); 19v1 = map (| (g , a) : (() , _) | (a . 0 . unwrap () . into_iter () . collect :: < Vec < _ > > () ,)); 10v1 -> 2v1; diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__index@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__index@datalog_program.snap index 05b715ffda5a..086b522bcfae 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__index@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__index@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result3 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result4 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result5 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 ,) , ((row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ ,) , _)) | (g . 0 , a . 0 . unwrap () . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 ,) , ((row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'static , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ ,) , _)) | (g . 0 , a . 0 . unwrap () . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":35,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":25,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":39,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":23,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":45,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":3},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":49,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":3},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":52,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":15,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":12,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":41,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":27,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":29,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":31,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":34,\"version\":1},{\"idx\":35,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":33,\"version\":1},{\"idx\":34,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":33,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":38,\"version\":1},{\"idx\":39,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":37,\"version\":1},{\"idx\":38,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":36,\"version\":1},{\"idx\":21,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":36,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":21,\"version\":3},{\"idx\":37,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":40,\"version\":1},{\"idx\":16,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":3},{\"idx\":51,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":44,\"version\":1},{\"idx\":45,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":43,\"version\":1},{\"idx\":44,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":42,\"version\":1},{\"idx\":43,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":42,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":3},{\"idx\":47,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":48,\"version\":1},{\"idx\":49,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":47,\"version\":1},{\"idx\":48,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":46,\"version\":1},{\"idx\":13,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":46,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":3},{\"idx\":41,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":50,\"version\":1},{\"idx\":10,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":50,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":25,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":33,\"version\":1},{\"idx\":34,\"version\":1},{\"idx\":35,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":27,\"version\":1},{\"idx\":36,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":37,\"version\":1},{\"idx\":38,\"version\":1},{\"idx\":39,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":41,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":42,\"version\":1},{\"idx\":43,\"version\":1},{\"idx\":44,\"version\":1},{\"idx\":45,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":29,\"version\":1},{\"idx\":46,\"version\":1},{\"idx\":50,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":47,\"version\":1},{\"idx\":48,\"version\":1},{\"idx\":49,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":2,\"version\":1},{\"value\":1,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":\"ints\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result4_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result5_insert\",\"version\":1},{\"value\":\"result5\",\"version\":1},{\"value\":\"result5\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_persisted_insert\",\"version\":1},{\"value\":\"ints_persisted\",\"version\":1},{\"value\":\"ints_persisted\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result3 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result4 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result5 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 ,) , ((row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ ,) , _)) | (g . 0 , a . 0 . unwrap () . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 ,) , ((row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'static , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ ,) , _)) | (g . 0 , a . 0 . unwrap () . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":35,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":25,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":39,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":23,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":45,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":3},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":49,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":3},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":52,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":15,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":12,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":41,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":27,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":29,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":31,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":34,\"version\":1},{\"idx\":35,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":33,\"version\":1},{\"idx\":34,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":33,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":38,\"version\":1},{\"idx\":39,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":37,\"version\":1},{\"idx\":38,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":36,\"version\":1},{\"idx\":21,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":36,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":21,\"version\":3},{\"idx\":37,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":40,\"version\":1},{\"idx\":16,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":3},{\"idx\":51,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":44,\"version\":1},{\"idx\":45,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":43,\"version\":1},{\"idx\":44,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":42,\"version\":1},{\"idx\":43,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":42,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":3},{\"idx\":47,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":48,\"version\":1},{\"idx\":49,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":47,\"version\":1},{\"idx\":48,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":46,\"version\":1},{\"idx\":13,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":46,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":3},{\"idx\":41,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":50,\"version\":1},{\"idx\":10,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":50,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":25,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":33,\"version\":1},{\"idx\":34,\"version\":1},{\"idx\":35,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":27,\"version\":1},{\"idx\":36,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":37,\"version\":1},{\"idx\":38,\"version\":1},{\"idx\":39,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":41,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":42,\"version\":1},{\"idx\":43,\"version\":1},{\"idx\":44,\"version\":1},{\"idx\":45,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":29,\"version\":1},{\"idx\":46,\"version\":1},{\"idx\":50,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":47,\"version\":1},{\"idx\":48,\"version\":1},{\"idx\":49,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":2,\"version\":1},{\"value\":1,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":\"ints\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result4_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result5_insert\",\"version\":1},{\"value\":\"result5\",\"version\":1},{\"value\":\"result5\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_persisted_insert\",\"version\":1},{\"value\":\"ints_persisted\",\"version\":1},{\"value\":\"ints_persisted\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let (hoff_6v3_send, hoff_6v3_recv) = df @@ -790,8 +790,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -800,7 +800,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); @@ -1630,8 +1630,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -1640,7 +1640,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__index@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__index@surface_graph.snap index 82686feaa2e0..67d0385b8895 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__index@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__index@surface_graph.snap @@ -27,7 +27,7 @@ expression: flat_graph_ref.surface_syntax_string() 34v1 = enumerate :: < 'tick > (); 35v1 = map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,)); 36v1 = map (| row : (_ , _ ,) | ((row . 0 ,) , ((row . 1) ,))); -37v1 = fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); +37v1 = fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); 38v1 = enumerate :: < 'tick > (); 39v1 = map (| (__enumerate_index , (g , a)) : (_ , ((_ ,) , _)) | (g . 0 , a . 0 . unwrap () . 1 , __enumerate_index ,)); 40v1 = map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ())); @@ -37,7 +37,7 @@ expression: flat_graph_ref.surface_syntax_string() 44v1 = map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,)); 45v1 = persist :: < 'static > (); 46v1 = map (| row : (_ , _ ,) | ((row . 0 ,) , ((row . 1) ,))); -47v1 = fold_keyed :: < 'static , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); +47v1 = fold_keyed :: < 'static , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); 48v1 = enumerate :: < 'tick > (); 49v1 = map (| (__enumerate_index , (g , a)) : (_ , ((_ ,) , _)) | (g . 0 , a . 0 . unwrap () . 1 , __enumerate_index ,)); 50v1 = map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ())); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_other@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_other@datalog_program.snap index 86e1a6a7115c..14a72cb52c84 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_other@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_other@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ , _ ,) , (() , ())) | (kv . 0 . 0 , kv . 0 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 , _v . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 , _v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ , _ ,) , (() , ())) | (kv . 0 . 0 , kv . 0 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 , _v . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 , _v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let mut sg_1v1_node_10v1_stream = { @@ -63,7 +63,7 @@ fn main() { let sg_1v1_node_13v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -73,7 +73,7 @@ fn main() { let sg_1v1_node_13v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -361,12 +361,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_other@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_other@surface_graph.snap index ef42837efe80..1024330bdd95 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_other@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_other@surface_graph.snap @@ -8,7 +8,7 @@ expression: flat_graph_ref.surface_syntax_string() 10v1 = source_stream (in1); 11v1 = source_stream (in2); 12v1 = for_each (| v | out . send (v) . unwrap ()); -13v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +13v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 14v1 = map (| kv : ((_ , _ ,) , (() , ())) | (kv . 0 . 0 , kv . 0 . 1 ,)); 15v1 = map (| _v : (_ , _ ,) | ((_v . 0 , _v . 1 ,) , ())); 16v1 = map (| _v : (_ , _ ,) | ((_v . 1 , _v . 0 ,) , ())); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_self@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_self@datalog_program.snap index efa6b2266700..c65432360485 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_self@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_self@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ , _ ,) , (() , ())) | (kv . 0 . 0 , kv . 0 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 , _v . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 , _v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":3},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":\"input\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ , _ ,) , (() , ())) | (kv . 0 . 0 , kv . 0 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 , _v . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 , _v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":3},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":\"input\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let (hoff_4v3_send, hoff_4v3_recv) = df @@ -49,7 +49,7 @@ fn main() { let sg_2v1_node_9v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -59,7 +59,7 @@ fn main() { let sg_2v1_node_9v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -323,12 +323,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_self@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_self@surface_graph.snap index bb6d321646ae..73ddd80bb68c 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_self@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__join_with_self@surface_graph.snap @@ -7,7 +7,7 @@ expression: flat_graph_ref.surface_syntax_string() 5v1 = unique :: < 'tick > (); 7v1 = source_stream (input); 8v1 = for_each (| v | out . send (v) . unwrap ()); -9v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +9v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 10v1 = map (| kv : ((_ , _ ,) , (() , ())) | (kv . 0 . 0 , kv . 0 . 1 ,)); 11v1 = map (| _v : (_ , _ ,) | ((_v . 0 , _v . 1 ,) , ())); 12v1 = map (| _v : (_ , _ ,) | ((_v . 1 , _v . 0 ,) , ())); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist@datalog_program.snap index 7f0bbf10d379..0ffd89d0ccc6 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints3)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result3 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result4 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'static , 'static , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : (() , ((_ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'static , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : (() , ((_ , _ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 0 . 1 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | (() , (_v . 0 , _v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ ,) | ((row . 0 , row . 1 , row . 2 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ , _ ,) , _) | (g . 0 , g . 1 , g . 2 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"anti_join ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ()) | (kv . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (_v . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":34,\"version\":1},{\"idx\":14,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":28,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":25,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":35,\"version\":1},{\"idx\":11,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":22,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":19,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":36,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":13,\"version\":3},{\"idx\":33,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":50,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":3},{\"idx\":31,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":58,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":19,\"version\":3},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":63,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":22,\"version\":3},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":68,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":25,\"version\":3},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":61,\"version\":1},{\"idx\":27,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":28,\"version\":3},{\"idx\":3,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":65,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":30,\"version\":1},{\"idx\":31,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":33,\"version\":1},{\"idx\":16,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":32,\"version\":1},{\"idx\":13,\"version\":3}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":3},{\"idx\":7,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":37,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":38,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":39,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":41,\"version\":1},{\"idx\":42,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":43,\"version\":1},{\"idx\":41,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":29,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":44,\"version\":1},{\"idx\":41,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":26,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":45,\"version\":1},{\"idx\":46,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":47,\"version\":1},{\"idx\":45,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":42,\"version\":1},{\"idx\":47,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":48,\"version\":1},{\"idx\":45,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":48,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":3},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":49,\"version\":1},{\"idx\":50,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":46,\"version\":1},{\"idx\":49,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":54,\"version\":1},{\"idx\":51,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":53,\"version\":1},{\"idx\":54,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":23,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":56,\"version\":1},{\"idx\":20,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":55,\"version\":1},{\"idx\":56,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":55,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":3},{\"idx\":65,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":57,\"version\":1},{\"idx\":58,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":52,\"version\":1},{\"idx\":57,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":3},{\"idx\":44,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":60,\"version\":1},{\"idx\":61,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":59,\"version\":1},{\"idx\":60,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":59,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":3},{\"idx\":51,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":62,\"version\":1},{\"idx\":63,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":27,\"version\":1},{\"idx\":62,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":29,\"version\":3},{\"idx\":43,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":64,\"version\":1},{\"idx\":17,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":64,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":3},{\"idx\":53,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":67,\"version\":1},{\"idx\":68,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":66,\"version\":1},{\"idx\":67,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":32,\"version\":1},{\"idx\":66,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"3\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":9,\"version\":1},\"version\":1},{\"value\":{\"idx\":10,\"version\":1},\"version\":1},{\"value\":{\"idx\":11,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":33,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":43,\"version\":1},{\"idx\":44,\"version\":1},{\"idx\":41,\"version\":1},{\"idx\":42,\"version\":1},{\"idx\":47,\"version\":1},{\"idx\":48,\"version\":1},{\"idx\":45,\"version\":1},{\"idx\":46,\"version\":1},{\"idx\":49,\"version\":1},{\"idx\":50,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":37,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":53,\"version\":1},{\"idx\":54,\"version\":1},{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1},{\"idx\":57,\"version\":1},{\"idx\":58,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":38,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":59,\"version\":1},{\"idx\":60,\"version\":1},{\"idx\":61,\"version\":1},{\"idx\":27,\"version\":1},{\"idx\":62,\"version\":1},{\"idx\":63,\"version\":1},{\"idx\":21,\"version\":1},{\"idx\":39,\"version\":1},{\"idx\":64,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":65,\"version\":1},{\"idx\":30,\"version\":1},{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1},{\"idx\":66,\"version\":1},{\"idx\":67,\"version\":1},{\"idx\":68,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":55,\"version\":1},{\"idx\":56,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":34,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":35,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":36,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":1,\"version\":1},{\"value\":2,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":\"ints2\",\"version\":1},{\"value\":\"ints2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result4_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"intermediate_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"intermediate_persist_insert\",\"version\":1},{\"value\":\"intermediate_persist\",\"version\":1},{\"value\":\"intermediate_persist\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_4\",\"version\":1},{\"value\":\"join_4\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_7\",\"version\":1},{\"value\":\"join_7\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints3)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result3 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result4 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'static , 'static , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : (() , ((_ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'static , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : (() , ((_ , _ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 0 . 1 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | (() , (_v . 0 , _v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ ,) | ((row . 0 , row . 1 , row . 2 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ , _ ,) , _) | (g . 0 , g . 1 , g . 2 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"anti_join ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ()) | (kv . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (_v . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":34,\"version\":1},{\"idx\":14,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":28,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":25,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":35,\"version\":1},{\"idx\":11,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":22,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":19,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":36,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":13,\"version\":3},{\"idx\":33,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":50,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":3},{\"idx\":31,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":58,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":19,\"version\":3},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":63,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":22,\"version\":3},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":68,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":25,\"version\":3},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":61,\"version\":1},{\"idx\":27,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":28,\"version\":3},{\"idx\":3,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":65,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":30,\"version\":1},{\"idx\":31,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":33,\"version\":1},{\"idx\":16,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":32,\"version\":1},{\"idx\":13,\"version\":3}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":3},{\"idx\":7,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":37,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":38,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":39,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":41,\"version\":1},{\"idx\":42,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":43,\"version\":1},{\"idx\":41,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":29,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":44,\"version\":1},{\"idx\":41,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":26,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":45,\"version\":1},{\"idx\":46,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":47,\"version\":1},{\"idx\":45,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":42,\"version\":1},{\"idx\":47,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":48,\"version\":1},{\"idx\":45,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":48,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":3},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":49,\"version\":1},{\"idx\":50,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":46,\"version\":1},{\"idx\":49,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":54,\"version\":1},{\"idx\":51,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":53,\"version\":1},{\"idx\":54,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":23,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":56,\"version\":1},{\"idx\":20,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":55,\"version\":1},{\"idx\":56,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":55,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":3},{\"idx\":65,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":57,\"version\":1},{\"idx\":58,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":52,\"version\":1},{\"idx\":57,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":3},{\"idx\":44,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":60,\"version\":1},{\"idx\":61,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":59,\"version\":1},{\"idx\":60,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":59,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":3},{\"idx\":51,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":62,\"version\":1},{\"idx\":63,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":27,\"version\":1},{\"idx\":62,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":29,\"version\":3},{\"idx\":43,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":64,\"version\":1},{\"idx\":17,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":64,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":3},{\"idx\":53,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":67,\"version\":1},{\"idx\":68,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":66,\"version\":1},{\"idx\":67,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":32,\"version\":1},{\"idx\":66,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"3\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":9,\"version\":1},\"version\":1},{\"value\":{\"idx\":10,\"version\":1},\"version\":1},{\"value\":{\"idx\":11,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":33,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":43,\"version\":1},{\"idx\":44,\"version\":1},{\"idx\":41,\"version\":1},{\"idx\":42,\"version\":1},{\"idx\":47,\"version\":1},{\"idx\":48,\"version\":1},{\"idx\":45,\"version\":1},{\"idx\":46,\"version\":1},{\"idx\":49,\"version\":1},{\"idx\":50,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":37,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":53,\"version\":1},{\"idx\":54,\"version\":1},{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1},{\"idx\":57,\"version\":1},{\"idx\":58,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":38,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":59,\"version\":1},{\"idx\":60,\"version\":1},{\"idx\":61,\"version\":1},{\"idx\":27,\"version\":1},{\"idx\":62,\"version\":1},{\"idx\":63,\"version\":1},{\"idx\":21,\"version\":1},{\"idx\":39,\"version\":1},{\"idx\":64,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":65,\"version\":1},{\"idx\":30,\"version\":1},{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1},{\"idx\":66,\"version\":1},{\"idx\":67,\"version\":1},{\"idx\":68,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":55,\"version\":1},{\"idx\":56,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":34,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":35,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":36,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":1,\"version\":1},{\"value\":2,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":\"ints2\",\"version\":1},{\"value\":\"ints2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result4_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"intermediate_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"intermediate_persist_insert\",\"version\":1},{\"value\":\"intermediate_persist\",\"version\":1},{\"value\":\"intermediate_persist\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_4\",\"version\":1},{\"value\":\"join_4\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_7\",\"version\":1},{\"value\":\"join_7\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let (hoff_6v3_send, hoff_6v3_recv) = df @@ -139,25 +139,25 @@ fn main() { let sg_4v1_node_41v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); let sg_4v1_node_41v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); let sg_4v1_node_45v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); let sg_4v1_node_45v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -839,12 +839,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -1029,12 +1029,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist@surface_graph.snap index e928aaefed1f..06c22e5ff80d 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist@surface_graph.snap @@ -27,11 +27,11 @@ expression: flat_graph_ref.surface_syntax_string() 38v1 = for_each (| v | result2 . send (v) . unwrap ()); 39v1 = for_each (| v | result3 . send (v) . unwrap ()); 40v1 = for_each (| v | result4 . send (v) . unwrap ()); -41v1 = join :: < 'static , 'static , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +41v1 = join :: < 'static , 'static , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 42v1 = map (| kv : (() , ((_ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,)); 43v1 = map (| _v : (_ ,) | (() , (_v . 0 ,))); 44v1 = map (| _v : (_ ,) | (() , (_v . 0 ,))); -45v1 = join :: < 'static , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +45v1 = join :: < 'static , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 46v1 = map (| kv : (() , ((_ , _ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 0 . 1 , kv . 1 . 1 . 0 ,)); 47v1 = map (| _v : (_ , _ ,) | (() , (_v . 0 , _v . 1 ,))); 48v1 = map (| _v : (_ ,) | (() , (_v . 0 ,))); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist_uniqueness@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist_uniqueness@datalog_program.snap index 79468d88b767..1c7b3843e150 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist_uniqueness@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist_uniqueness@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | (() , ((row . 0) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'static , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":11,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":8,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":8,\"version\":3},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":3},{\"idx\":3,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":7,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":2,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | (() , ((row . 0) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'static , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":11,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":8,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":8,\"version\":3},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":3},{\"idx\":3,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":7,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":2,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let (hoff_6v3_send, hoff_6v3_recv) = df @@ -269,8 +269,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -279,7 +279,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist_uniqueness@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist_uniqueness@surface_graph.snap index a64146623be0..b7c70c6bac7c 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist_uniqueness@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__persist_uniqueness@surface_graph.snap @@ -13,7 +13,7 @@ expression: flat_graph_ref.surface_syntax_string() 14v1 = map (| row : (_ ,) | ((row . 0 ,) , ())); 15v1 = map (| (g , a) : ((_ ,) , _) | (g . 0 ,)); 16v1 = map (| row : (_ ,) | (() , ((row . 0) ,))); -17v1 = fold_keyed :: < 'static , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); +17v1 = fold_keyed :: < 'static , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); 18v1 = map (| (g , a) : (() , _) | (a . 0 . unwrap () . 1 ,)); 15v1 -> 2v1; diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__single_column_program@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__single_column_program@datalog_program.snap index f1d464ba8c1b..2db3ab0a4d76 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__single_column_program@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__single_column_program@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , (() , ())) | (kv . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , (() , ())) | (kv . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let mut sg_1v1_node_10v1_stream = { @@ -63,7 +63,7 @@ fn main() { let sg_1v1_node_13v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -73,7 +73,7 @@ fn main() { let sg_1v1_node_13v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -361,12 +361,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__single_column_program@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__single_column_program@surface_graph.snap index 19eded519dc8..0e3204520086 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__single_column_program@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__single_column_program@surface_graph.snap @@ -8,7 +8,7 @@ expression: flat_graph_ref.surface_syntax_string() 10v1 = source_stream (in1); 11v1 = source_stream (in2); 12v1 = for_each (| v | out . send (v) . unwrap ()); -13v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +13v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 14v1 = map (| kv : ((_ ,) , (() , ())) | (kv . 0 . 0 ,)); 15v1 = map (| _v : (_ ,) | ((_v . 0 ,) , ())); 16v1 = map (| _v : (_ ,) | ((_v . 0 ,) , ())); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__transitive_closure@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__transitive_closure@datalog_program.snap index 3584873bb0d5..394cbfa1a23d 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__transitive_closure@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__transitive_closure@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"union ()\"},\"version\":1},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (edges)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (seed_reachable)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | reachable . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , (() , (_ ,))) | (kv . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":7,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":7,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"edges_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"seed_reachable_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"reachable_insert\",\"version\":1},{\"value\":\"reachable_insert\",\"version\":1},{\"value\":\"reachable\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_3\",\"version\":1},{\"value\":\"join_3\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"union ()\"},\"version\":1},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (edges)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (seed_reachable)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | reachable . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , (() , (_ ,))) | (kv . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":7,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":7,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"edges_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"seed_reachable_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"reachable_insert\",\"version\":1},{\"value\":\"reachable_insert\",\"version\":1},{\"value\":\"reachable\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_3\",\"version\":1},{\"value\":\"join_3\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let (hoff_6v3_send, hoff_6v3_recv) = df @@ -68,7 +68,7 @@ fn main() { let sg_1v1_node_15v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -78,7 +78,7 @@ fn main() { let sg_1v1_node_15v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -447,12 +447,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__transitive_closure@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__transitive_closure@surface_graph.snap index eba476208122..676a78673c61 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__transitive_closure@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__transitive_closure@surface_graph.snap @@ -12,7 +12,7 @@ expression: flat_graph_ref.surface_syntax_string() 12v1 = for_each (| v | reachable . send (v) . unwrap ()); 13v1 = map (| row : (_ ,) | ((row . 0 ,) , ())); 14v1 = map (| (g , a) : ((_ ,) , _) | (g . 0 ,)); -15v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +15v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 16v1 = map (| kv : ((_ ,) , (() , (_ ,))) | (kv . 0 . 0 , kv . 1 . 1 . 0 ,)); 17v1 = map (| _v : (_ ,) | ((_v . 0 ,) , ())); 18v1 = map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,))); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__triple_relation_join@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__triple_relation_join@datalog_program.snap index f7c05b0ce437..d8df47b86c40 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__triple_relation_join@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__triple_relation_join@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in3)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ , _ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 0 . 1 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ , _ ,) | ((_v . 2 ,) , (_v . 1 , _v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ , _ ,) | ((row . 3 , row . 0 , row . 2 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ , _ , _ ,) , _) | (g . 0 , g . 1 , g . 2 , g . 3 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_4\",\"version\":1},{\"value\":\"join_4\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in3)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ , _ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 0 . 1 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ , _ ,) | ((_v . 2 ,) , (_v . 1 , _v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ , _ ,) | ((row . 3 , row . 0 , row . 2 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ , _ , _ ,) , _) | (g . 0 , g . 1 , g . 2 , g . 3 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_4\",\"version\":1},{\"value\":\"join_4\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let mut sg_1v1_node_13v1_stream = { @@ -87,7 +87,7 @@ fn main() { let sg_1v1_node_17v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -97,7 +97,7 @@ fn main() { let sg_1v1_node_17v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -107,7 +107,7 @@ fn main() { let sg_1v1_node_21v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -117,7 +117,7 @@ fn main() { let sg_1v1_node_21v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -495,12 +495,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -685,12 +685,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__triple_relation_join@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__triple_relation_join@surface_graph.snap index 2f0bced1151c..a83e722e9ee4 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__triple_relation_join@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__triple_relation_join@surface_graph.snap @@ -10,11 +10,11 @@ expression: flat_graph_ref.surface_syntax_string() 14v1 = source_stream (in2); 15v1 = source_stream (in3); 16v1 = for_each (| v | out . send (v) . unwrap ()); -17v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +17v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 18v1 = map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,)); 19v1 = map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,))); 20v1 = map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,))); -21v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +21v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 22v1 = map (| kv : ((_ ,) , ((_ , _ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 0 . 1 , kv . 1 . 1 . 0 ,)); 23v1 = map (| _v : (_ , _ , _ ,) | ((_v . 2 ,) , (_v . 1 , _v . 0 ,))); 24v1 = map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,))); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_fields@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_fields@datalog_program.snap index 5db39fd5f303..b288a35e5ea4 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_fields@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_fields@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":3},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":\"input\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":3},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":\"input\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let (hoff_4v3_send, hoff_4v3_recv) = df @@ -49,7 +49,7 @@ fn main() { let sg_2v1_node_9v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -59,7 +59,7 @@ fn main() { let sg_2v1_node_9v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -323,12 +323,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_fields@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_fields@surface_graph.snap index 82cfea328454..8046348f3509 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_fields@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_fields@surface_graph.snap @@ -7,7 +7,7 @@ expression: flat_graph_ref.surface_syntax_string() 5v1 = unique :: < 'tick > (); 7v1 = source_stream (input); 8v1 = for_each (| v | out . send (v) . unwrap ()); -9v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +9v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 10v1 = map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,)); 11v1 = map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,))); 12v1 = map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,))); diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_join_count@datalog_program.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_join_count@datalog_program.snap index dd39d2b08607..0c1f0588c0fd 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_join_count@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_join_count@datalog_program.snap @@ -9,7 +9,7 @@ fn main() { use hydroflow::{var_expr, var_args}; let mut df = hydroflow::scheduled::graph::Hydroflow::new(); df.__assign_meta_graph( - "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , ())) | (kv . 0 . 0 , kv . 1 . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , (() ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev + 1) } else { Some (1) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () ,))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , ())) | (kv . 0 . 0 , kv . 1 . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , ((row . 0) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":6,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":30,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":3},{\"idx\":19,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":1,\"version\":3},{\"idx\":29,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":3},{\"idx\":27,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":12,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":7,\"version\":3},{\"idx\":26,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":10,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":7,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":27,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":1},{\"idx\":4,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":10,\"version\":3},{\"idx\":22,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":29,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":28,\"version\":1},{\"idx\":1,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":6,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":29,\"version\":1},{\"idx\":30,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":27,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":25,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":\"ints2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_5\",\"version\":1},{\"value\":\"join_5\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", + "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , ())) | (kv . 0 . 0 , kv . 1 . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , (() ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev + 1) } else { Some (1) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () ,))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , ())) | (kv . 0 . 0 , kv . 1 . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , ((row . 0) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":6,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":30,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":3},{\"idx\":19,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":1,\"version\":3},{\"idx\":29,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":3},{\"idx\":27,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":12,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":7,\"version\":3},{\"idx\":26,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":10,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":7,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":27,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":1},{\"idx\":4,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":10,\"version\":3},{\"idx\":22,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":29,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":28,\"version\":1},{\"idx\":1,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":6,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":29,\"version\":1},{\"idx\":30,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":27,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":25,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":\"ints2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_5\",\"version\":1},{\"value\":\"join_5\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); df.__assign_diagnostics("[]"); let (hoff_1v3_send, hoff_1v3_recv) = df @@ -123,7 +123,7 @@ fn main() { let sg_5v1_node_17v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -133,7 +133,7 @@ fn main() { let sg_5v1_node_17v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -143,7 +143,7 @@ fn main() { let sg_6v1_node_24v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -153,7 +153,7 @@ fn main() { let sg_6v1_node_24v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( @@ -728,8 +728,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -738,7 +738,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); @@ -1017,12 +1017,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -1275,12 +1275,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, diff --git a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_join_count@surface_graph.snap b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_join_count@surface_graph.snap index 6d3353ab3600..8db20edc77ab 100644 --- a/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_join_count@surface_graph.snap +++ b/dfir_datalog_core/src/snapshots/dfir_datalog_core__tests__wildcard_join_count@surface_graph.snap @@ -12,19 +12,19 @@ expression: flat_graph_ref.surface_syntax_string() 14v1 = source_stream (ints2); 15v1 = for_each (| v | result . send (v) . unwrap ()); 16v1 = for_each (| v | result2 . send (v) . unwrap ()); -17v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +17v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 18v1 = map (| kv : ((_ ,) , ((_ ,) , ())) | (kv . 0 . 0 , kv . 1 . 0 . 0 ,)); 19v1 = map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,))); 20v1 = map (| _v : (_ ,) | ((_v . 0 ,) , ())); 21v1 = map (| row : (_ , _ ,) | (() , (() ,))); 22v1 = fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev + 1) } else { Some (1) } ; }); 23v1 = map (| (g , a) : (() , _) | (a . 0 . unwrap () ,)); -24v1 = join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > (); +24v1 = join :: < 'tick , 'tick , dfir_rs :: compiled :: pull :: HalfMultisetJoinState > (); 25v1 = map (| kv : ((_ ,) , ((_ ,) , ())) | (kv . 0 . 0 , kv . 1 . 0 . 0 ,)); 26v1 = map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,))); 27v1 = map (| _v : (_ ,) | ((_v . 0 ,) , ())); 28v1 = map (| row : (_ , _ ,) | (() , ((row . 0) ,))); -29v1 = fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); +29v1 = fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (dfir_rs :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : dfir_rs :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = dfir_rs :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; }); 30v1 = map (| (g , a) : (() , _) | (a . 0 . unwrap () . 1 ,)); 13v1 -> 2v1; diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__aggregations_and_comments@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__aggregations_and_comments@datalog_program.snap index 6e6227b694c3..2b3c9204830a 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__aggregations_and_comments@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__aggregations_and_comments@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"union ()\"},\"version\":1},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , ((row . 0) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () . 1 , g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , (row . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev + val . 0) } else { Some (val . 0) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () , g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , (row . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev) } else { Some (val . 0) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () , g . 0 ,))\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1},{\"value\":{\"Operator\":\"identity ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":24,\"version\":1}],\"version\":5},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":14,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":1,\"version\":3},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":7,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":1,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":3},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":2,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":\"ints\",\"version\":1},{\"value\":\"result_insert\",\"version\":1},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":false,\"version\":1}]}", ); @@ -15,42 +15,42 @@ fn main() { let (hoff_1v3_send, hoff_1v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(1v3)"); let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let (hoff_7v3_send, hoff_7v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(7v3)"); let (hoff_9v3_send, hoff_9v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(9v3)"); let (hoff_23v1_send, hoff_23v1_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(23v1)"); let (hoff_25v1_send, hoff_25v1_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(25v1)"); let mut sg_5v1_node_10v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -60,46 +60,46 @@ fn main() { let sg_5v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_14v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_2v1_node_21v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), ), ); let sg_2v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_3v1_node_17v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), ), ); df.add_subgraph_stratified( @@ -113,23 +113,23 @@ fn main() { var_args!(), var_args!(hoff_1v3_send, hoff_9v3_send, hoff_23v1_send)| { - let hoff_1v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_1v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_1v3_send.give(Some(v)); }); - let hoff_9v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_9v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_9v3_send.give(Some(v)); }); - let hoff_23v1_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_23v1_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_23v1_send.give(Some(v)); }); let op_10v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_5v1_node_10v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -218,7 +218,7 @@ fn main() { } op_2v1__unique__loc_nopath_3_19_3_23(op_2v1) }; - let op_20v1 = hydroflow::pusherator::map::Map::new( + let op_20v1 = dfir_rs::pusherator::map::Map::new( |row: (_, _)| ((row.1,), (row.0,)), hoff_23v1_send, ); @@ -227,21 +227,21 @@ fn main() { #[inline(always)] pub fn op_20v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -252,7 +252,7 @@ fn main() { } op_20v1__map__loc_nopath_1_0_1_0(op_20v1) }; - let op_16v1 = hydroflow::pusherator::map::Map::new( + let op_16v1 = dfir_rs::pusherator::map::Map::new( |row: (_, _)| ((row.1,), (row.0,)), hoff_1v3_send, ); @@ -261,21 +261,21 @@ fn main() { #[inline(always)] pub fn op_16v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -286,7 +286,7 @@ fn main() { } op_16v1__map__loc_nopath_1_0_1_0(op_16v1) }; - let op_13v1 = hydroflow::pusherator::map::Map::new( + let op_13v1 = dfir_rs::pusherator::map::Map::new( |row: (_, _)| ((row.1,), ((row.0),)), hoff_9v3_send, ); @@ -295,21 +295,21 @@ fn main() { #[inline(always)] pub fn op_13v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -320,30 +320,30 @@ fn main() { } op_13v1__map__loc_nopath_1_0_1_0(op_13v1) }; - let op_3v1 = hydroflow::pusherator::tee::Tee::new( + let op_3v1 = dfir_rs::pusherator::tee::Tee::new( op_13v1, - hydroflow::pusherator::tee::Tee::new(op_16v1, op_20v1), + dfir_rs::pusherator::tee::Tee::new(op_16v1, op_20v1), ); let op_3v1 = { #[allow(non_snake_case)] #[inline(always)] pub fn op_3v1__tee__loc_nopath_3_19_3_23< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -357,10 +357,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_5v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_5v1(op_2v1, op_3v1); }, @@ -414,8 +414,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -424,7 +424,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); @@ -638,7 +638,7 @@ fn main() { } op_5v1__unique__loc_nopath_4_20_4_26(op_5v1) }; - let op_11v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_11v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_11v1 = { @@ -646,21 +646,21 @@ fn main() { #[inline(always)] pub fn op_11v1__for_each__loc_nopath_4_28_4_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -674,10 +674,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_11v1); }, @@ -855,7 +855,7 @@ fn main() { } op_8v1__unique__loc_nopath_5_20_5_27(op_8v1) }; - let op_12v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_12v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result2.send(v).unwrap() }); let op_12v1 = { @@ -863,21 +863,21 @@ fn main() { #[inline(always)] pub fn op_12v1__for_each__loc_nopath_5_29_5_67< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -891,10 +891,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_8v1, op_12v1); }, @@ -908,7 +908,7 @@ fn main() { move |context, var_args!(hoff_1v3_recv), var_args!(hoff_7v3_send)| { let mut hoff_1v3_recv = hoff_1v3_recv.borrow_mut_swap(); let hoff_1v3_recv = hoff_1v3_recv.drain(..); - let hoff_7v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_7v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_7v3_send.give(Some(v)); @@ -994,10 +994,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_3v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_3v1(op_17v1, hoff_7v3_send); }, @@ -1011,7 +1011,7 @@ fn main() { move |context, var_args!(hoff_7v3_recv), var_args!(hoff_6v3_send)| { let mut hoff_7v3_recv = hoff_7v3_recv.borrow_mut_swap(); let hoff_7v3_recv = hoff_7v3_recv.drain(..); - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); @@ -1057,10 +1057,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_4v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_4v1(op_18v1, hoff_6v3_send); }, @@ -1074,7 +1074,7 @@ fn main() { move |context, var_args!(hoff_6v3_recv), var_args!(hoff_25v1_send)| { let mut hoff_6v3_recv = hoff_6v3_recv.borrow_mut_swap(); let hoff_6v3_recv = hoff_6v3_recv.drain(..); - let hoff_25v1_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_25v1_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_25v1_send.give(Some(v)); @@ -1122,10 +1122,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_6v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_6v1(op_24v1, hoff_25v1_send); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__aggregations_fold_keyed_expr@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__aggregations_fold_keyed_expr@datalog_program.snap index d70b84c9bdf8..c02c6004342c 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__aggregations_fold_keyed_expr@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__aggregations_fold_keyed_expr@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 % 2 ,) , (row . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev + val . 0) } else { Some (val . 0) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 , a . 0 . unwrap () ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,17 +15,17 @@ fn main() { let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let mut sg_2v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -35,24 +35,24 @@ fn main() { let sg_2v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_10v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -63,13 +63,13 @@ fn main() { var_expr!(hoff_6v3_send), false, move |context, var_args!(), var_args!(hoff_6v3_send)| { - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_2v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -198,10 +198,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_9v1, hoff_6v3_send); }, @@ -379,7 +379,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -387,21 +387,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_28_3_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -415,10 +415,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__anti_join@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__anti_join@datalog_program.snap index eed00f58b001..54f115e94c25 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__anti_join@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__anti_join@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints_1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints_2)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints_3)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"anti_join ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , (_ , _ ,)) | (kv . 0 . 0 , kv . 1 . 0 , kv . 1 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ , _ ,) | ((_v . 0 ,) , (_v . 1 , _v . 2 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (_v . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ ,) | ((row . 1 , row . 2 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":5},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":3},{\"idx\":21,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":12,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_4\",\"version\":1},{\"value\":\"join_4\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,27 +15,27 @@ fn main() { let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let (hoff_9v3_send, hoff_9v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(9v3)"); let (hoff_12v3_send, hoff_12v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(12v3)"); let mut sg_2v1_node_15v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -45,21 +45,21 @@ fn main() { let sg_2v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_3v1_node_13v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -69,12 +69,12 @@ fn main() { let mut sg_4v1_node_14v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -84,65 +84,65 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_17v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_17v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_17v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_17v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_21v1_antijoindata_neg = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_21v1_antijoindata_pos = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_11v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -153,13 +153,13 @@ fn main() { var_expr!(hoff_12v3_send), false, move |context, var_args!(), var_args!(hoff_12v3_send)| { - let hoff_12v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_12v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_12v3_send.give(Some(v)); }); let op_15v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_2v1_node_15v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -288,10 +288,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_24v1, hoff_12v3_send); }, @@ -303,13 +303,13 @@ fn main() { var_expr!(hoff_9v3_send), false, move |context, var_args!(), var_args!(hoff_9v3_send)| { - let hoff_9v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_9v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_9v3_send.give(Some(v)); }); let op_13v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_3v1_node_13v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -352,10 +352,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_3v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_3v1(op_13v1, hoff_9v3_send); }, @@ -367,13 +367,13 @@ fn main() { var_expr!(hoff_6v3_send), false, move |context, var_args!(), var_args!(hoff_6v3_send)| { - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); let op_14v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_4v1_node_14v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -416,10 +416,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_4v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_4v1(op_14v1, hoff_6v3_send); }, @@ -624,12 +624,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -643,7 +643,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -778,8 +778,8 @@ fn main() { fn check_inputs<'a, K, I1, V, I2>( input_neg: I1, input_pos: I2, - neg_state: &'a mut hydroflow::rustc_hash::FxHashSet, - pos_state: &'a mut hydroflow::rustc_hash::FxHashSet<(K, V)>, + neg_state: &'a mut dfir_rs::rustc_hash::FxHashSet, + pos_state: &'a mut dfir_rs::rustc_hash::FxHashSet<(K, V)>, is_new_tick: bool, ) -> impl 'a + Iterator where @@ -789,7 +789,7 @@ fn main() { I2: 'a + Iterator, { neg_state.extend(input_neg); - hydroflow::compiled::pull::anti_join_into_iter( + dfir_rs::compiled::pull::anti_join_into_iter( input_pos, neg_state, pos_state, @@ -999,7 +999,7 @@ fn main() { } op_11v1__unique__loc_nopath_5_20_5_26(op_11v1) }; - let op_16v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_16v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_16v1 = { @@ -1007,21 +1007,21 @@ fn main() { #[inline(always)] pub fn op_16v1__for_each__loc_nopath_5_28_5_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1035,10 +1035,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_11v1, op_16v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__collect_vec@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__collect_vec@datalog_program.snap index e84a86da4748..fac2d144ef30 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__collect_vec@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__collect_vec@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : (() , ((_ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , ((row . 0 , row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev ; set . insert (val . 0) ; set }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; set }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () . into_iter () . collect :: < Vec < _ > > () ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,17 +15,17 @@ fn main() { let (hoff_9v3_send, hoff_9v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(9v3)"); let mut sg_2v1_node_10v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -35,21 +35,21 @@ fn main() { let sg_2v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_2v1_node_11v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -59,44 +59,44 @@ fn main() { let sg_2v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_2v1_node_13v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_2v1_node_13v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_2v1_node_13v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_2v1_node_13v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_18v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(), (Option<_>,)>::default(), ), ); let sg_1v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -107,13 +107,13 @@ fn main() { var_expr!(hoff_9v3_send), false, move |context, var_args!(), var_args!(hoff_9v3_send)| { - let hoff_9v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_9v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_9v3_send.give(Some(v)); }); let op_10v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_2v1_node_10v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -203,7 +203,7 @@ fn main() { op_2v1__unique__loc_nopath_2_19_2_24(op_2v1) }; let op_11v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_2v1_node_11v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -377,12 +377,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -396,7 +396,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -522,10 +522,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_17v1, hoff_9v3_send); }, @@ -577,13 +577,13 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev; set.insert(val.0); set }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); @@ -716,7 +716,7 @@ fn main() { } op_8v1__unique__loc_nopath_5_20_5_26(op_8v1) }; - let op_12v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_12v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_12v1 = { @@ -724,21 +724,21 @@ fn main() { #[inline(always)] pub fn op_12v1__for_each__loc_nopath_5_28_5_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -752,10 +752,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_8v1, op_12v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__detuple@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__detuple@datalog_program.snap index 51e4b3e611a9..3d6a1f5c7d1d 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__detuple@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__detuple@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row_untuple : (_ ,) | (row_untuple . 0 . 0 , row_untuple . 0 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"source_reader_0\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -303,7 +303,7 @@ fn main() { } op_5v1__unique__loc_nopath_4_20_4_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -311,21 +311,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_4_28_4_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -339,10 +339,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__detuple_then_flat@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__detuple_then_flat@datalog_program.snap index 0663e5bb61f4..7b60943d3223 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__detuple_then_flat@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__detuple_then_flat@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row_untuple : (_ ,) | (row_untuple . 0 . 0 , row_untuple . 0 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"flat_map (| row : (_ , _ ,) | row . 0 . into_iter () . map (move | __flattened_element | (__flattened_element , :: std :: clone :: Clone :: clone (& row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"flat_map (| row : (_ , _ ,) | row . 1 . into_iter () . map (move | __flattened_element | (:: std :: clone :: Clone :: clone (& row . 0) , __flattened_element ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"source_reader_0\",\"version\":1},{\"value\":\"source_reader_0\",\"version\":1},{\"value\":\"source_reader_0\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -387,7 +387,7 @@ fn main() { } op_5v1__unique__loc_nopath_4_20_4_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -395,21 +395,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_4_28_4_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -423,10 +423,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__expr_lhs@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__expr_lhs@datalog_program.snap index 8ac59a220209..4936922037d5 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__expr_lhs@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__expr_lhs@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"union ()\"},\"version\":1},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((123 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 + 123 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 . clone () + row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((123 - row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((123 % (row . 0 + 5) ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 * 5 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":9,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":1,\"version\":3},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":1,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"2\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"3\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"3\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"4\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"4\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"5\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"5\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":\"ints\",\"version\":1},{\"value\":\"result_insert\",\"version\":1},{\"value\":\"result_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,42 +15,42 @@ fn main() { let (hoff_1v3_send, hoff_1v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(1v3)"); let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let (hoff_21v1_send, hoff_21v1_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(21v1)"); let (hoff_22v1_send, hoff_22v1_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(22v1)"); let (hoff_23v1_send, hoff_23v1_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(23v1)"); let (hoff_24v1_send, hoff_24v1_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(24v1)"); let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -60,18 +60,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_2v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -92,38 +92,38 @@ fn main() { hoff_23v1_send, hoff_24v1_send )| { - let hoff_1v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_1v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_1v3_send.give(Some(v)); }); - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); - let hoff_21v1_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_21v1_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_21v1_send.give(Some(v)); }); - let hoff_22v1_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_22v1_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_22v1_send.give(Some(v)); }); - let hoff_23v1_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_23v1_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_23v1_send.give(Some(v)); }); - let hoff_24v1_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_24v1_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_24v1_send.give(Some(v)); }); let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -212,15 +212,15 @@ fn main() { } op_2v1__unique__loc_nopath_2_19_2_23(op_2v1) }; - let op_3v1 = hydroflow::pusherator::tee::Tee::new( + let op_3v1 = dfir_rs::pusherator::tee::Tee::new( hoff_6v3_send, - hydroflow::pusherator::tee::Tee::new( + dfir_rs::pusherator::tee::Tee::new( hoff_1v3_send, - hydroflow::pusherator::tee::Tee::new( + dfir_rs::pusherator::tee::Tee::new( hoff_21v1_send, - hydroflow::pusherator::tee::Tee::new( + dfir_rs::pusherator::tee::Tee::new( hoff_22v1_send, - hydroflow::pusherator::tee::Tee::new( + dfir_rs::pusherator::tee::Tee::new( hoff_23v1_send, hoff_24v1_send, ), @@ -233,21 +233,21 @@ fn main() { #[inline(always)] pub fn op_3v1__tee__loc_nopath_2_19_2_23< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -261,10 +261,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_2v1, op_3v1); }, @@ -846,7 +846,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -854,21 +854,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_28_3_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -882,10 +882,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__expr_predicate@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__expr_predicate@datalog_program.snap index 17b9d2430293..309ce7303e3d 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__expr_predicate@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__expr_predicate@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"union ()\"},\"version\":1},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"filter (| row : & (_ ,) | row . 0 == 0)\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"filter (| row : & (_ ,) | row . 0 != 0)\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((2 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"filter (| row : & (_ ,) | row . 0 - 1 == 0)\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((3 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"filter (| row : & (_ ,) | row . 0 - 1 == 1 - 1)\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((4 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":1,\"version\":3},{\"idx\":13,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":1,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"2\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"3\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"3\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":\"ints\",\"version\":1},{\"value\":\"result_insert\",\"version\":1},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"predicate_1_filter\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"predicate_3_filter\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"predicate_5_filter\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"predicate_7_filter\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,32 +15,32 @@ fn main() { let (hoff_1v3_send, hoff_1v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(1v3)"); let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let (hoff_21v1_send, hoff_21v1_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(21v1)"); let (hoff_22v1_send, hoff_22v1_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(22v1)"); let mut sg_2v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -50,18 +50,18 @@ fn main() { let sg_2v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -78,28 +78,28 @@ fn main() { hoff_1v3_send, hoff_6v3_send, hoff_21v1_send, hoff_22v1_send )| { - let hoff_1v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_1v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_1v3_send.give(Some(v)); }); - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); - let hoff_21v1_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_21v1_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_21v1_send.give(Some(v)); }); - let hoff_22v1_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_22v1_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_22v1_send.give(Some(v)); }); let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_2v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -188,7 +188,7 @@ fn main() { } op_2v1__unique__loc_nopath_2_19_2_23(op_2v1) }; - let op_18v1 = hydroflow::pusherator::filter::Filter::new( + let op_18v1 = dfir_rs::pusherator::filter::Filter::new( |row: &(_,)| row.0 - 1 == 1 - 1, hoff_22v1_send, ); @@ -197,21 +197,21 @@ fn main() { #[inline(always)] pub fn op_18v1__filter__loc_nopath_8_12_8_50< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -222,7 +222,7 @@ fn main() { } op_18v1__filter__loc_nopath_8_12_8_50(op_18v1) }; - let op_15v1 = hydroflow::pusherator::filter::Filter::new( + let op_15v1 = dfir_rs::pusherator::filter::Filter::new( |row: &(_,)| row.0 - 1 == 0, hoff_21v1_send, ); @@ -231,21 +231,21 @@ fn main() { #[inline(always)] pub fn op_15v1__filter__loc_nopath_7_12_7_46< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -256,7 +256,7 @@ fn main() { } op_15v1__filter__loc_nopath_7_12_7_46(op_15v1) }; - let op_12v1 = hydroflow::pusherator::filter::Filter::new( + let op_12v1 = dfir_rs::pusherator::filter::Filter::new( |row: &(_,)| row.0 != 0, hoff_1v3_send, ); @@ -265,21 +265,21 @@ fn main() { #[inline(always)] pub fn op_12v1__filter__loc_nopath_6_12_6_42< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -290,7 +290,7 @@ fn main() { } op_12v1__filter__loc_nopath_6_12_6_42(op_12v1) }; - let op_9v1 = hydroflow::pusherator::filter::Filter::new( + let op_9v1 = dfir_rs::pusherator::filter::Filter::new( |row: &(_,)| row.0 == 0, hoff_6v3_send, ); @@ -299,21 +299,21 @@ fn main() { #[inline(always)] pub fn op_9v1__filter__loc_nopath_5_12_5_42< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -324,11 +324,11 @@ fn main() { } op_9v1__filter__loc_nopath_5_12_5_42(op_9v1) }; - let op_3v1 = hydroflow::pusherator::tee::Tee::new( + let op_3v1 = dfir_rs::pusherator::tee::Tee::new( op_9v1, - hydroflow::pusherator::tee::Tee::new( + dfir_rs::pusherator::tee::Tee::new( op_12v1, - hydroflow::pusherator::tee::Tee::new(op_15v1, op_18v1), + dfir_rs::pusherator::tee::Tee::new(op_15v1, op_18v1), ), ); let op_3v1 = { @@ -336,21 +336,21 @@ fn main() { #[inline(always)] pub fn op_3v1__tee__loc_nopath_2_19_2_23< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -364,10 +364,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_2v1, op_3v1); }, @@ -785,7 +785,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -793,21 +793,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_28_3_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -821,10 +821,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__flat_then_detuple@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__flat_then_detuple@datalog_program.snap index 3e42e0732467..f5c17ffb8073 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__flat_then_detuple@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__flat_then_detuple@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"flat_map (| row : (_ ,) | row . 0 . into_iter () . map (move | __flattened_element | (__flattened_element ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row_untuple : (_ ,) | (row_untuple . 0 . 0 , row_untuple . 0 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"source_reader_0\",\"version\":1},{\"value\":\"source_reader_0\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -342,7 +342,7 @@ fn main() { } op_5v1__unique__loc_nopath_4_20_4_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -350,21 +350,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_4_28_4_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -378,10 +378,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__flatten@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__flatten@datalog_program.snap index fa47269838a3..1db76684e8dd 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__flatten@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__flatten@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"flat_map (| row : (_ , _ ,) | row . 1 . into_iter () . map (move | __flattened_element | (:: std :: clone :: Clone :: clone (& row . 0) , __flattened_element ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"source_reader_0\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -307,7 +307,7 @@ fn main() { } op_5v1__unique__loc_nopath_4_20_4_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -315,21 +315,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_4_28_4_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -343,10 +343,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__index@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__index@datalog_program.snap index 05b715ffda5a..ca64cd58b257 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__index@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__index@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result3 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result4 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result5 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 ,) , ((row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ ,) , _)) | (g . 0 , a . 0 . unwrap () . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 ,) , ((row . 1) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'static , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ ,) , _)) | (g . 0 , a . 0 . unwrap () . 1 , __enumerate_index ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"enumerate :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (__enumerate_index , (g , a)) : (_ , ((_ , _ ,) , _)) | (g . 0 , g . 1 , __enumerate_index ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":35,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":25,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":39,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":23,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":45,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":3},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":49,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":3},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":52,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":15,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":12,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":41,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":27,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":29,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":31,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":34,\"version\":1},{\"idx\":35,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":33,\"version\":1},{\"idx\":34,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":33,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":38,\"version\":1},{\"idx\":39,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":37,\"version\":1},{\"idx\":38,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":36,\"version\":1},{\"idx\":21,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":36,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":21,\"version\":3},{\"idx\":37,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":40,\"version\":1},{\"idx\":16,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":3},{\"idx\":51,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":44,\"version\":1},{\"idx\":45,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":43,\"version\":1},{\"idx\":44,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":42,\"version\":1},{\"idx\":43,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":42,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":3},{\"idx\":47,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":48,\"version\":1},{\"idx\":49,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":47,\"version\":1},{\"idx\":48,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":46,\"version\":1},{\"idx\":13,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":46,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":3},{\"idx\":41,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":50,\"version\":1},{\"idx\":10,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":50,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":25,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":33,\"version\":1},{\"idx\":34,\"version\":1},{\"idx\":35,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":27,\"version\":1},{\"idx\":36,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":37,\"version\":1},{\"idx\":38,\"version\":1},{\"idx\":39,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":41,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":42,\"version\":1},{\"idx\":43,\"version\":1},{\"idx\":44,\"version\":1},{\"idx\":45,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":29,\"version\":1},{\"idx\":46,\"version\":1},{\"idx\":50,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":47,\"version\":1},{\"idx\":48,\"version\":1},{\"idx\":49,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":2,\"version\":1},{\"value\":1,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":\"ints\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result4_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result5_insert\",\"version\":1},{\"value\":\"result5\",\"version\":1},{\"value\":\"result5\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_persisted_insert\",\"version\":1},{\"value\":\"ints_persisted\",\"version\":1},{\"value\":\"ints_persisted\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,52 +15,52 @@ fn main() { let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let (hoff_9v3_send, hoff_9v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(9v3)"); let (hoff_10v3_send, hoff_10v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(10v3)"); let (hoff_12v3_send, hoff_12v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(12v3)"); let (hoff_13v3_send, hoff_13v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(13v3)"); let (hoff_15v3_send, hoff_15v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(15v3)"); let (hoff_16v3_send, hoff_16v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(16v3)"); let (hoff_21v3_send, hoff_21v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(21v3)"); let mut sg_3v1_node_26v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -70,18 +70,18 @@ fn main() { let sg_3v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_3v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -96,7 +96,7 @@ fn main() { let sg_4v1_node_37v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), ), ); let sg_4v1_node_38v1_counterdata = df @@ -110,40 +110,40 @@ fn main() { let sg_4v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_5v1_node_22v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_5v1_node_23v1_antijoindata_neg = df .add_state( - std::cell::RefCell::new(hydroflow::rustc_hash::FxHashSet::default()), + std::cell::RefCell::new(dfir_rs::rustc_hash::FxHashSet::default()), ); let sg_5v1_node_23v1_antijoindata_pos = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_5v1_node_11v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -154,7 +154,7 @@ fn main() { let sg_6v1_node_47v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), ), ); let sg_6v1_node_48v1_counterdata = df @@ -168,9 +168,9 @@ fn main() { let sg_6v1_node_14v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -179,22 +179,22 @@ fn main() { let sg_7v1_node_17v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_7v1_node_18v1_antijoindata_neg = df .add_state( - std::cell::RefCell::new(hydroflow::rustc_hash::FxHashSet::default()), + std::cell::RefCell::new(dfir_rs::rustc_hash::FxHashSet::default()), ); let sg_7v1_node_18v1_antijoindata_pos = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -207,18 +207,18 @@ fn main() { var_expr!(hoff_16v3_send, hoff_21v3_send), false, move |context, var_args!(), var_args!(hoff_16v3_send, hoff_21v3_send)| { - let hoff_16v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_16v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_16v3_send.give(Some(v)); }); - let hoff_21v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_21v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_21v3_send.give(Some(v)); }); let op_26v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_3v1_node_26v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -307,7 +307,7 @@ fn main() { } op_2v1__unique__loc_nopath_2_19_2_23(op_2v1) }; - let op_40v1 = hydroflow::pusherator::map::Map::new( + let op_40v1 = dfir_rs::pusherator::map::Map::new( |row: (_, _)| ((row.0, row.1), ()), hoff_16v3_send, ); @@ -316,21 +316,21 @@ fn main() { #[inline(always)] pub fn op_40v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -341,7 +341,7 @@ fn main() { } op_40v1__map__loc_nopath_1_0_1_0(op_40v1) }; - let op_36v1 = hydroflow::pusherator::map::Map::new( + let op_36v1 = dfir_rs::pusherator::map::Map::new( |row: (_, _)| ((row.0,), ((row.1),)), hoff_21v3_send, ); @@ -350,21 +350,21 @@ fn main() { #[inline(always)] pub fn op_36v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -375,7 +375,7 @@ fn main() { } op_36v1__map__loc_nopath_1_0_1_0(op_36v1) }; - let op_27v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_27v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_27v1 = { @@ -383,21 +383,21 @@ fn main() { #[inline(always)] pub fn op_27v1__for_each__loc_nopath_4_28_4_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -408,7 +408,7 @@ fn main() { } op_27v1__for_each__loc_nopath_4_28_4_65(op_27v1) }; - let op_5v1 = hydroflow::pusherator::filter::Filter::new( + let op_5v1 = dfir_rs::pusherator::filter::Filter::new( |item| { let mut borrow = context .state_ref(sg_3v1_node_5v1_uniquedata) @@ -432,21 +432,21 @@ fn main() { #[inline(always)] pub fn op_5v1__unique__loc_nopath_4_20_4_26< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -457,7 +457,7 @@ fn main() { } op_5v1__unique__loc_nopath_4_20_4_26(op_5v1) }; - let op_35v1 = hydroflow::pusherator::map::Map::new( + let op_35v1 = dfir_rs::pusherator::map::Map::new( |(__enumerate_index, (g, a)): (_, ((_, _), _))| ( g.0, g.1, @@ -470,21 +470,21 @@ fn main() { #[inline(always)] pub fn op_35v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -495,7 +495,7 @@ fn main() { } op_35v1__map__loc_nopath_1_0_1_0(op_35v1) }; - let op_34v1 = hydroflow::pusherator::map::Map::new( + let op_34v1 = dfir_rs::pusherator::map::Map::new( |item| { let mut counter = context .state_ref(sg_3v1_node_34v1_counterdata) @@ -509,21 +509,21 @@ fn main() { #[inline(always)] pub fn op_34v1__enumerate__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -534,7 +534,7 @@ fn main() { } op_34v1__enumerate__loc_nopath_1_0_1_0(op_34v1) }; - let op_33v1 = hydroflow::pusherator::map::Map::new( + let op_33v1 = dfir_rs::pusherator::map::Map::new( |row: (_, _)| ((row.0, row.1), ()), op_34v1, ); @@ -543,21 +543,21 @@ fn main() { #[inline(always)] pub fn op_33v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -568,30 +568,30 @@ fn main() { } op_33v1__map__loc_nopath_1_0_1_0(op_33v1) }; - let op_3v1 = hydroflow::pusherator::tee::Tee::new( + let op_3v1 = dfir_rs::pusherator::tee::Tee::new( op_33v1, - hydroflow::pusherator::tee::Tee::new(op_36v1, op_40v1), + dfir_rs::pusherator::tee::Tee::new(op_36v1, op_40v1), ); let op_3v1 = { #[allow(non_snake_case)] #[inline(always)] pub fn op_3v1__tee__loc_nopath_2_19_2_23< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -605,10 +605,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_3v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_3v1(op_2v1, op_3v1); }, @@ -622,7 +622,7 @@ fn main() { move |context, var_args!(hoff_12v3_recv), var_args!(hoff_15v3_send)| { let mut hoff_12v3_recv = hoff_12v3_recv.borrow_mut_swap(); let hoff_12v3_recv = hoff_12v3_recv.drain(..); - let hoff_15v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_15v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_15v3_send.give(Some(v)); @@ -670,10 +670,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_20v1, hoff_15v3_send); }, @@ -687,7 +687,7 @@ fn main() { move |context, var_args!(hoff_6v3_recv), var_args!(hoff_9v3_send)| { let mut hoff_6v3_recv = hoff_6v3_recv.borrow_mut_swap(); let hoff_6v3_recv = hoff_6v3_recv.drain(..); - let hoff_9v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_9v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_9v3_send.give(Some(v)); @@ -735,10 +735,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_25v1, hoff_9v3_send); }, @@ -790,8 +790,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -800,7 +800,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); @@ -976,7 +976,7 @@ fn main() { } op_8v1__unique__loc_nopath_5_20_5_27(op_8v1) }; - let op_28v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_28v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result2.send(v).unwrap() }); let op_28v1 = { @@ -984,21 +984,21 @@ fn main() { #[inline(always)] pub fn op_28v1__for_each__loc_nopath_5_29_5_67< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1012,10 +1012,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_4v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_4v1(op_8v1, op_28v1); }, @@ -1035,17 +1035,17 @@ fn main() { let hoff_9v3_recv = hoff_9v3_recv.drain(..); let mut hoff_16v3_recv = hoff_16v3_recv.borrow_mut_swap(); let hoff_16v3_recv = hoff_16v3_recv.drain(..); - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); - let hoff_10v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_10v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_10v3_send.give(Some(v)); }); - let hoff_13v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_13v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_13v3_send.give(Some(v)); @@ -1149,8 +1149,8 @@ fn main() { fn check_inputs<'a, K, I1, V, I2>( input_neg: I1, input_pos: I2, - neg_state: &'a mut hydroflow::rustc_hash::FxHashSet, - pos_state: &'a mut hydroflow::rustc_hash::FxHashSet<(K, V)>, + neg_state: &'a mut dfir_rs::rustc_hash::FxHashSet, + pos_state: &'a mut dfir_rs::rustc_hash::FxHashSet<(K, V)>, is_new_tick: bool, ) -> impl 'a + Iterator where @@ -1160,7 +1160,7 @@ fn main() { I2: 'a + Iterator, { neg_state.extend(input_neg); - hydroflow::compiled::pull::anti_join_into_iter( + dfir_rs::compiled::pull::anti_join_into_iter( input_pos, neg_state, pos_state, @@ -1209,7 +1209,7 @@ fn main() { } op_23v1__difference__loc_nopath_15_21_15_35(op_23v1) }; - let op_50v1 = hydroflow::pusherator::map::Map::new( + let op_50v1 = dfir_rs::pusherator::map::Map::new( |row: (_, _)| ((row.0, row.1), ()), hoff_10v3_send, ); @@ -1218,21 +1218,21 @@ fn main() { #[inline(always)] pub fn op_50v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1243,7 +1243,7 @@ fn main() { } op_50v1__map__loc_nopath_1_0_1_0(op_50v1) }; - let op_46v1 = hydroflow::pusherator::map::Map::new( + let op_46v1 = dfir_rs::pusherator::map::Map::new( |row: (_, _)| ((row.0,), ((row.1),)), hoff_13v3_send, ); @@ -1252,21 +1252,21 @@ fn main() { #[inline(always)] pub fn op_46v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1277,7 +1277,7 @@ fn main() { } op_46v1__map__loc_nopath_1_0_1_0(op_46v1) }; - let op_29v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_29v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result3.send(v).unwrap() }); let op_29v1 = { @@ -1285,21 +1285,21 @@ fn main() { #[inline(always)] pub fn op_29v1__for_each__loc_nopath_6_29_6_67< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1310,7 +1310,7 @@ fn main() { } op_29v1__for_each__loc_nopath_6_29_6_67(op_29v1) }; - let op_11v1 = hydroflow::pusherator::filter::Filter::new( + let op_11v1 = dfir_rs::pusherator::filter::Filter::new( |item| { let mut borrow = context .state_ref(sg_5v1_node_11v1_uniquedata) @@ -1334,21 +1334,21 @@ fn main() { #[inline(always)] pub fn op_11v1__unique__loc_nopath_6_20_6_27< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1367,19 +1367,19 @@ fn main() { vec: &'ctx mut Vec, mut output: Push, is_new_tick: bool, - ) -> impl 'ctx + hydroflow::pusherator::Pusherator + ) -> impl 'ctx + dfir_rs::pusherator::Pusherator where - Push: 'ctx + hydroflow::pusherator::Pusherator, + Push: 'ctx + dfir_rs::pusherator::Pusherator, Item: ::std::clone::Clone, { if is_new_tick { vec.iter() .cloned() .for_each(|item| { - hydroflow::pusherator::Pusherator::give(&mut output, item); + dfir_rs::pusherator::Pusherator::give(&mut output, item); }); } - hydroflow::pusherator::map::Map::new( + dfir_rs::pusherator::map::Map::new( |item| { vec.push(item); vec.last().unwrap().clone() @@ -1398,21 +1398,21 @@ fn main() { #[inline(always)] pub fn op_45v1__persist__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1423,7 +1423,7 @@ fn main() { } op_45v1__persist__loc_nopath_1_0_1_0(op_45v1) }; - let op_44v1 = hydroflow::pusherator::map::Map::new( + let op_44v1 = dfir_rs::pusherator::map::Map::new( |(__enumerate_index, (g, a)): (_, ((_, _), _))| ( g.0, g.1, @@ -1436,21 +1436,21 @@ fn main() { #[inline(always)] pub fn op_44v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1461,7 +1461,7 @@ fn main() { } op_44v1__map__loc_nopath_1_0_1_0(op_44v1) }; - let op_43v1 = hydroflow::pusherator::map::Map::new( + let op_43v1 = dfir_rs::pusherator::map::Map::new( |item| { let mut counter = context .state_ref(sg_5v1_node_43v1_counterdata) @@ -1475,21 +1475,21 @@ fn main() { #[inline(always)] pub fn op_43v1__enumerate__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1500,7 +1500,7 @@ fn main() { } op_43v1__enumerate__loc_nopath_1_0_1_0(op_43v1) }; - let op_42v1 = hydroflow::pusherator::map::Map::new( + let op_42v1 = dfir_rs::pusherator::map::Map::new( |row: (_, _)| ((row.0, row.1), ()), op_43v1, ); @@ -1509,21 +1509,21 @@ fn main() { #[inline(always)] pub fn op_42v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1534,11 +1534,11 @@ fn main() { } op_42v1__map__loc_nopath_1_0_1_0(op_42v1) }; - let op_24v1 = hydroflow::pusherator::tee::Tee::new( + let op_24v1 = dfir_rs::pusherator::tee::Tee::new( op_42v1, - hydroflow::pusherator::tee::Tee::new( + dfir_rs::pusherator::tee::Tee::new( op_46v1, - hydroflow::pusherator::tee::Tee::new(op_50v1, hoff_6v3_send), + dfir_rs::pusherator::tee::Tee::new(op_50v1, hoff_6v3_send), ), ); let op_24v1 = { @@ -1546,21 +1546,21 @@ fn main() { #[inline(always)] pub fn op_24v1__tee__loc_nopath_15_21_15_35< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1574,10 +1574,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_5v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_5v1(op_23v1, op_24v1); context.schedule_subgraph(context.current_subgraph(), false); @@ -1630,8 +1630,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -1640,7 +1640,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); @@ -1831,7 +1831,7 @@ fn main() { } op_14v1__unique__loc_nopath_7_20_7_27(op_14v1) }; - let op_30v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_30v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result4.send(v).unwrap() }); let op_30v1 = { @@ -1839,21 +1839,21 @@ fn main() { #[inline(always)] pub fn op_30v1__for_each__loc_nopath_7_29_7_67< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1867,10 +1867,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_6v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_6v1(op_14v1, op_30v1); context.schedule_subgraph(context.current_subgraph(), false); @@ -1891,7 +1891,7 @@ fn main() { let hoff_10v3_recv = hoff_10v3_recv.drain(..); let mut hoff_15v3_recv = hoff_15v3_recv.borrow_mut_swap(); let hoff_15v3_recv = hoff_15v3_recv.drain(..); - let hoff_12v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_12v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_12v3_send.give(Some(v)); @@ -2041,8 +2041,8 @@ fn main() { fn check_inputs<'a, K, I1, V, I2>( input_neg: I1, input_pos: I2, - neg_state: &'a mut hydroflow::rustc_hash::FxHashSet, - pos_state: &'a mut hydroflow::rustc_hash::FxHashSet<(K, V)>, + neg_state: &'a mut dfir_rs::rustc_hash::FxHashSet, + pos_state: &'a mut dfir_rs::rustc_hash::FxHashSet<(K, V)>, is_new_tick: bool, ) -> impl 'a + Iterator where @@ -2052,7 +2052,7 @@ fn main() { I2: 'a + Iterator, { neg_state.extend(input_neg); - hydroflow::compiled::pull::anti_join_into_iter( + dfir_rs::compiled::pull::anti_join_into_iter( input_pos, neg_state, pos_state, @@ -2101,7 +2101,7 @@ fn main() { } op_18v1__difference__loc_nopath_9_21_9_28(op_18v1) }; - let op_32v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_32v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result5.send(v).unwrap() }); let op_32v1 = { @@ -2109,21 +2109,21 @@ fn main() { #[inline(always)] pub fn op_32v1__for_each__loc_nopath_10_29_10_67< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2142,19 +2142,19 @@ fn main() { vec: &'ctx mut Vec, mut output: Push, is_new_tick: bool, - ) -> impl 'ctx + hydroflow::pusherator::Pusherator + ) -> impl 'ctx + dfir_rs::pusherator::Pusherator where - Push: 'ctx + hydroflow::pusherator::Pusherator, + Push: 'ctx + dfir_rs::pusherator::Pusherator, Item: ::std::clone::Clone, { if is_new_tick { vec.iter() .cloned() .for_each(|item| { - hydroflow::pusherator::Pusherator::give(&mut output, item); + dfir_rs::pusherator::Pusherator::give(&mut output, item); }); } - hydroflow::pusherator::map::Map::new( + dfir_rs::pusherator::map::Map::new( |item| { vec.push(item); vec.last().unwrap().clone() @@ -2173,21 +2173,21 @@ fn main() { #[inline(always)] pub fn op_31v1__persist__loc_nopath_10_20_10_27< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2198,7 +2198,7 @@ fn main() { } op_31v1__persist__loc_nopath_10_20_10_27(op_31v1) }; - let op_19v1 = hydroflow::pusherator::tee::Tee::new( + let op_19v1 = dfir_rs::pusherator::tee::Tee::new( op_31v1, hoff_12v3_send, ); @@ -2207,21 +2207,21 @@ fn main() { #[inline(always)] pub fn op_19v1__tee__loc_nopath_9_21_9_28< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2235,10 +2235,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_7v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_7v1(op_18v1, op_19v1); context.schedule_subgraph(context.current_subgraph(), false); diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__join_with_other@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__join_with_other@datalog_program.snap index 86e1a6a7115c..18f2b04e3108 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__join_with_other@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__join_with_other@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ , _ ,) , (() , ())) | (kv . 0 . 0 , kv . 0 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 , _v . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 , _v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_10v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,21 +30,21 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_1v1_node_11v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -54,38 +54,38 @@ fn main() { let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_13v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_13v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_13v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_13v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -97,7 +97,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_10v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_10v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -187,7 +187,7 @@ fn main() { op_2v1__unique__loc_nopath_2_19_2_22(op_2v1) }; let op_11v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_11v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -361,12 +361,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -380,7 +380,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -588,7 +588,7 @@ fn main() { } op_8v1__unique__loc_nopath_4_20_4_23(op_8v1) }; - let op_12v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_12v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_12v1 = { @@ -596,21 +596,21 @@ fn main() { #[inline(always)] pub fn op_12v1__for_each__loc_nopath_4_25_4_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -624,10 +624,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_8v1, op_12v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__join_with_self@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__join_with_self@datalog_program.snap index efa6b2266700..bdcefc91d593 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__join_with_self@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__join_with_self@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ , _ ,) , (() , ())) | (kv . 0 . 0 , kv . 0 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 , _v . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 , _v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":3},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":\"input\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,22 +15,22 @@ fn main() { let (hoff_4v3_send, hoff_4v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(4v3)"); let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -40,38 +40,38 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_2v1_node_9v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_2v1_node_9v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_2v1_node_9v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_2v1_node_9v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_2v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -82,18 +82,18 @@ fn main() { var_expr!(hoff_4v3_send, hoff_6v3_send), false, move |context, var_args!(), var_args!(hoff_4v3_send, hoff_6v3_send)| { - let hoff_4v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_4v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_4v3_send.give(Some(v)); }); - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -182,7 +182,7 @@ fn main() { } op_2v1__unique__loc_nopath_2_19_2_24(op_2v1) }; - let op_3v1 = hydroflow::pusherator::tee::Tee::new( + let op_3v1 = dfir_rs::pusherator::tee::Tee::new( hoff_6v3_send, hoff_4v3_send, ); @@ -191,21 +191,21 @@ fn main() { #[inline(always)] pub fn op_3v1__tee__loc_nopath_2_19_2_24< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -219,10 +219,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_2v1, op_3v1); }, @@ -323,12 +323,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -342,7 +342,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -550,7 +550,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_23(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_8v1 = { @@ -558,21 +558,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_25_3_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -586,10 +586,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__local_constraints@datalog_program-2.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__local_constraints@datalog_program-2.snap index ac7db8aadfbd..4e16f36c88a5 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__local_constraints@datalog_program-2.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__local_constraints@datalog_program-2.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"filter (| row : & (_ , _ , _ , _ ,) | row . 0 == row . 1 && row . 2 == row . 3)\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ , _ ,) | ((row . 0 . clone () , row . 0 , row . 2 . clone () , row . 2 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ , _ , _ ,) , _) | (g . 0 , g . 1 , g . 2 , g . 3 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"source_reader_0\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -304,7 +304,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_23(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_8v1 = { @@ -312,21 +312,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_25_3_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -340,10 +340,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__local_constraints@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__local_constraints@datalog_program.snap index 4e5dc40e34eb..abf4f7ebfba9 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__local_constraints@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__local_constraints@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"filter (| row : & (_ , _ ,) | row . 0 == row . 1)\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 . clone () , row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"source_reader_0\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -298,7 +298,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_23(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_8v1 = { @@ -306,21 +306,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_25_3_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -334,10 +334,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__max@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__max@datalog_program.snap index 49ead8d6c1f4..572e747c8eb8 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__max@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__max@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , (row . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , (_ ,) , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (std :: cmp :: max (prev , val . 0)) } else { Some (val . 0) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (a . 0 . unwrap () , g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,17 +15,17 @@ fn main() { let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let mut sg_2v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -35,24 +35,24 @@ fn main() { let sg_2v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_10v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(_,), (Option<_>,)>::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -63,13 +63,13 @@ fn main() { var_expr!(hoff_6v3_send), false, move |context, var_args!(), var_args!(hoff_6v3_send)| { - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_2v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -198,10 +198,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_9v1, hoff_6v3_send); }, @@ -379,7 +379,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -387,21 +387,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_28_3_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -415,10 +415,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__max_all@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__max_all@datalog_program.snap index 2c020254b129..9a8198f3bba7 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__max_all@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__max_all@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , (row . 0 , row . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > , Option < _ > ,) > (| | (None , None ,) , | old : & mut (Option < _ > , Option < _ > ,) , val : (_ , _ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (std :: cmp :: max (prev , val . 0)) } else { Some (val . 0) } ; old . 1 = if let Some (prev) = old . 1 . take () { Some (std :: cmp :: max (prev , val . 1)) } else { Some (val . 1) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () , a . 1 . unwrap () ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,17 +15,17 @@ fn main() { let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let mut sg_2v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -35,16 +35,16 @@ fn main() { let sg_2v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_10v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::< + dfir_rs::rustc_hash::FxHashMap::< (), (Option<_>, Option<_>), >::default(), @@ -53,9 +53,9 @@ fn main() { let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -66,13 +66,13 @@ fn main() { var_expr!(hoff_6v3_send), false, move |context, var_args!(), var_args!(hoff_6v3_send)| { - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_2v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -201,10 +201,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_9v1, hoff_6v3_send); }, @@ -388,7 +388,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -396,21 +396,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_28_3_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -424,10 +424,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__minimal_program@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__minimal_program@datalog_program.snap index 8d4262c4eee9..d639be85c0ec 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__minimal_program@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__minimal_program@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 , row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -265,7 +265,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_23(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_8v1 = { @@ -273,21 +273,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_25_3_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -301,10 +301,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__multi_detuple@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__multi_detuple@datalog_program.snap index 792f60606fd0..aa314c9d99f3 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__multi_detuple@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__multi_detuple@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row_untuple : (_ , _ ,) | (row_untuple . 0 . 0 , row_untuple . 0 . 1 , row_untuple . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row_untuple : (_ , _ , _ ,) | (row_untuple . 0 , row_untuple . 1 , row_untuple . 2 . 0 , row_untuple . 2 . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ , _ ,) | ((row . 0 , row . 1 , row . 2 , row . 3 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ , _ , _ ,) , _) | (g . 0 , g . 1 , g . 2 , g . 3 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"source_reader_0\",\"version\":1},{\"value\":\"source_reader_0\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -352,7 +352,7 @@ fn main() { } op_5v1__unique__loc_nopath_4_20_4_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -360,21 +360,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_4_28_4_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -388,10 +388,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__multiple_contributors@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__multiple_contributors@datalog_program.snap index 151506633b4e..9d4b717ba183 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__multiple_contributors@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__multiple_contributors@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"union ()\"},\"version\":1},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 , row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":7,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":7,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":\"out_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_10v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,21 +30,21 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_1v1_node_11v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -54,18 +54,18 @@ fn main() { let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -77,7 +77,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_10v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_10v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -167,7 +167,7 @@ fn main() { op_2v1__unique__loc_nopath_2_19_2_22(op_2v1) }; let op_11v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_11v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -497,7 +497,7 @@ fn main() { } op_8v1__unique__loc_nopath_4_20_4_23(op_8v1) }; - let op_12v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_12v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_12v1 = { @@ -505,21 +505,21 @@ fn main() { #[inline(always)] pub fn op_12v1__for_each__loc_nopath_4_25_4_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -533,10 +533,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_8v1, op_12v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__non_copy_but_clone@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__non_copy_but_clone@datalog_program.snap index a1b755eec027..a43723cfe12a 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__non_copy_but_clone@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__non_copy_but_clone@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (strings)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 . clone () , row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"strings_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -265,7 +265,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -273,21 +273,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_28_3_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -301,10 +301,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__persist@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__persist@datalog_program.snap index 7f0bbf10d379..d7ae8237c1ef 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__persist@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__persist@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints3)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result3 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result4 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'static , 'static , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : (() , ((_ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'static , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : (() , ((_ , _ ,) , (_ ,))) | (kv . 1 . 0 . 0 , kv . 1 . 0 . 1 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | (() , (_v . 0 , _v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (() , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ ,) | ((row . 0 , row . 1 , row . 2 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ , _ ,) , _) | (g . 0 , g . 1 , g . 2 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"anti_join ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ()) | (kv . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | (_v . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"persist :: < 'static > ()\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":34,\"version\":1},{\"idx\":14,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":28,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":25,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":35,\"version\":1},{\"idx\":11,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":22,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":19,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":36,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":13,\"version\":3},{\"idx\":33,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":50,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":3},{\"idx\":31,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":58,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":19,\"version\":3},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":63,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":22,\"version\":3},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":68,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":25,\"version\":3},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":61,\"version\":1},{\"idx\":27,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":28,\"version\":3},{\"idx\":3,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":65,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":30,\"version\":1},{\"idx\":31,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":33,\"version\":1},{\"idx\":16,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":32,\"version\":1},{\"idx\":13,\"version\":3}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":3},{\"idx\":7,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":37,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":38,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":39,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":41,\"version\":1},{\"idx\":42,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":43,\"version\":1},{\"idx\":41,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":29,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":44,\"version\":1},{\"idx\":41,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":26,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":45,\"version\":1},{\"idx\":46,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":47,\"version\":1},{\"idx\":45,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":42,\"version\":1},{\"idx\":47,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":48,\"version\":1},{\"idx\":45,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":48,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":14,\"version\":3},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":49,\"version\":1},{\"idx\":50,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":46,\"version\":1},{\"idx\":49,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":54,\"version\":1},{\"idx\":51,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":53,\"version\":1},{\"idx\":54,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":23,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":56,\"version\":1},{\"idx\":20,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":55,\"version\":1},{\"idx\":56,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":55,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":3},{\"idx\":65,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":57,\"version\":1},{\"idx\":58,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":52,\"version\":1},{\"idx\":57,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":3},{\"idx\":44,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":60,\"version\":1},{\"idx\":61,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":59,\"version\":1},{\"idx\":60,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":59,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":20,\"version\":3},{\"idx\":51,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":62,\"version\":1},{\"idx\":63,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":27,\"version\":1},{\"idx\":62,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":29,\"version\":3},{\"idx\":43,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":64,\"version\":1},{\"idx\":17,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":64,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":3},{\"idx\":53,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":67,\"version\":1},{\"idx\":68,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":66,\"version\":1},{\"idx\":67,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":32,\"version\":1},{\"idx\":66,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"2\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"3\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":9,\"version\":1},\"version\":1},{\"value\":{\"idx\":10,\"version\":1},\"version\":1},{\"value\":{\"idx\":11,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":8,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1},{\"value\":{\"idx\":7,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":33,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":43,\"version\":1},{\"idx\":44,\"version\":1},{\"idx\":41,\"version\":1},{\"idx\":42,\"version\":1},{\"idx\":47,\"version\":1},{\"idx\":48,\"version\":1},{\"idx\":45,\"version\":1},{\"idx\":46,\"version\":1},{\"idx\":49,\"version\":1},{\"idx\":50,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":37,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":53,\"version\":1},{\"idx\":54,\"version\":1},{\"idx\":51,\"version\":1},{\"idx\":52,\"version\":1},{\"idx\":57,\"version\":1},{\"idx\":58,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":38,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":59,\"version\":1},{\"idx\":60,\"version\":1},{\"idx\":61,\"version\":1},{\"idx\":27,\"version\":1},{\"idx\":62,\"version\":1},{\"idx\":63,\"version\":1},{\"idx\":21,\"version\":1},{\"idx\":39,\"version\":1},{\"idx\":64,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":65,\"version\":1},{\"idx\":30,\"version\":1},{\"idx\":31,\"version\":1},{\"idx\":32,\"version\":1},{\"idx\":66,\"version\":1},{\"idx\":67,\"version\":1},{\"idx\":68,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":40,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":55,\"version\":1},{\"idx\":56,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":34,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":35,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":36,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":1,\"version\":1},{\"value\":2,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":\"ints2\",\"version\":1},{\"value\":\"ints2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result4_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"intermediate_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"intermediate_persist_insert\",\"version\":1},{\"value\":\"intermediate_persist\",\"version\":1},{\"value\":\"intermediate_persist\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_4\",\"version\":1},{\"value\":\"join_4\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_7\",\"version\":1},{\"value\":\"join_7\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,82 +15,82 @@ fn main() { let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let (hoff_11v3_send, hoff_11v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(11v3)"); let (hoff_13v3_send, hoff_13v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(13v3)"); let (hoff_14v3_send, hoff_14v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(14v3)"); let (hoff_16v3_send, hoff_16v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(16v3)"); let (hoff_17v3_send, hoff_17v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(17v3)"); let (hoff_19v3_send, hoff_19v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(19v3)"); let (hoff_20v3_send, hoff_20v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(20v3)"); let (hoff_22v3_send, hoff_22v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(22v3)"); let (hoff_23v3_send, hoff_23v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(23v3)"); let (hoff_25v3_send, hoff_25v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(25v3)"); let (hoff_26v3_send, hoff_26v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(26v3)"); let (hoff_28v3_send, hoff_28v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(28v3)"); let (hoff_29v3_send, hoff_29v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(29v3)"); let mut sg_9v1_node_34v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -100,12 +100,12 @@ fn main() { let mut sg_10v1_node_35v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -115,12 +115,12 @@ fn main() { let mut sg_11v1_node_36v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -130,46 +130,46 @@ fn main() { let sg_4v1_node_12v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_4v1_node_41v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); let sg_4v1_node_41v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); let sg_4v1_node_45v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); let sg_4v1_node_45v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_4v1_node_45v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_4v1_node_15v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -178,67 +178,67 @@ fn main() { let sg_5v1_node_51v1_antijoindata_neg = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_5v1_node_51v1_antijoindata_pos = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_5v1_node_18v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_6v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_6v1_node_3v1_antijoindata_neg = df .add_state( - std::cell::RefCell::new(hydroflow::rustc_hash::FxHashSet::default()), + std::cell::RefCell::new(dfir_rs::rustc_hash::FxHashSet::default()), ); let sg_6v1_node_3v1_antijoindata_pos = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_6v1_node_21v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_6v1_node_27v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -247,31 +247,31 @@ fn main() { let sg_7v1_node_30v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_7v1_node_31v1_antijoindata_neg = df .add_state( - std::cell::RefCell::new(hydroflow::rustc_hash::FxHashSet::default()), + std::cell::RefCell::new(dfir_rs::rustc_hash::FxHashSet::default()), ); let sg_7v1_node_31v1_antijoindata_pos = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_7v1_node_24v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -280,22 +280,22 @@ fn main() { let sg_8v1_node_7v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_8v1_node_8v1_antijoindata_neg = df .add_state( - std::cell::RefCell::new(hydroflow::rustc_hash::FxHashSet::default()), + std::cell::RefCell::new(dfir_rs::rustc_hash::FxHashSet::default()), ); let sg_8v1_node_8v1_antijoindata_pos = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -308,13 +308,13 @@ fn main() { var_expr!(hoff_14v3_send), false, move |context, var_args!(), var_args!(hoff_14v3_send)| { - let hoff_14v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_14v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_14v3_send.give(Some(v)); }); let op_34v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_9v1_node_34v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -357,10 +357,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_9v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_9v1(op_34v1, hoff_14v3_send); }, @@ -372,13 +372,13 @@ fn main() { var_expr!(hoff_11v3_send), false, move |context, var_args!(), var_args!(hoff_11v3_send)| { - let hoff_11v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_11v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_11v3_send.give(Some(v)); }); let op_35v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_10v1_node_35v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -421,10 +421,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_10v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_10v1(op_35v1, hoff_11v3_send); }, @@ -436,13 +436,13 @@ fn main() { var_expr!(hoff_6v3_send), false, move |context, var_args!(), var_args!(hoff_6v3_send)| { - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); let op_36v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_11v1_node_36v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -485,10 +485,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_11v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_11v1(op_36v1, hoff_6v3_send); }, @@ -502,7 +502,7 @@ fn main() { move |context, var_args!(hoff_25v3_recv), var_args!(hoff_28v3_send)| { let mut hoff_25v3_recv = hoff_25v3_recv.borrow_mut_swap(); let hoff_25v3_recv = hoff_25v3_recv.drain(..); - let hoff_28v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_28v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_28v3_send.give(Some(v)); @@ -550,10 +550,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, hoff_28v3_send); }, @@ -567,7 +567,7 @@ fn main() { move |context, var_args!(hoff_19v3_recv), var_args!(hoff_22v3_send)| { let mut hoff_19v3_recv = hoff_19v3_recv.borrow_mut_swap(); let hoff_19v3_recv = hoff_19v3_recv.drain(..); - let hoff_22v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_22v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_22v3_send.give(Some(v)); @@ -615,10 +615,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_10v1, hoff_22v3_send); }, @@ -632,7 +632,7 @@ fn main() { move |context, var_args!(hoff_13v3_recv), var_args!(hoff_16v3_send)| { let mut hoff_13v3_recv = hoff_13v3_recv.borrow_mut_swap(); let hoff_13v3_recv = hoff_13v3_recv.drain(..); - let hoff_16v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_16v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_16v3_send.give(Some(v)); @@ -680,10 +680,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_3v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_3v1(op_33v1, hoff_16v3_send); }, @@ -839,12 +839,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -858,7 +858,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -1029,12 +1029,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -1048,7 +1048,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -1258,7 +1258,7 @@ fn main() { } op_15v1__unique__loc_nopath_10_20_10_26(op_15v1) }; - let op_37v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_37v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_37v1 = { @@ -1266,21 +1266,21 @@ fn main() { #[inline(always)] pub fn op_37v1__for_each__loc_nopath_10_28_10_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1294,10 +1294,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_4v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_4v1(op_15v1, op_37v1); context.schedule_subgraph(context.current_subgraph(), false); @@ -1409,8 +1409,8 @@ fn main() { fn check_inputs<'a, K, I1, V, I2>( input_neg: I1, input_pos: I2, - neg_state: &'a mut hydroflow::rustc_hash::FxHashSet, - pos_state: &'a mut hydroflow::rustc_hash::FxHashSet<(K, V)>, + neg_state: &'a mut dfir_rs::rustc_hash::FxHashSet, + pos_state: &'a mut dfir_rs::rustc_hash::FxHashSet<(K, V)>, is_new_tick: bool, ) -> impl 'a + Iterator where @@ -1420,7 +1420,7 @@ fn main() { I2: 'a + Iterator, { neg_state.extend(input_neg); - hydroflow::compiled::pull::anti_join_into_iter( + dfir_rs::compiled::pull::anti_join_into_iter( input_pos, neg_state, pos_state, @@ -1629,7 +1629,7 @@ fn main() { } op_18v1__unique__loc_nopath_11_20_11_27(op_18v1) }; - let op_38v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_38v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result2.send(v).unwrap() }); let op_38v1 = { @@ -1637,21 +1637,21 @@ fn main() { #[inline(always)] pub fn op_38v1__for_each__loc_nopath_11_29_11_67< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1665,10 +1665,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_5v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_5v1(op_18v1, op_38v1); context.schedule_subgraph(context.current_subgraph(), false); @@ -1693,22 +1693,22 @@ fn main() { let hoff_14v3_recv = hoff_14v3_recv.drain(..); let mut hoff_28v3_recv = hoff_28v3_recv.borrow_mut_swap(); let hoff_28v3_recv = hoff_28v3_recv.drain(..); - let hoff_17v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_17v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_17v3_send.give(Some(v)); }); - let hoff_23v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_23v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_23v3_send.give(Some(v)); }); - let hoff_25v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_25v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_25v3_send.give(Some(v)); }); - let hoff_29v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_29v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_29v3_send.give(Some(v)); @@ -1775,8 +1775,8 @@ fn main() { fn check_inputs<'a, K, I1, V, I2>( input_neg: I1, input_pos: I2, - neg_state: &'a mut hydroflow::rustc_hash::FxHashSet, - pos_state: &'a mut hydroflow::rustc_hash::FxHashSet<(K, V)>, + neg_state: &'a mut dfir_rs::rustc_hash::FxHashSet, + pos_state: &'a mut dfir_rs::rustc_hash::FxHashSet<(K, V)>, is_new_tick: bool, ) -> impl 'a + Iterator where @@ -1786,7 +1786,7 @@ fn main() { I2: 'a + Iterator, { neg_state.extend(input_neg); - hydroflow::compiled::pull::anti_join_into_iter( + dfir_rs::compiled::pull::anti_join_into_iter( input_pos, neg_state, pos_state, @@ -1835,7 +1835,7 @@ fn main() { } op_3v1__difference__loc_nopath_2_19_2_24(op_3v1) }; - let op_64v1 = hydroflow::pusherator::map::Map::new( + let op_64v1 = dfir_rs::pusherator::map::Map::new( |row: (_,)| ((row.0,), ()), hoff_17v3_send, ); @@ -1844,21 +1844,21 @@ fn main() { #[inline(always)] pub fn op_64v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1869,7 +1869,7 @@ fn main() { } op_64v1__map__loc_nopath_1_0_1_0(op_64v1) }; - let op_39v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_39v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result3.send(v).unwrap() }); let op_39v1 = { @@ -1877,21 +1877,21 @@ fn main() { #[inline(always)] pub fn op_39v1__for_each__loc_nopath_12_29_12_67< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1902,7 +1902,7 @@ fn main() { } op_39v1__for_each__loc_nopath_12_29_12_67(op_39v1) }; - let op_21v1 = hydroflow::pusherator::filter::Filter::new( + let op_21v1 = dfir_rs::pusherator::filter::Filter::new( |item| { let mut borrow = context .state_ref(sg_6v1_node_21v1_uniquedata) @@ -1926,21 +1926,21 @@ fn main() { #[inline(always)] pub fn op_21v1__unique__loc_nopath_12_20_12_27< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1951,7 +1951,7 @@ fn main() { } op_21v1__unique__loc_nopath_12_20_12_27(op_21v1) }; - let op_63v1 = hydroflow::pusherator::map::Map::new( + let op_63v1 = dfir_rs::pusherator::map::Map::new( |(g, a): ((_,), _)| (g.0,), op_21v1, ); @@ -1960,21 +1960,21 @@ fn main() { #[inline(always)] pub fn op_63v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -1985,7 +1985,7 @@ fn main() { } op_63v1__map__loc_nopath_1_0_1_0(op_63v1) }; - let op_62v1 = hydroflow::pusherator::map::Map::new( + let op_62v1 = dfir_rs::pusherator::map::Map::new( |row: (_,)| ((row.0,), ()), op_63v1, ); @@ -1994,21 +1994,21 @@ fn main() { #[inline(always)] pub fn op_62v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2019,7 +2019,7 @@ fn main() { } op_62v1__map__loc_nopath_1_0_1_0(op_62v1) }; - let op_27v1 = hydroflow::pusherator::filter::Filter::new( + let op_27v1 = dfir_rs::pusherator::filter::Filter::new( |item| { let mut borrow = context .state_ref(sg_6v1_node_27v1_uniquedata) @@ -2043,21 +2043,21 @@ fn main() { #[inline(always)] pub fn op_27v1__unique__loc_nopath_18_12_18_24< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2076,19 +2076,19 @@ fn main() { vec: &'ctx mut Vec, mut output: Push, is_new_tick: bool, - ) -> impl 'ctx + hydroflow::pusherator::Pusherator + ) -> impl 'ctx + dfir_rs::pusherator::Pusherator where - Push: 'ctx + hydroflow::pusherator::Pusherator, + Push: 'ctx + dfir_rs::pusherator::Pusherator, Item: ::std::clone::Clone, { if is_new_tick { vec.iter() .cloned() .for_each(|item| { - hydroflow::pusherator::Pusherator::give(&mut output, item); + dfir_rs::pusherator::Pusherator::give(&mut output, item); }); } - hydroflow::pusherator::map::Map::new( + dfir_rs::pusherator::map::Map::new( |item| { vec.push(item); vec.last().unwrap().clone() @@ -2107,21 +2107,21 @@ fn main() { #[inline(always)] pub fn op_61v1__persist__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2132,7 +2132,7 @@ fn main() { } op_61v1__persist__loc_nopath_1_0_1_0(op_61v1) }; - let op_60v1 = hydroflow::pusherator::map::Map::new( + let op_60v1 = dfir_rs::pusherator::map::Map::new( |(g, a): ((_,), _)| (g.0,), op_61v1, ); @@ -2141,21 +2141,21 @@ fn main() { #[inline(always)] pub fn op_60v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2166,7 +2166,7 @@ fn main() { } op_60v1__map__loc_nopath_1_0_1_0(op_60v1) }; - let op_59v1 = hydroflow::pusherator::map::Map::new( + let op_59v1 = dfir_rs::pusherator::map::Map::new( |row: (_,)| ((row.0,), ()), op_60v1, ); @@ -2175,21 +2175,21 @@ fn main() { #[inline(always)] pub fn op_59v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2200,13 +2200,13 @@ fn main() { } op_59v1__map__loc_nopath_1_0_1_0(op_59v1) }; - let op_4v1 = hydroflow::pusherator::tee::Tee::new( + let op_4v1 = dfir_rs::pusherator::tee::Tee::new( hoff_29v3_send, - hydroflow::pusherator::tee::Tee::new( + dfir_rs::pusherator::tee::Tee::new( hoff_23v3_send, - hydroflow::pusherator::tee::Tee::new( + dfir_rs::pusherator::tee::Tee::new( op_59v1, - hydroflow::pusherator::tee::Tee::new( + dfir_rs::pusherator::tee::Tee::new( op_64v1, hoff_25v3_send, ), @@ -2218,21 +2218,21 @@ fn main() { #[inline(always)] pub fn op_4v1__tee__loc_nopath_2_19_2_24< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2246,10 +2246,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_6v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_6v1(op_3v1, op_4v1); context.schedule_subgraph(context.current_subgraph(), false); @@ -2270,7 +2270,7 @@ fn main() { let hoff_16v3_recv = hoff_16v3_recv.drain(..); let mut hoff_17v3_recv = hoff_17v3_recv.borrow_mut_swap(); let hoff_17v3_recv = hoff_17v3_recv.drain(..); - let hoff_13v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_13v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_13v3_send.give(Some(v)); @@ -2374,8 +2374,8 @@ fn main() { fn check_inputs<'a, K, I1, V, I2>( input_neg: I1, input_pos: I2, - neg_state: &'a mut hydroflow::rustc_hash::FxHashSet, - pos_state: &'a mut hydroflow::rustc_hash::FxHashSet<(K, V)>, + neg_state: &'a mut dfir_rs::rustc_hash::FxHashSet, + pos_state: &'a mut dfir_rs::rustc_hash::FxHashSet<(K, V)>, is_new_tick: bool, ) -> impl 'a + Iterator where @@ -2385,7 +2385,7 @@ fn main() { I2: 'a + Iterator, { neg_state.extend(input_neg); - hydroflow::compiled::pull::anti_join_into_iter( + dfir_rs::compiled::pull::anti_join_into_iter( input_pos, neg_state, pos_state, @@ -2434,7 +2434,7 @@ fn main() { } op_31v1__difference__loc_nopath_21_21_21_41(op_31v1) }; - let op_40v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_40v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result4.send(v).unwrap() }); let op_40v1 = { @@ -2442,21 +2442,21 @@ fn main() { #[inline(always)] pub fn op_40v1__for_each__loc_nopath_13_29_13_67< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2467,7 +2467,7 @@ fn main() { } op_40v1__for_each__loc_nopath_13_29_13_67(op_40v1) }; - let op_24v1 = hydroflow::pusherator::filter::Filter::new( + let op_24v1 = dfir_rs::pusherator::filter::Filter::new( |item| { let mut borrow = context .state_ref(sg_7v1_node_24v1_uniquedata) @@ -2491,21 +2491,21 @@ fn main() { #[inline(always)] pub fn op_24v1__unique__loc_nopath_13_20_13_27< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2524,19 +2524,19 @@ fn main() { vec: &'ctx mut Vec, mut output: Push, is_new_tick: bool, - ) -> impl 'ctx + hydroflow::pusherator::Pusherator + ) -> impl 'ctx + dfir_rs::pusherator::Pusherator where - Push: 'ctx + hydroflow::pusherator::Pusherator, + Push: 'ctx + dfir_rs::pusherator::Pusherator, Item: ::std::clone::Clone, { if is_new_tick { vec.iter() .cloned() .for_each(|item| { - hydroflow::pusherator::Pusherator::give(&mut output, item); + dfir_rs::pusherator::Pusherator::give(&mut output, item); }); } - hydroflow::pusherator::map::Map::new( + dfir_rs::pusherator::map::Map::new( |item| { vec.push(item); vec.last().unwrap().clone() @@ -2555,21 +2555,21 @@ fn main() { #[inline(always)] pub fn op_68v1__persist__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2580,7 +2580,7 @@ fn main() { } op_68v1__persist__loc_nopath_1_0_1_0(op_68v1) }; - let op_67v1 = hydroflow::pusherator::map::Map::new( + let op_67v1 = dfir_rs::pusherator::map::Map::new( |(g, a): ((_,), _)| (g.0,), op_68v1, ); @@ -2589,21 +2589,21 @@ fn main() { #[inline(always)] pub fn op_67v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2614,7 +2614,7 @@ fn main() { } op_67v1__map__loc_nopath_1_0_1_0(op_67v1) }; - let op_66v1 = hydroflow::pusherator::map::Map::new( + let op_66v1 = dfir_rs::pusherator::map::Map::new( |row: (_,)| ((row.0,), ()), op_67v1, ); @@ -2623,21 +2623,21 @@ fn main() { #[inline(always)] pub fn op_66v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2648,7 +2648,7 @@ fn main() { } op_66v1__map__loc_nopath_1_0_1_0(op_66v1) }; - let op_32v1 = hydroflow::pusherator::tee::Tee::new( + let op_32v1 = dfir_rs::pusherator::tee::Tee::new( op_66v1, hoff_13v3_send, ); @@ -2657,21 +2657,21 @@ fn main() { #[inline(always)] pub fn op_32v1__tee__loc_nopath_21_21_21_41< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2685,10 +2685,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_7v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_7v1(op_31v1, op_32v1); context.schedule_subgraph(context.current_subgraph(), false); @@ -2709,17 +2709,17 @@ fn main() { let hoff_11v3_recv = hoff_11v3_recv.drain(..); let mut hoff_22v3_recv = hoff_22v3_recv.borrow_mut_swap(); let hoff_22v3_recv = hoff_22v3_recv.drain(..); - let hoff_19v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_19v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_19v3_send.give(Some(v)); }); - let hoff_20v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_20v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_20v3_send.give(Some(v)); }); - let hoff_26v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_26v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_26v3_send.give(Some(v)); @@ -2786,8 +2786,8 @@ fn main() { fn check_inputs<'a, K, I1, V, I2>( input_neg: I1, input_pos: I2, - neg_state: &'a mut hydroflow::rustc_hash::FxHashSet, - pos_state: &'a mut hydroflow::rustc_hash::FxHashSet<(K, V)>, + neg_state: &'a mut dfir_rs::rustc_hash::FxHashSet, + pos_state: &'a mut dfir_rs::rustc_hash::FxHashSet<(K, V)>, is_new_tick: bool, ) -> impl 'a + Iterator where @@ -2797,7 +2797,7 @@ fn main() { I2: 'a + Iterator, { neg_state.extend(input_neg); - hydroflow::compiled::pull::anti_join_into_iter( + dfir_rs::compiled::pull::anti_join_into_iter( input_pos, neg_state, pos_state, @@ -2846,7 +2846,7 @@ fn main() { } op_8v1__difference__loc_nopath_5_19_5_24(op_8v1) }; - let op_56v1 = hydroflow::pusherator::map::Map::new( + let op_56v1 = dfir_rs::pusherator::map::Map::new( |_v: (_,)| (_v.0,), hoff_20v3_send, ); @@ -2855,21 +2855,21 @@ fn main() { #[inline(always)] pub fn op_56v1__map__loc_nopath_16_37_16_45< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2888,19 +2888,19 @@ fn main() { vec: &'ctx mut Vec, mut output: Push, is_new_tick: bool, - ) -> impl 'ctx + hydroflow::pusherator::Pusherator + ) -> impl 'ctx + dfir_rs::pusherator::Pusherator where - Push: 'ctx + hydroflow::pusherator::Pusherator, + Push: 'ctx + dfir_rs::pusherator::Pusherator, Item: ::std::clone::Clone, { if is_new_tick { vec.iter() .cloned() .for_each(|item| { - hydroflow::pusherator::Pusherator::give(&mut output, item); + dfir_rs::pusherator::Pusherator::give(&mut output, item); }); } - hydroflow::pusherator::map::Map::new( + dfir_rs::pusherator::map::Map::new( |item| { vec.push(item); vec.last().unwrap().clone() @@ -2919,21 +2919,21 @@ fn main() { #[inline(always)] pub fn op_55v1__persist__loc_nopath_16_37_16_45< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2944,30 +2944,30 @@ fn main() { } op_55v1__persist__loc_nopath_16_37_16_45(op_55v1) }; - let op_9v1 = hydroflow::pusherator::tee::Tee::new( + let op_9v1 = dfir_rs::pusherator::tee::Tee::new( hoff_26v3_send, - hydroflow::pusherator::tee::Tee::new(op_55v1, hoff_19v3_send), + dfir_rs::pusherator::tee::Tee::new(op_55v1, hoff_19v3_send), ); let op_9v1 = { #[allow(non_snake_case)] #[inline(always)] pub fn op_9v1__tee__loc_nopath_5_19_5_24< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -2981,10 +2981,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_8v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_8v1(op_8v1, op_9v1); context.schedule_subgraph(context.current_subgraph(), false); diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__persist_uniqueness@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__persist_uniqueness@datalog_program.snap index 79468d88b767..460d6b454ece 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__persist_uniqueness@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__persist_uniqueness@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"difference :: < 'tick , 'static > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"defer_tick ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | (() , ((row . 0) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'static , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":11,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":8,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":5},{\"value\":[{\"idx\":8,\"version\":3},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":3},{\"idx\":3,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":7,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Path\":\"pos\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":5},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Path\":\"neg\"}],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":5,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":2,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,32 +15,32 @@ fn main() { let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let (hoff_8v3_send, hoff_8v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(8v3)"); let (hoff_9v3_send, hoff_9v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(9v3)"); let (hoff_11v3_send, hoff_11v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(11v3)"); let mut sg_4v1_node_12v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -50,46 +50,46 @@ fn main() { let sg_2v1_node_17v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(), (Option<_>,)>::default(), ), ); let sg_2v1_node_10v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_3v1_node_7v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_3v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_3v1_node_3v1_antijoindata_neg = df .add_state( - std::cell::RefCell::new(hydroflow::rustc_hash::FxHashSet::default()), + std::cell::RefCell::new(dfir_rs::rustc_hash::FxHashSet::default()), ); let sg_3v1_node_3v1_antijoindata_pos = df .add_state( std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -100,13 +100,13 @@ fn main() { var_expr!(hoff_6v3_send), false, move |context, var_args!(), var_args!(hoff_6v3_send)| { - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); let op_12v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_4v1_node_12v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -149,10 +149,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_4v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_4v1(op_12v1, hoff_6v3_send); }, @@ -166,7 +166,7 @@ fn main() { move |context, var_args!(hoff_8v3_recv), var_args!(hoff_11v3_send)| { let mut hoff_8v3_recv = hoff_8v3_recv.borrow_mut_swap(); let hoff_8v3_recv = hoff_8v3_recv.drain(..); - let hoff_11v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_11v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_11v3_send.give(Some(v)); @@ -214,10 +214,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, hoff_11v3_send); }, @@ -269,8 +269,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -279,7 +279,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); @@ -424,7 +424,7 @@ fn main() { } op_10v1__unique__loc_nopath_8_20_8_26(op_10v1) }; - let op_13v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_13v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_13v1 = { @@ -432,21 +432,21 @@ fn main() { #[inline(always)] pub fn op_13v1__for_each__loc_nopath_8_28_8_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -460,10 +460,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_10v1, op_13v1); context.schedule_subgraph(context.current_subgraph(), false); @@ -484,12 +484,12 @@ fn main() { let hoff_6v3_recv = hoff_6v3_recv.drain(..); let mut hoff_11v3_recv = hoff_11v3_recv.borrow_mut_swap(); let hoff_11v3_recv = hoff_11v3_recv.drain(..); - let hoff_8v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_8v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_8v3_send.give(Some(v)); }); - let hoff_9v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_9v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_9v3_send.give(Some(v)); @@ -679,8 +679,8 @@ fn main() { fn check_inputs<'a, K, I1, V, I2>( input_neg: I1, input_pos: I2, - neg_state: &'a mut hydroflow::rustc_hash::FxHashSet, - pos_state: &'a mut hydroflow::rustc_hash::FxHashSet<(K, V)>, + neg_state: &'a mut dfir_rs::rustc_hash::FxHashSet, + pos_state: &'a mut dfir_rs::rustc_hash::FxHashSet<(K, V)>, is_new_tick: bool, ) -> impl 'a + Iterator where @@ -690,7 +690,7 @@ fn main() { I2: 'a + Iterator, { neg_state.extend(input_neg); - hydroflow::compiled::pull::anti_join_into_iter( + dfir_rs::compiled::pull::anti_join_into_iter( input_pos, neg_state, pos_state, @@ -739,7 +739,7 @@ fn main() { } op_3v1__difference__loc_nopath_2_21_2_26(op_3v1) }; - let op_16v1 = hydroflow::pusherator::map::Map::new( + let op_16v1 = dfir_rs::pusherator::map::Map::new( |row: (_,)| ((), ((row.0),)), hoff_9v3_send, ); @@ -748,21 +748,21 @@ fn main() { #[inline(always)] pub fn op_16v1__map__loc_nopath_1_0_1_0< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -773,7 +773,7 @@ fn main() { } op_16v1__map__loc_nopath_1_0_1_0(op_16v1) }; - let op_4v1 = hydroflow::pusherator::tee::Tee::new( + let op_4v1 = dfir_rs::pusherator::tee::Tee::new( op_16v1, hoff_8v3_send, ); @@ -782,21 +782,21 @@ fn main() { #[inline(always)] pub fn op_4v1__tee__loc_nopath_2_21_2_26< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -810,10 +810,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_3v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_3v1(op_3v1, op_4v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__send_to_node@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__send_to_node@datalog_program.snap index b29abd51b761..c2233e2cc7c2 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__send_to_node@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__send_to_node@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (ints)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| (node , data) | async_send_result (node , data))\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (async_receive_result)\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| v : (_ , _ ,) | (v . 1 , (v . 0 ,)))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":3}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result_async_send\",\"version\":1},{\"value\":\"result_async_send\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_12v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,21 +30,21 @@ fn main() { let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_2v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -54,18 +54,18 @@ fn main() { let sg_2v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_2v1_node_10v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -77,7 +77,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_12v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_12v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -166,7 +166,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_26(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_8v1 = { @@ -174,21 +174,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_28_3_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -202,10 +202,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, @@ -218,7 +218,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_2v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -467,7 +467,7 @@ fn main() { } op_10v1__unique__loc_nopath_4_19_4_25(op_10v1) }; - let op_11v1 = hydroflow::pusherator::for_each::ForEach::new(| + let op_11v1 = dfir_rs::pusherator::for_each::ForEach::new(| (node, data)| async_send_result(node, data)); let op_11v1 = { @@ -475,21 +475,21 @@ fn main() { #[inline(always)] pub fn op_11v1__for_each__loc_nopath_4_27_4_81< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -503,10 +503,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_10v1, op_11v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__simple_filter@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__simple_filter@datalog_program.snap index 6c30d8804f35..3f816dc3cfc9 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__simple_filter@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__simple_filter@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"filter (| row : & (_ , _ ,) | row . 0 > row . 1 && row . 1 == row . 0)\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 0 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ ,) , _) | (g . 0 , g . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"predicate_1_filter\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,18 +30,18 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -53,7 +53,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -299,7 +299,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_23(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_8v1 = { @@ -307,21 +307,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_25_3_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -335,10 +335,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__single_column_program@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__single_column_program@datalog_program.snap index f1d464ba8c1b..e10df0d379d9 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__single_column_program@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__single_column_program@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , (() , ())) | (kv . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_10v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,21 +30,21 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_1v1_node_11v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -54,38 +54,38 @@ fn main() { let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_13v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_13v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_13v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_13v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -97,7 +97,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_10v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_10v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -187,7 +187,7 @@ fn main() { op_2v1__unique__loc_nopath_2_19_2_22(op_2v1) }; let op_11v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_11v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -361,12 +361,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -380,7 +380,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -588,7 +588,7 @@ fn main() { } op_8v1__unique__loc_nopath_4_20_4_23(op_8v1) }; - let op_12v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_12v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_12v1 = { @@ -596,21 +596,21 @@ fn main() { #[inline(always)] pub fn op_12v1__for_each__loc_nopath_4_25_4_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -624,10 +624,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_8v1, op_12v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__transitive_closure@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__transitive_closure@datalog_program.snap index 3584873bb0d5..80e4033ca267 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__transitive_closure@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__transitive_closure@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"union ()\"},\"version\":1},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (edges)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (seed_reachable)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | reachable . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , (() , (_ ,))) | (kv . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | ((row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":17,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":7,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":7,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":16,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":16,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":7,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":12,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"edges_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"seed_reachable_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"reachable_insert\",\"version\":1},{\"value\":\"reachable_insert\",\"version\":1},{\"value\":\"reachable\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_3\",\"version\":1},{\"value\":\"join_3\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,17 +15,17 @@ fn main() { let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let mut sg_1v1_node_10v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -35,21 +35,21 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_1v1_node_11v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -59,38 +59,38 @@ fn main() { let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_15v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_15v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_15v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_15v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -103,13 +103,13 @@ fn main() { move |context, var_args!(hoff_6v3_recv), var_args!(hoff_6v3_send)| { let mut hoff_6v3_recv = hoff_6v3_recv.borrow_mut_swap(); let hoff_6v3_recv = hoff_6v3_recv.drain(..); - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); let op_10v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_10v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -199,7 +199,7 @@ fn main() { op_2v1__unique__loc_nopath_2_19_2_24(op_2v1) }; let op_11v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_11v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -447,12 +447,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -466,7 +466,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -719,7 +719,7 @@ fn main() { } op_8v1__unique__loc_nopath_4_20_4_29(op_8v1) }; - let op_12v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_12v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { reachable.send(v).unwrap() }); let op_12v1 = { @@ -727,21 +727,21 @@ fn main() { #[inline(always)] pub fn op_12v1__for_each__loc_nopath_4_31_4_71< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -752,7 +752,7 @@ fn main() { } op_12v1__for_each__loc_nopath_4_31_4_71(op_12v1) }; - let op_9v1 = hydroflow::pusherator::tee::Tee::new( + let op_9v1 = dfir_rs::pusherator::tee::Tee::new( op_12v1, hoff_6v3_send, ); @@ -761,21 +761,21 @@ fn main() { #[inline(always)] pub fn op_9v1__tee__loc_nopath_4_20_4_29< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -789,10 +789,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_8v1, op_9v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__triple_relation_join@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__triple_relation_join@datalog_program.snap index f7c05b0ce437..b7ff018e7d7f 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__triple_relation_join@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__triple_relation_join@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"source_stream (in1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in2)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (in3)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ , _ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 0 . 1 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ , _ ,) | ((_v . 2 ,) , (_v . 1 , _v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ , _ ,) | ((row . 3 , row . 0 , row . 2 , row . 1 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ , _ , _ , _ ,) , _) | (g . 0 , g . 1 , g . 2 , g . 3 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":19,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":15,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":21,\"version\":1},{\"idx\":22,\"version\":1},{\"idx\":25,\"version\":1},{\"idx\":26,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in1_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"in3_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_4\",\"version\":1},{\"value\":\"join_4\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,12 +15,12 @@ fn main() { let mut sg_1v1_node_13v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -30,21 +30,21 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_1v1_node_14v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -54,21 +54,21 @@ fn main() { let sg_1v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_1v1_node_15v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -78,58 +78,58 @@ fn main() { let sg_1v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_1v1_node_17v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_17v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_17v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_17v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_21v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_21v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_21v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_1v1_node_21v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_1v1_node_11v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -141,7 +141,7 @@ fn main() { false, move |context, var_args!(), var_args!()| { let op_13v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_13v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -231,7 +231,7 @@ fn main() { op_2v1__unique__loc_nopath_2_19_2_22(op_2v1) }; let op_14v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_14v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -321,7 +321,7 @@ fn main() { op_5v1__unique__loc_nopath_3_19_3_22(op_5v1) }; let op_15v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_15v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -495,12 +495,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -514,7 +514,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -685,12 +685,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -704,7 +704,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -920,7 +920,7 @@ fn main() { } op_11v1__unique__loc_nopath_5_20_5_23(op_11v1) }; - let op_16v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_16v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_16v1 = { @@ -928,21 +928,21 @@ fn main() { #[inline(always)] pub fn op_16v1__for_each__loc_nopath_5_25_5_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -956,10 +956,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_11v1, op_16v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__wildcard_fields@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__wildcard_fields@datalog_program.snap index 5db39fd5f303..3c497bdea542 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__wildcard_fields@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__wildcard_fields@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":2},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (input)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | out . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , (_ ,))) | (kv . 0 . 0 , kv . 1 . 0 . 0 , kv . 1 . 1 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 1 ,) , (_v . 0 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ , _ ,) | ((row . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : ((_ ,) , _) | (g . 0 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":6,\"version\":3},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":null,\"version\":2},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":6,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":4,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":3},{\"idx\":12,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":7,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":12,\"version\":1},{\"idx\":9,\"version\":1},{\"idx\":10,\"version\":1},{\"idx\":13,\"version\":1},{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"input_insert\",\"version\":1},{\"value\":\"input\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"out_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,22 +15,22 @@ fn main() { let (hoff_4v3_send, hoff_4v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(4v3)"); let (hoff_6v3_send, hoff_6v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(6v3)"); let mut sg_1v1_node_7v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -40,38 +40,38 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_2v1_node_9v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_2v1_node_9v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_2v1_node_9v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_2v1_node_9v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_2v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); @@ -82,18 +82,18 @@ fn main() { var_expr!(hoff_4v3_send, hoff_6v3_send), false, move |context, var_args!(), var_args!(hoff_4v3_send, hoff_6v3_send)| { - let hoff_4v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_4v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_4v3_send.give(Some(v)); }); - let hoff_6v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_6v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_6v3_send.give(Some(v)); }); let op_7v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_7v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -182,7 +182,7 @@ fn main() { } op_2v1__unique__loc_nopath_2_19_2_24(op_2v1) }; - let op_3v1 = hydroflow::pusherator::tee::Tee::new( + let op_3v1 = dfir_rs::pusherator::tee::Tee::new( hoff_6v3_send, hoff_4v3_send, ); @@ -191,21 +191,21 @@ fn main() { #[inline(always)] pub fn op_3v1__tee__loc_nopath_2_19_2_24< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -219,10 +219,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_2v1, op_3v1); }, @@ -323,12 +323,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -342,7 +342,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -551,7 +551,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_20_3_23(op_5v1) }; - let op_8v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_8v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { out.send(v).unwrap() }); let op_8v1 = { @@ -559,21 +559,21 @@ fn main() { #[inline(always)] pub fn op_8v1__for_each__loc_nopath_3_25_3_59< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -587,10 +587,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_5v1, op_8v1); }, diff --git a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__wildcard_join_count@datalog_program.snap b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__wildcard_join_count@datalog_program.snap index dd39d2b08607..4446535d46d7 100644 --- a/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__wildcard_join_count@datalog_program.snap +++ b/dfir_datalog_core/src/snapshots/hydroflow_datalog_core__tests__wildcard_join_count@datalog_program.snap @@ -6,8 +6,8 @@ fn main() { { #[allow(unused_qualifications)] { - use hydroflow::{var_expr, var_args}; - let mut df = hydroflow::scheduled::graph::Hydroflow::new(); + use dfir_rs::{var_expr, var_args}; + let mut df = dfir_rs::scheduled::graph::dfir_rs::new(); df.__assign_meta_graph( "{\"nodes\":[{\"value\":null,\"version\":0},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Operator\":\"tee ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"unique :: < 'tick > ()\"},\"version\":1},{\"value\":{\"Handoff\":{}},\"version\":3},{\"value\":{\"Operator\":\"source_stream (ints1)\"},\"version\":1},{\"value\":{\"Operator\":\"source_stream (ints2)\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"for_each (| v | result2 . send (v) . unwrap ())\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , ())) | (kv . 0 . 0 , kv . 1 . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , (() ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some (prev + 1) } else { Some (1) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () ,))\"},\"version\":1},{\"value\":{\"Operator\":\"join :: < 'tick , 'tick , hydroflow :: compiled :: pull :: HalfMultisetJoinState > ()\"},\"version\":1},{\"value\":{\"Operator\":\"map (| kv : ((_ ,) , ((_ ,) , ())) | (kv . 0 . 0 , kv . 1 . 0 . 0 ,))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ , _ ,) | ((_v . 0 ,) , (_v . 1 ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| _v : (_ ,) | ((_v . 0 ,) , ()))\"},\"version\":1},{\"value\":{\"Operator\":\"map (| row : (_ , _ ,) | (() , ((row . 0) ,)))\"},\"version\":1},{\"value\":{\"Operator\":\"fold_keyed :: < 'tick , () , (Option < _ > ,) > (| | (None ,) , | old : & mut (Option < _ > ,) , val : (_ ,) | { old . 0 = if let Some (prev) = old . 0 . take () { Some ({ let prev : (hydroflow :: rustc_hash :: FxHashSet < _ > , _) = prev ; let mut set : hydroflow :: rustc_hash :: FxHashSet < _ > = prev . 0 ; if set . insert (val . 0) { (set , prev . 1 + 1) } else { (set , prev . 1) } }) } else { Some ({ let mut set = hydroflow :: rustc_hash :: FxHashSet :: < _ > :: default () ; set . insert (val . 0) ; (set , 1) }) } ; })\"},\"version\":1},{\"value\":{\"Operator\":\"map (| (g , a) : (() , _) | (a . 0 . unwrap () . 1 ,))\"},\"version\":1}],\"graph\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":5,\"version\":1},{\"idx\":6,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":23,\"version\":1},{\"idx\":8,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":9,\"version\":3},{\"idx\":20,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":30,\"version\":1},{\"idx\":11,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":12,\"version\":3},{\"idx\":19,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":1,\"version\":3},{\"idx\":29,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":4,\"version\":3},{\"idx\":27,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":8,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":12,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":1},{\"idx\":9,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":7,\"version\":3},{\"idx\":26,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":21,\"version\":1},{\"idx\":10,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":18,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":24,\"version\":1},{\"idx\":25,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":3,\"version\":1},{\"idx\":7,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":27,\"version\":1},{\"idx\":24,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":6,\"version\":1},{\"idx\":4,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":10,\"version\":3},{\"idx\":22,\"version\":1}],\"version\":3},{\"value\":[{\"idx\":29,\"version\":1},{\"idx\":30,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":28,\"version\":1},{\"idx\":1,\"version\":3}],\"version\":3},{\"value\":[{\"idx\":25,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":1}],\"ports\":[{\"value\":null,\"version\":0},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"0\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",{\"Int\":\"0\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",{\"Int\":\"1\"}],\"version\":1},{\"value\":[{\"Int\":\"1\"},\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1},{\"value\":[\"Elided\",\"Elided\"],\"version\":3},{\"value\":[\"Elided\",\"Elided\"],\"version\":1}],\"node_loops\":[{\"value\":null,\"version\":0}],\"loop_nodes\":[{\"value\":null,\"version\":0}],\"loop_parent\":[{\"value\":null,\"version\":0}],\"loop_children\":[{\"value\":null,\"version\":0}],\"node_subgraph\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":null,\"version\":0},{\"value\":{\"idx\":1,\"version\":1},\"version\":1},{\"value\":{\"idx\":2,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":5,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":3,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":6,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1},{\"value\":{\"idx\":4,\"version\":1},\"version\":1}],\"subgraph_nodes\":[{\"value\":null,\"version\":0},{\"value\":[{\"idx\":13,\"version\":1},{\"idx\":2,\"version\":1},{\"idx\":3,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":14,\"version\":1},{\"idx\":5,\"version\":1},{\"idx\":6,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":22,\"version\":1},{\"idx\":23,\"version\":1},{\"idx\":8,\"version\":1},{\"idx\":15,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":29,\"version\":1},{\"idx\":30,\"version\":1},{\"idx\":11,\"version\":1},{\"idx\":16,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":19,\"version\":1},{\"idx\":20,\"version\":1},{\"idx\":17,\"version\":1},{\"idx\":18,\"version\":1},{\"idx\":21,\"version\":1}],\"version\":1},{\"value\":[{\"idx\":26,\"version\":1},{\"idx\":27,\"version\":1},{\"idx\":24,\"version\":1},{\"idx\":25,\"version\":1},{\"idx\":28,\"version\":1}],\"version\":1}],\"subgraph_stratum\":[{\"value\":null,\"version\":0},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1},{\"value\":1,\"version\":1},{\"value\":1,\"version\":1},{\"value\":0,\"version\":1},{\"value\":0,\"version\":1}],\"node_singleton_references\":[{\"value\":null,\"version\":0},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1},{\"value\":[],\"version\":1}],\"node_varnames\":[{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"ints1_insert\",\"version\":1},{\"value\":\"ints1\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"ints2_insert\",\"version\":1},{\"value\":\"ints2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":\"result_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"result2_insert\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_2\",\"version\":1},{\"value\":\"join_2\",\"version\":1},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":null,\"version\":0},{\"value\":\"join_5\",\"version\":1},{\"value\":\"join_5\",\"version\":1}],\"subgraph_laziness\":[{\"value\":null,\"version\":0}]}", ); @@ -15,42 +15,42 @@ fn main() { let (hoff_1v3_send, hoff_1v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(1v3)"); let (hoff_4v3_send, hoff_4v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(4v3)"); let (hoff_7v3_send, hoff_7v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(7v3)"); let (hoff_9v3_send, hoff_9v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(9v3)"); let (hoff_10v3_send, hoff_10v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(10v3)"); let (hoff_12v3_send, hoff_12v3_recv) = df .make_edge::< _, - hydroflow::scheduled::handoff::VecHandoff<_>, + dfir_rs::scheduled::handoff::VecHandoff<_>, >("handoff GraphNodeId(12v3)"); let mut sg_1v1_node_13v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -60,21 +60,21 @@ fn main() { let sg_1v1_node_2v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let mut sg_2v1_node_14v1_stream = { #[inline(always)] fn check_stream< - Stream: hydroflow::futures::stream::Stream + Stream: dfir_rs::futures::stream::Stream + ::std::marker::Unpin, Item, >( stream: Stream, - ) -> impl hydroflow::futures::stream::Stream< + ) -> impl dfir_rs::futures::stream::Stream< Item = Item, > + ::std::marker::Unpin { stream @@ -84,81 +84,81 @@ fn main() { let sg_2v1_node_5v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_3v1_node_22v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(), (Option<_>,)>::default(), ), ); let sg_3v1_node_8v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_4v1_node_29v1_groupbydata = df .add_state( ::std::cell::RefCell::new( - hydroflow::rustc_hash::FxHashMap::<(), (Option<_>,)>::default(), + dfir_rs::rustc_hash::FxHashMap::<(), (Option<_>,)>::default(), ), ); let sg_4v1_node_11v1_uniquedata = df .add_state( ::std::cell::RefCell::new( - hydroflow::util::monotonic_map::MonotonicMap::< + dfir_rs::util::monotonic_map::MonotonicMap::< _, - hydroflow::rustc_hash::FxHashSet<_>, + dfir_rs::rustc_hash::FxHashSet<_>, >::default(), ), ); let sg_5v1_node_17v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_5v1_node_17v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_5v1_node_17v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_5v1_node_17v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_6v1_node_24v1_joindata_lhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_6v1_node_24v1_joindata_lhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); let sg_6v1_node_24v1_joindata_rhs = df .add_state( ::std::cell::RefCell::new( - hydroflow::compiled::pull::HalfMultisetJoinState::default(), + dfir_rs::compiled::pull::HalfMultisetJoinState::default(), ), ); df.set_state_tick_hook( sg_6v1_node_24v1_joindata_rhs, - |rcell| hydroflow::util::clear::Clear::clear(rcell.get_mut()), + |rcell| dfir_rs::util::clear::Clear::clear(rcell.get_mut()), ); df.add_subgraph_stratified( "Subgraph GraphSubgraphId(1v1)", @@ -167,18 +167,18 @@ fn main() { var_expr!(hoff_7v3_send, hoff_12v3_send), false, move |context, var_args!(), var_args!(hoff_7v3_send, hoff_12v3_send)| { - let hoff_7v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_7v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_7v3_send.give(Some(v)); }); - let hoff_12v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_12v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_12v3_send.give(Some(v)); }); let op_13v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_1v1_node_13v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -267,7 +267,7 @@ fn main() { } op_2v1__unique__loc_nopath_2_19_2_24(op_2v1) }; - let op_3v1 = hydroflow::pusherator::tee::Tee::new( + let op_3v1 = dfir_rs::pusherator::tee::Tee::new( hoff_12v3_send, hoff_7v3_send, ); @@ -276,21 +276,21 @@ fn main() { #[inline(always)] pub fn op_3v1__tee__loc_nopath_2_19_2_24< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -304,10 +304,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_1v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_1v1(op_2v1, op_3v1); }, @@ -319,18 +319,18 @@ fn main() { var_expr!(hoff_4v3_send, hoff_9v3_send), false, move |context, var_args!(), var_args!(hoff_4v3_send, hoff_9v3_send)| { - let hoff_4v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_4v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_4v3_send.give(Some(v)); }); - let hoff_9v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_9v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_9v3_send.give(Some(v)); }); let op_14v1 = std::iter::from_fn(|| { - match hydroflow::futures::stream::Stream::poll_next( + match dfir_rs::futures::stream::Stream::poll_next( ::std::pin::Pin::new(&mut sg_2v1_node_14v1_stream), &mut std::task::Context::from_waker(&context.waker()), ) { @@ -419,7 +419,7 @@ fn main() { } op_5v1__unique__loc_nopath_3_19_3_24(op_5v1) }; - let op_6v1 = hydroflow::pusherator::tee::Tee::new( + let op_6v1 = dfir_rs::pusherator::tee::Tee::new( hoff_9v3_send, hoff_4v3_send, ); @@ -428,21 +428,21 @@ fn main() { #[inline(always)] pub fn op_6v1__tee__loc_nopath_3_19_3_24< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -456,10 +456,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_2v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_2v1(op_5v1, op_6v1); }, @@ -637,7 +637,7 @@ fn main() { } op_8v1__unique__loc_nopath_5_20_5_26(op_8v1) }; - let op_15v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_15v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result.send(v).unwrap() }); let op_15v1 = { @@ -645,21 +645,21 @@ fn main() { #[inline(always)] pub fn op_15v1__for_each__loc_nopath_5_28_5_65< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -673,10 +673,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_3v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_3v1(op_8v1, op_15v1); }, @@ -728,8 +728,8 @@ fn main() { |old: &mut (Option<_>,), val: (_,)| { old.0 = if let Some(prev) = old.0.take() { Some({ - let prev: (hydroflow::rustc_hash::FxHashSet<_>, _) = prev; - let mut set: hydroflow::rustc_hash::FxHashSet<_> = prev.0; + let prev: (dfir_rs::rustc_hash::FxHashSet<_>, _) = prev; + let mut set: dfir_rs::rustc_hash::FxHashSet<_> = prev.0; if set.insert(val.0) { (set, prev.1 + 1) } else { @@ -738,7 +738,7 @@ fn main() { }) } else { Some({ - let mut set = hydroflow::rustc_hash::FxHashSet::< + let mut set = dfir_rs::rustc_hash::FxHashSet::< _, >::default(); set.insert(val.0); @@ -868,7 +868,7 @@ fn main() { } op_11v1__unique__loc_nopath_6_20_6_27(op_11v1) }; - let op_16v1 = hydroflow::pusherator::for_each::ForEach::new(|v| { + let op_16v1 = dfir_rs::pusherator::for_each::ForEach::new(|v| { result2.send(v).unwrap() }); let op_16v1 = { @@ -876,21 +876,21 @@ fn main() { #[inline(always)] pub fn op_16v1__for_each__loc_nopath_6_29_6_67< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, >( input: Input, - ) -> impl hydroflow::pusherator::Pusherator { + ) -> impl dfir_rs::pusherator::Pusherator { #[repr(transparent)] struct Push< Item, - Input: hydroflow::pusherator::Pusherator, + Input: dfir_rs::pusherator::Pusherator, > { inner: Input, } impl< Item, - Input: hydroflow::pusherator::Pusherator, - > hydroflow::pusherator::Pusherator for Push { + Input: dfir_rs::pusherator::Pusherator, + > dfir_rs::pusherator::Pusherator for Push { type Item = Item; #[inline(always)] fn give(&mut self, item: Self::Item) { @@ -904,10 +904,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_4v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_4v1(op_11v1, op_16v1); }, @@ -927,7 +927,7 @@ fn main() { let hoff_9v3_recv = hoff_9v3_recv.drain(..); let mut hoff_12v3_recv = hoff_12v3_recv.borrow_mut_swap(); let hoff_12v3_recv = hoff_12v3_recv.drain(..); - let hoff_10v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_10v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_10v3_send.give(Some(v)); @@ -1017,12 +1017,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -1036,7 +1036,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -1162,10 +1162,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_5v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_5v1(op_21v1, hoff_10v3_send); }, @@ -1185,7 +1185,7 @@ fn main() { let hoff_4v3_recv = hoff_4v3_recv.drain(..); let mut hoff_7v3_recv = hoff_7v3_recv.borrow_mut_swap(); let hoff_7v3_recv = hoff_7v3_recv.drain(..); - let hoff_1v3_send = hydroflow::pusherator::for_each::ForEach::new(| + let hoff_1v3_send = dfir_rs::pusherator::for_each::ForEach::new(| v| { hoff_1v3_send.give(Some(v)); @@ -1275,12 +1275,12 @@ fn main() { fn check_inputs<'a, K, I1, V1, I2, V2>( lhs: I1, rhs: I2, - lhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + lhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V1, V2, >, - rhs_state: &'a mut hydroflow::compiled::pull::HalfMultisetJoinState< + rhs_state: &'a mut dfir_rs::compiled::pull::HalfMultisetJoinState< K, V2, V1, @@ -1294,7 +1294,7 @@ fn main() { I1: 'a + Iterator, I2: 'a + Iterator, { - hydroflow::compiled::pull::symmetric_hash_join_into_iter( + dfir_rs::compiled::pull::symmetric_hash_join_into_iter( lhs, rhs, lhs_state, @@ -1420,10 +1420,10 @@ fn main() { #[inline(always)] fn pivot_run_sg_6v1< Pull: ::std::iter::Iterator, - Push: hydroflow::pusherator::Pusherator, + Push: dfir_rs::pusherator::Pusherator, Item, >(pull: Pull, push: Push) { - hydroflow::pusherator::pivot::Pivot::new(pull, push).run(); + dfir_rs::pusherator::pivot::Pivot::new(pull, push).run(); } pivot_run_sg_6v1(op_28v1, hoff_1v3_send); }, diff --git a/dfir_lang/build.rs b/dfir_lang/build.rs index 17e39e4ff844..b20d039c78e4 100644 --- a/dfir_lang/build.rs +++ b/dfir_lang/build.rs @@ -132,9 +132,9 @@ fn generate_op_docs() -> Result<()> { const DOCTEST_HYDROFLOW_PREFIX: &str = "\ # { -# let __rt = ::hydroflow::tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap(); -# __rt.block_on(async { ::hydroflow::tokio::task::LocalSet::new().run_until(async { -# let mut __hf = ::hydroflow::dfir_syntax! {"; +# let __rt = ::dfir_rs::tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap(); +# __rt.block_on(async { ::dfir_rs::tokio::task::LocalSet::new().run_until(async { +# let mut __hf = ::dfir_rs::dfir_syntax! {"; const DOCTEST_HYDROFLOW_SUFFIX: &str = "\ # }; # __hf.run_available(); diff --git a/dfir_lang/src/graph/ops/_lattice_join_fused_join.rs b/dfir_lang/src/graph/ops/_lattice_join_fused_join.rs index f777acef489b..82c8848a7e2d 100644 --- a/dfir_lang/src/graph/ops/_lattice_join_fused_join.rs +++ b/dfir_lang/src/graph/ops/_lattice_join_fused_join.rs @@ -46,8 +46,8 @@ use super::{ /// ### Examples /// /// ```hydroflow -/// use hydroflow::lattices::Min; -/// use hydroflow::lattices::Max; +/// use dfir_rs::lattices::Min; +/// use dfir_rs::lattices::Max; /// /// source_iter([("key", Min::new(1)), ("key", Min::new(2))]) -> [0]my_join; /// source_iter([("key", Max::new(1)), ("key", Max::new(2))]) -> [1]my_join; @@ -61,8 +61,8 @@ use super::{ /// ``` /// /// ```hydroflow -/// use hydroflow::lattices::set_union::SetUnionSingletonSet; -/// use hydroflow::lattices::set_union::SetUnionHashSet; +/// use dfir_rs::lattices::set_union::SetUnionSingletonSet; +/// use dfir_rs::lattices::set_union::SetUnionHashSet; /// /// source_iter([("key", SetUnionSingletonSet::new_from(0)), ("key", SetUnionSingletonSet::new_from(1))]) -> [0]my_join; /// source_iter([("key", SetUnionHashSet::new_from([0])), ("key", SetUnionHashSet::new_from([1]))]) -> [1]my_join; diff --git a/dfir_lang/src/graph/ops/cross_join.rs b/dfir_lang/src/graph/ops/cross_join.rs index f8248bc251c5..acea40f318f8 100644 --- a/dfir_lang/src/graph/ops/cross_join.rs +++ b/dfir_lang/src/graph/ops/cross_join.rs @@ -18,8 +18,8 @@ use super::{OperatorCategory, OperatorConstraints, WriteContextArgs, RANGE_1}; /// in the same way as [`join`](#join), see [`join`'s documentation](#join) for more info. /// /// ```rustbook -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::<&str>(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<&str>(); +/// let mut flow = dfir_rs::dfir_syntax! { /// my_join = cross_join::<'tick>(); /// source_iter(["hello", "bye"]) -> [0]my_join; /// source_stream(input_recv) -> [1]my_join; diff --git a/dfir_lang/src/graph/ops/defer_tick.rs b/dfir_lang/src/graph/ops/defer_tick.rs index 81d35354a470..01b32583988d 100644 --- a/dfir_lang/src/graph/ops/defer_tick.rs +++ b/dfir_lang/src/graph/ops/defer_tick.rs @@ -16,7 +16,7 @@ use super::{ /// /// ```rustbook /// pub fn main() { -/// let mut df = hydroflow::dfir_syntax! { +/// let mut df = dfir_rs::dfir_syntax! { /// source_iter(vec!(true)) /// -> state; /// state = union() @@ -39,8 +39,8 @@ use super::{ /// tick. /// ```rustbook /// // Outputs 1 2 3 4 5 6 (on separate lines). -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); +/// let mut flow = dfir_rs::dfir_syntax! { /// inp = source_stream(input_recv) -> tee(); /// inp -> [pos]diff; /// inp -> defer_tick() -> [neg]diff; diff --git a/dfir_lang/src/graph/ops/dest_sink.rs b/dfir_lang/src/graph/ops/dest_sink.rs index 2312486d5e2f..05a1428f6c33 100644 --- a/dfir_lang/src/graph/ops/dest_sink.rs +++ b/dfir_lang/src/graph/ops/dest_sink.rs @@ -14,10 +14,10 @@ use super::{ /// Note this operator must be used within a Tokio runtime, and the Hydroflow program must be launched with `run_async`. /// /// ```rustbook -/// # #[hydroflow::main] +/// # #[dfir_rs::main] /// # async fn main() { /// // In this example we use a _bounded_ channel for our `Sink`. This is for demonstration only, -/// // instead you should use [`hydroflow::util::unbounded_channel`]. A bounded channel results in +/// // instead you should use [`dfir_rs::util::unbounded_channel`]. A bounded channel results in /// // `Hydroflow` buffering items internally instead of within the channel. (We can't use /// // unbounded here since unbounded channels are synchonous to write to and therefore not /// // `Sink`s.) @@ -25,7 +25,7 @@ use super::{ /// // `PollSender` adapts the send half of the bounded channel into a `Sink`. /// let send = tokio_util::sync::PollSender::new(send); /// -/// let mut flow = hydroflow::dfir_syntax! { +/// let mut flow = dfir_rs::dfir_syntax! { /// source_iter(0..10) -> dest_sink(send); /// }; /// // Call `run_async()` to allow async events to propagate, run for one second. @@ -37,7 +37,7 @@ use super::{ /// // Only 5 elements received due to buffer size. /// // (Note that if we were using a multi-threaded executor instead of `current_thread` it would /// // be possible for more items to be added as they're removed, resulting in >5 collected.) -/// let out: Vec<_> = hydroflow::util::ready_iter(&mut recv).collect(); +/// let out: Vec<_> = dfir_rs::util::ready_iter(&mut recv).collect(); /// assert_eq!(&[0, 1, 2, 3, 4], &*out); /// # } /// ``` @@ -56,7 +56,7 @@ use super::{ /// `BytesCodec`. /// /// ```rustbook -/// # #[hydroflow::main] +/// # #[dfir_rs::main] /// # async fn main() { /// use bytes::Bytes; /// use tokio::io::AsyncReadExt; @@ -66,7 +66,7 @@ use super::{ /// // Now instead handle discrete byte strings by length-encoding them. /// let sink = tokio_util::codec::FramedWrite::new(asyncwrite, tokio_util::codec::BytesCodec::new()); /// -/// let mut flow = hydroflow::dfir_syntax! { +/// let mut flow = dfir_rs::dfir_syntax! { /// source_iter([ /// Bytes::from_static(b"hello"), /// Bytes::from_static(b"world"), diff --git a/dfir_lang/src/graph/ops/dest_sink_serde.rs b/dfir_lang/src/graph/ops/dest_sink_serde.rs index fd8ef50749d5..b320f8e850e4 100644 --- a/dfir_lang/src/graph/ops/dest_sink_serde.rs +++ b/dfir_lang/src/graph/ops/dest_sink_serde.rs @@ -13,10 +13,10 @@ use super::{ /// Note this operator must be used within a Tokio runtime. /// ```rustbook /// async fn serde_out() { -/// let addr = hydroflow::util::ipv4_resolve("localhost:9000".into()).unwrap(); -/// let (outbound, inbound, _) = hydroflow::util::bind_udp_bytes(addr).await; -/// let remote = hydroflow::util::ipv4_resolve("localhost:9001".into()).unwrap(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let addr = dfir_rs::util::ipv4_resolve("localhost:9000".into()).unwrap(); +/// let (outbound, inbound, _) = dfir_rs::util::bind_udp_bytes(addr).await; +/// let remote = dfir_rs::util::ipv4_resolve("localhost:9001".into()).unwrap(); +/// let mut flow = dfir_rs::dfir_syntax! { /// source_iter(vec![("hello".to_string(), 1), ("world".to_string(), 2)]) /// -> map (|m| (m, remote)) -> dest_sink_serde(outbound); /// }; diff --git a/dfir_lang/src/graph/ops/fold_keyed.rs b/dfir_lang/src/graph/ops/fold_keyed.rs index 4d2d6f885c8f..b4cbded59c2a 100644 --- a/dfir_lang/src/graph/ops/fold_keyed.rs +++ b/dfir_lang/src/graph/ops/fold_keyed.rs @@ -45,8 +45,8 @@ use super::{ /// /// Example using `'tick` persistence: /// ```rustbook -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::<(&str, &str)>(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<(&str, &str)>(); +/// let mut flow = dfir_rs::dfir_syntax! { /// source_stream(input_recv) /// -> fold_keyed::<'tick, &str, String>(String::new, |old: &mut _, val| { /// *old += val; diff --git a/dfir_lang/src/graph/ops/join.rs b/dfir_lang/src/graph/ops/join.rs index acb37f87a796..1a7b9867237f 100644 --- a/dfir_lang/src/graph/ops/join.rs +++ b/dfir_lang/src/graph/ops/join.rs @@ -49,8 +49,8 @@ use crate::diagnostic::{Diagnostic, Level}; /// ### Examples /// /// ```rustbook -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::<(&str, &str)>(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<(&str, &str)>(); +/// let mut flow = dfir_rs::dfir_syntax! { /// source_iter([("hello", "world")]) -> [0]my_join; /// source_stream(input_recv) -> [1]my_join; /// my_join = join::<'tick>() -> for_each(|(k, (v1, v2))| println!("({}, ({}, {}))", k, v1, v2)); @@ -66,8 +66,8 @@ use crate::diagnostic::{Diagnostic, Level}; /// --- /// /// ```rustbook -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::<(&str, &str)>(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<(&str, &str)>(); +/// let mut flow = dfir_rs::dfir_syntax! { /// source_iter([("hello", "world")]) -> [0]my_join; /// source_stream(input_recv) -> [1]my_join; /// my_join = join::<'static>() -> for_each(|(k, (v1, v2))| println!("({}, ({}, {}))", k, v1, v2)); diff --git a/dfir_lang/src/graph/ops/lattice_fold.rs b/dfir_lang/src/graph/ops/lattice_fold.rs index 8d85945451eb..24c8f0a60fac 100644 --- a/dfir_lang/src/graph/ops/lattice_fold.rs +++ b/dfir_lang/src/graph/ops/lattice_fold.rs @@ -8,7 +8,7 @@ use super::{ /// > 1 input stream, 1 output stream /// /// A specialized operator for merging lattices together into a accumulated value. Like [`fold()`](#fold) -/// but specialized for lattice types. `lattice_fold(MyLattice::default)` is equivalent to `fold(MyLattice::default, hydroflow::lattices::Merge::merge)`. +/// but specialized for lattice types. `lattice_fold(MyLattice::default)` is equivalent to `fold(MyLattice::default, dfir_rs::lattices::Merge::merge)`. /// /// `lattice_fold` can also be provided with one generic lifetime persistence argument, either /// `'tick` or `'static`, to specify how data persists. With `'tick`, values will only be collected @@ -20,8 +20,8 @@ use super::{ /// But it also means that the accumulating type must have a sensible default value /// /// ```hydroflow -/// use hydroflow::lattices::set_union::SetUnionSingletonSet; -/// use hydroflow::lattices::set_union::SetUnionHashSet; +/// use dfir_rs::lattices::set_union::SetUnionSingletonSet; +/// use dfir_rs::lattices::set_union::SetUnionHashSet; /// /// source_iter([SetUnionSingletonSet::new_from(7)]) /// -> lattice_fold(SetUnionHashSet::::default) diff --git a/dfir_lang/src/graph/ops/lattice_reduce.rs b/dfir_lang/src/graph/ops/lattice_reduce.rs index a38a7dc2481f..d551413de159 100644 --- a/dfir_lang/src/graph/ops/lattice_reduce.rs +++ b/dfir_lang/src/graph/ops/lattice_reduce.rs @@ -9,7 +9,7 @@ use super::{ /// > 1 input stream, 1 output stream /// /// A specialized operator for merging lattices together into an accumulated value. Like [`reduce()`](#reduce) -/// but specialized for lattice types. `lattice_reduce()` is equivalent to `reduce(hydroflow::lattices::Merge::merge)`. +/// but specialized for lattice types. `lattice_reduce()` is equivalent to `reduce(dfir_rs::lattices::Merge::merge)`. /// /// `lattice_reduce` can also be provided with one generic lifetime persistence argument, either /// `'tick` or `'static`, to specify how data persists. With `'tick`, values will only be collected @@ -21,7 +21,7 @@ use super::{ /// But it also means that the accumulating function inputs and the accumulating type must be the same. /// /// ```hydroflow -/// use hydroflow::lattices::Max; +/// use dfir_rs::lattices::Max; /// /// source_iter([1, 2, 3, 4, 5]) /// -> map(Max::new) diff --git a/dfir_lang/src/graph/ops/mod.rs b/dfir_lang/src/graph/ops/mod.rs index c4c35ce02065..78b712ad41ea 100644 --- a/dfir_lang/src/graph/ops/mod.rs +++ b/dfir_lang/src/graph/ops/mod.rs @@ -340,10 +340,10 @@ pub struct WriteContextArgs<'a> { /// `hydroflow` crate name for `use #root::something`. pub root: &'a TokenStream, /// `context` ident, the name of the provided - /// [`hydroflow::scheduled::Context`](https://hydro-project.github.io/hydroflow/doc/hydroflow/scheduled/context/struct.Context.html). + /// [`dfir_rs::scheduled::Context`](https://hydro-project.github.io/hydroflow/doc/hydroflow/scheduled/context/struct.Context.html). pub context: &'a Ident, /// `df` ident, the name of the - /// [`hydroflow::scheduled::graph::Hydroflow`](https://hydro-project.github.io/hydroflow/doc/hydroflow/scheduled/graph/struct.Hydroflow.html) + /// [`dfir_rs::scheduled::graph::Hydroflow`](https://hydro-project.github.io/hydroflow/doc/hydroflow/scheduled/graph/struct.Hydroflow.html) /// instance. pub hydroflow: &'a Ident, /// Subgraph ID in which this operator is contained. @@ -474,7 +474,7 @@ pub enum Persistence { /// Helper which creates a error message string literal for when the Tokio runtime is not found. fn make_missing_runtime_msg(op_name: &str) -> Literal { - Literal::string(&format!("`{}()` must be used within a Tokio runtime. For example, use `#[hydroflow::main]` on your main method.", op_name)) + Literal::string(&format!("`{}()` must be used within a Tokio runtime. For example, use `#[dfir_rs::main]` on your main method.", op_name)) } /// Operator categories, for docs. diff --git a/dfir_lang/src/graph/ops/multiset_delta.rs b/dfir_lang/src/graph/ops/multiset_delta.rs index 00d346dca73a..fee459cbda03 100644 --- a/dfir_lang/src/graph/ops/multiset_delta.rs +++ b/dfir_lang/src/graph/ops/multiset_delta.rs @@ -9,8 +9,8 @@ use super::{ /// Multiset delta from the previous tick. /// /// ```rustbook -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); +/// let mut flow = dfir_rs::dfir_syntax! { /// source_stream(input_recv) /// -> multiset_delta() /// -> for_each(|n| println!("{}", n)); diff --git a/dfir_lang/src/graph/ops/persist.rs b/dfir_lang/src/graph/ops/persist.rs index 872580d1ce48..1d3b24ca3c32 100644 --- a/dfir_lang/src/graph/ops/persist.rs +++ b/dfir_lang/src/graph/ops/persist.rs @@ -22,8 +22,8 @@ use crate::diagnostic::{Diagnostic, Level}; /// across ticks. This can be useful for optimization transformations within the hydroflow /// compiler. Equivalently, we could specify that the join has `static` persistence (`my_join = join::<'static>()`). /// ```rustbook -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::<(&str, &str)>(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<(&str, &str)>(); +/// let mut flow = dfir_rs::dfir_syntax! { /// source_iter([("hello", "world")]) -> persist::<'static>() -> [0]my_join; /// source_stream(input_recv) -> persist::<'static>() -> [1]my_join; /// my_join = join::<'tick>() -> for_each(|(k, (v1, v2))| println!("({}, ({}, {}))", k, v1, v2)); diff --git a/dfir_lang/src/graph/ops/persist_mut.rs b/dfir_lang/src/graph/ops/persist_mut.rs index 822d98b30e9e..75b892b2a00e 100644 --- a/dfir_lang/src/graph/ops/persist_mut.rs +++ b/dfir_lang/src/graph/ops/persist_mut.rs @@ -13,7 +13,7 @@ use crate::diagnostic::{Diagnostic, Level}; /// For example, `[Persist(1), Delete(1), Persist(1)]` will result in a a single `1` value being stored. /// /// ```hydroflow -/// use hydroflow::util::Persistence; +/// use dfir_rs::util::Persistence; /// /// source_iter([ /// Persistence::Persist(1), diff --git a/dfir_lang/src/graph/ops/persist_mut_keyed.rs b/dfir_lang/src/graph/ops/persist_mut_keyed.rs index 6e97e74b95cb..93b8a8d8490f 100644 --- a/dfir_lang/src/graph/ops/persist_mut_keyed.rs +++ b/dfir_lang/src/graph/ops/persist_mut_keyed.rs @@ -13,7 +13,7 @@ use crate::diagnostic::{Diagnostic, Level}; /// For example, `[Persist(1), Delete(1), Persist(1)]` will result in a a single `1` value being stored. /// /// ```hydroflow -/// use hydroflow::util::PersistenceKeyed; +/// use dfir_rs::util::PersistenceKeyed; /// /// source_iter([ /// PersistenceKeyed::Persist(0, 1), diff --git a/dfir_lang/src/graph/ops/reduce_keyed.rs b/dfir_lang/src/graph/ops/reduce_keyed.rs index bc56b55dc407..870566b8faa0 100644 --- a/dfir_lang/src/graph/ops/reduce_keyed.rs +++ b/dfir_lang/src/graph/ops/reduce_keyed.rs @@ -38,8 +38,8 @@ use crate::diagnostic::{Diagnostic, Level}; /// /// Example using `'tick` persistence and type arguments: /// ```rustbook -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::<(&str, &str)>(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<(&str, &str)>(); +/// let mut flow = dfir_rs::dfir_syntax! { /// source_stream(input_recv) /// -> reduce_keyed::<'tick, &str>(|old: &mut _, val| *old = std::cmp::max(*old, val)) /// -> for_each(|(k, v)| println!("({:?}, {:?})", k, v)); diff --git a/dfir_lang/src/graph/ops/source_interval.rs b/dfir_lang/src/graph/ops/source_interval.rs index a7097ff16a28..8db179fe7a53 100644 --- a/dfir_lang/src/graph/ops/source_interval.rs +++ b/dfir_lang/src/graph/ops/source_interval.rs @@ -14,15 +14,15 @@ use super::{ /// be scheduled as soon as possible. /// /// Note that this requires the hydroflow instance be run within a [Tokio `Runtime`](https://docs.rs/tokio/1/tokio/runtime/struct.Runtime.html). -/// The easiest way to do this is with a [`#[hydroflow::main]`](https://hydro-project.github.io/hydroflow/doc/hydroflow/macro.hydroflow_main.html) +/// The easiest way to do this is with a [`#[dfir_rs::main]`](https://hydro-project.github.io/hydroflow/doc/hydroflow/macro.hydroflow_main.html) /// annotation on `async fn main() { ... }` as in the example below. /// /// ```rustbook /// use std::time::Duration; /// use std::time::Instant; -///use hydroflow::dfir_syntax; +///use dfir_rs::dfir_syntax; /// -/// #[hydroflow::main] +/// #[dfir_rs::main] /// async fn main() { /// let mut hf = dfir_syntax! { /// source_interval(Duration::from_secs(1)) diff --git a/dfir_lang/src/graph/ops/source_json.rs b/dfir_lang/src/graph/ops/source_json.rs index 890a25372aac..0ee286c147d3 100644 --- a/dfir_lang/src/graph/ops/source_json.rs +++ b/dfir_lang/src/graph/ops/source_json.rs @@ -13,7 +13,7 @@ use super::{ /// `source_json` may take one generic type argument, the type of the value to be parsed, which must implement [`Deserialize`](https://docs.rs/serde/latest/serde/de/trait.Deserialize.html). /// /// ```hydroflow -/// source_json("example.json") -> for_each(|json: hydroflow::serde_json::Value| println!("{:#?}", json)); +/// source_json("example.json") -> for_each(|json: dfir_rs::serde_json::Value| println!("{:#?}", json)); /// ``` pub const SOURCE_JSON: OperatorConstraints = OperatorConstraints { name: "source_json", diff --git a/dfir_lang/src/graph/ops/source_stream.rs b/dfir_lang/src/graph/ops/source_stream.rs index 31ddf698a2ff..b7051898e31b 100644 --- a/dfir_lang/src/graph/ops/source_stream.rs +++ b/dfir_lang/src/graph/ops/source_stream.rs @@ -15,8 +15,8 @@ use super::{ /// elements it receives downstream. /// /// ```rustbook -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::<&str>(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<&str>(); +/// let mut flow = dfir_rs::dfir_syntax! { /// source_stream(input_recv) -> map(|x| x.to_uppercase()) /// -> for_each(|x| println!("{}", x)); /// }; diff --git a/dfir_lang/src/graph/ops/source_stream_serde.rs b/dfir_lang/src/graph/ops/source_stream_serde.rs index 2c05069dd700..629261fb688c 100644 --- a/dfir_lang/src/graph/ops/source_stream_serde.rs +++ b/dfir_lang/src/graph/ops/source_stream_serde.rs @@ -15,9 +15,9 @@ use super::{ /// /// ```rustbook /// async fn serde_in() { -/// let addr = hydroflow::util::ipv4_resolve("localhost:9000".into()).unwrap(); -/// let (outbound, inbound, _) = hydroflow::util::bind_udp_bytes(addr).await; -/// let mut flow = hydroflow::dfir_syntax! { +/// let addr = dfir_rs::util::ipv4_resolve("localhost:9000".into()).unwrap(); +/// let (outbound, inbound, _) = dfir_rs::util::bind_udp_bytes(addr).await; +/// let mut flow = dfir_rs::dfir_syntax! { /// source_stream_serde(inbound) -> map(Result::unwrap) -> map(|(x, a): (String, std::net::SocketAddr)| x.to_uppercase()) /// -> for_each(|x| println!("{}", x)); /// }; diff --git a/dfir_lang/src/graph/ops/spin.rs b/dfir_lang/src/graph/ops/spin.rs index 3eff69f381d0..5edbecd68e3a 100644 --- a/dfir_lang/src/graph/ops/spin.rs +++ b/dfir_lang/src/graph/ops/spin.rs @@ -10,7 +10,7 @@ use super::{ /// so in the example below we illustrate running manually for 100 ticks. /// /// ```rustbook -/// let mut flow = hydroflow::dfir_syntax! { +/// let mut flow = dfir_rs::dfir_syntax! { /// spin() -> for_each(|x| println!("tick {}: {:?}", context.current_tick(), x)); /// }; /// for _ in 1..100 { diff --git a/dfir_lang/src/graph/ops/unique.rs b/dfir_lang/src/graph/ops/unique.rs index b93379901fa9..b77a873598c3 100644 --- a/dfir_lang/src/graph/ops/unique.rs +++ b/dfir_lang/src/graph/ops/unique.rs @@ -22,8 +22,8 @@ use crate::diagnostic::{Diagnostic, Level}; /// With `'static`, values will be remembered across ticks and no duplicates will ever be emitted. /// /// ```rustbook -/// let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); -/// let mut flow = hydroflow::dfir_syntax! { +/// let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); +/// let mut flow = dfir_rs::dfir_syntax! { /// source_stream(input_recv) /// -> unique::<'tick>() /// -> for_each(|n| println!("{}", n)); diff --git a/dfir_macro/build.rs b/dfir_macro/build.rs index 88f5fa141d81..7aec3f534fbe 100644 --- a/dfir_macro/build.rs +++ b/dfir_macro/build.rs @@ -17,7 +17,7 @@ const FILENAME: &str = "surface_ops_gen.md"; fn book_file(filename: impl AsRef) -> PathBuf { let mut pathbuf = PathBuf::new(); pathbuf.push(std::env!("CARGO_MANIFEST_DIR")); - pathbuf.push("../docs/docs/hydroflow/syntax/"); + pathbuf.push("../docs/docs/dfir_rs/syntax/"); pathbuf.push(filename); pathbuf } diff --git a/dfir_macro/src/lib.rs b/dfir_macro/src/lib.rs index 4ee19d9fc1c1..88866119c238 100644 --- a/dfir_macro/src/lib.rs +++ b/dfir_macro/src/lib.rs @@ -35,19 +35,19 @@ pub fn dfir_syntax_noemit(input: proc_macro::TokenStream) -> proc_macro::TokenSt fn root() -> proc_macro2::TokenStream { use std::env::{var as env_var, VarError}; - let hydroflow_crate = proc_macro_crate::crate_name("hydroflow") - .expect("hydroflow should be present in `Cargo.toml`"); + let hydroflow_crate = + proc_macro_crate::crate_name("dfir_rs").expect("dfir_rs should be present in `Cargo.toml`"); match hydroflow_crate { proc_macro_crate::FoundCrate::Itself => { if Err(VarError::NotPresent) == env_var("CARGO_BIN_NAME") && Err(VarError::NotPresent) != env_var("CARGO_PRIMARY_PACKAGE") - && Ok("hydroflow") == env_var("CARGO_CRATE_NAME").as_deref() + && Ok("dfir_rs") == env_var("CARGO_CRATE_NAME").as_deref() { // In the crate itself, including unit tests. quote! { crate } } else { // In an integration test, example, bench, etc. - quote! { ::hydroflow } + quote! { ::dfir_rs } } } proc_macro_crate::FoundCrate::Name(name) => { diff --git a/hydroflow/.gitignore b/dfir_rs/.gitignore similarity index 100% rename from hydroflow/.gitignore rename to dfir_rs/.gitignore diff --git a/hydroflow/CHANGELOG.md b/dfir_rs/CHANGELOG.md similarity index 100% rename from hydroflow/CHANGELOG.md rename to dfir_rs/CHANGELOG.md diff --git a/hydroflow/Cargo.toml b/dfir_rs/Cargo.toml similarity index 98% rename from hydroflow/Cargo.toml rename to dfir_rs/Cargo.toml index bb23b95d98ac..b411e6affcc4 100644 --- a/hydroflow/Cargo.toml +++ b/dfir_rs/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "hydroflow" +name = "dfir_rs" publish = true version = "0.10.0" edition = "2021" license = "Apache-2.0" -documentation = "https://docs.rs/hydroflow/" +documentation = "https://docs.rs/dfir_rs/" description = "Hydro's low-level dataflow runtime and IR" [lints] diff --git a/hydroflow/README.md b/dfir_rs/README.md similarity index 100% rename from hydroflow/README.md rename to dfir_rs/README.md diff --git a/hydroflow/deprecated_examples/covid_tracing/README.md b/dfir_rs/deprecated_examples/covid_tracing/README.md similarity index 100% rename from hydroflow/deprecated_examples/covid_tracing/README.md rename to dfir_rs/deprecated_examples/covid_tracing/README.md diff --git a/hydroflow/deprecated_examples/covid_tracing/main.rs b/dfir_rs/deprecated_examples/covid_tracing/main.rs similarity index 93% rename from hydroflow/deprecated_examples/covid_tracing/main.rs rename to dfir_rs/deprecated_examples/covid_tracing/main.rs index 9b6330f33dd8..d90b5a480d4f 100644 --- a/hydroflow/deprecated_examples/covid_tracing/main.rs +++ b/dfir_rs/deprecated_examples/covid_tracing/main.rs @@ -1,14 +1,14 @@ use std::cell::RefCell; use std::time::Duration; -use hydroflow::compiled::pull::JoinState; -use hydroflow::compiled::pull::SymmetricHashJoin; -use hydroflow::lang::collections::Iter; -use hydroflow::pusherator::{InputBuild, IteratorToPusherator, PusheratorBuild}; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::scheduled::graph_ext::GraphExt; -use hydroflow::scheduled::handoff::VecHandoff; -use hydroflow::var_expr; +use dfir_rs::compiled::pull::JoinState; +use dfir_rs::compiled::pull::SymmetricHashJoin; +use dfir_rs::lang::collections::Iter; +use dfir_rs::pusherator::{InputBuild, IteratorToPusherator, PusheratorBuild}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::scheduled::graph_ext::GraphExt; +use dfir_rs::scheduled::handoff::VecHandoff; +use dfir_rs::var_expr; use rand::Rng; diff --git a/hydroflow/deprecated_examples/covid_tracing/people.rs b/dfir_rs/deprecated_examples/covid_tracing/people.rs similarity index 100% rename from hydroflow/deprecated_examples/covid_tracing/people.rs rename to dfir_rs/deprecated_examples/covid_tracing/people.rs diff --git a/hydroflow/deprecated_examples/covid_tracing_dist/database.rs b/dfir_rs/deprecated_examples/covid_tracing_dist/database.rs similarity index 92% rename from hydroflow/deprecated_examples/covid_tracing_dist/database.rs rename to dfir_rs/deprecated_examples/covid_tracing_dist/database.rs index b033df24b80a..c5569c9b0568 100644 --- a/hydroflow/deprecated_examples/covid_tracing_dist/database.rs +++ b/dfir_rs/deprecated_examples/covid_tracing_dist/database.rs @@ -2,15 +2,15 @@ use crate::{people, Decode, Encode, Opts, CONTACTS_ADDR, DIAGNOSES_ADDR}; use std::time::Duration; -use hydroflow::compiled::pull::SymmetricHashJoin; -use hydroflow::lang::collections::Iter; -use hydroflow::pusherator::{IteratorToPusherator, PusheratorBuild}; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::scheduled::graph_ext::GraphExt; -use hydroflow::scheduled::handoff::VecHandoff; -use hydroflow::scheduled::net::Message; -use hydroflow::tokio::net::TcpListener; -use hydroflow::var_expr; +use dfir_rs::compiled::pull::SymmetricHashJoin; +use dfir_rs::lang::collections::Iter; +use dfir_rs::pusherator::{IteratorToPusherator, PusheratorBuild}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::scheduled::graph_ext::GraphExt; +use dfir_rs::scheduled::handoff::VecHandoff; +use dfir_rs::scheduled::net::Message; +use dfir_rs::tokio::net::TcpListener; +use dfir_rs::var_expr; use rand::Rng; pub(crate) async fn run_database(opts: Opts) { diff --git a/hydroflow/deprecated_examples/covid_tracing_dist/main.rs b/dfir_rs/deprecated_examples/covid_tracing_dist/main.rs similarity index 98% rename from hydroflow/deprecated_examples/covid_tracing_dist/main.rs rename to dfir_rs/deprecated_examples/covid_tracing_dist/main.rs index 6f140d30fb9e..4192ea8a1732 100644 --- a/hydroflow/deprecated_examples/covid_tracing_dist/main.rs +++ b/dfir_rs/deprecated_examples/covid_tracing_dist/main.rs @@ -1,6 +1,6 @@ use clap::{ArgEnum, Parser}; use database::run_database; -use hydroflow::tokio; +use dfir_rs::tokio; use serde::de::DeserializeOwned; use serde::Serialize; use tracker::run_tracker; @@ -71,7 +71,7 @@ where const CONTACTS_ADDR: u32 = 0; const DIAGNOSES_ADDR: u32 = 1; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let opts = Opts::parse(); diff --git a/hydroflow/deprecated_examples/covid_tracing_dist/people.rs b/dfir_rs/deprecated_examples/covid_tracing_dist/people.rs similarity index 100% rename from hydroflow/deprecated_examples/covid_tracing_dist/people.rs rename to dfir_rs/deprecated_examples/covid_tracing_dist/people.rs diff --git a/hydroflow/deprecated_examples/covid_tracing_dist/tracker.rs b/dfir_rs/deprecated_examples/covid_tracing_dist/tracker.rs similarity index 91% rename from hydroflow/deprecated_examples/covid_tracing_dist/tracker.rs rename to dfir_rs/deprecated_examples/covid_tracing_dist/tracker.rs index 7abfb0555d2b..8b8b7c6d67ea 100644 --- a/hydroflow/deprecated_examples/covid_tracing_dist/tracker.rs +++ b/dfir_rs/deprecated_examples/covid_tracing_dist/tracker.rs @@ -1,12 +1,12 @@ use crate::{Decode, Encode, Opts, CONTACTS_ADDR, DIAGNOSES_ADDR}; -use hydroflow::compiled::pull::SymmetricHashJoin; -use hydroflow::lang::collections::Iter; -use hydroflow::pusherator::{InputBuild, IteratorToPusherator, PusheratorBuild}; -use hydroflow::scheduled::graph_ext::GraphExt; -use hydroflow::scheduled::{graph::Hydroflow, handoff::VecHandoff, net::Message}; -use hydroflow::var_expr; -use hydroflow::tokio::net::TcpStream; +use dfir_rs::compiled::pull::SymmetricHashJoin; +use dfir_rs::lang::collections::Iter; +use dfir_rs::pusherator::{InputBuild, IteratorToPusherator, PusheratorBuild}; +use dfir_rs::scheduled::graph_ext::GraphExt; +use dfir_rs::scheduled::{graph::Hydroflow, handoff::VecHandoff, net::Message}; +use dfir_rs::var_expr; +use dfir_rs::tokio::net::TcpStream; pub(crate) async fn run_tracker(opts: Opts) { let mut df = Hydroflow::new(); diff --git a/hydroflow/example.json b/dfir_rs/example.json similarity index 100% rename from hydroflow/example.json rename to dfir_rs/example.json diff --git a/hydroflow/example_utils/chat_driver.py b/dfir_rs/example_utils/chat_driver.py similarity index 100% rename from hydroflow/example_utils/chat_driver.py rename to dfir_rs/example_utils/chat_driver.py diff --git a/hydroflow/example_utils/web2a b/dfir_rs/example_utils/web2a similarity index 100% rename from hydroflow/example_utils/web2a rename to dfir_rs/example_utils/web2a diff --git a/hydroflow/examples/chat/README.md b/dfir_rs/examples/chat/README.md similarity index 64% rename from hydroflow/examples/chat/README.md rename to dfir_rs/examples/chat/README.md index 24145a23cc57..38d4167d8d29 100644 --- a/hydroflow/examples/chat/README.md +++ b/dfir_rs/examples/chat/README.md @@ -13,18 +13,18 @@ To run the example, open 3 terminals. #### Running the Server In one terminal run the server like so: ```shell -cargo run -p hydroflow --example chat -- --name "_" --role server +cargo run -p dfir_rs --example chat -- --name "_" --role server ``` #### Running the Clients In another terminal run the first client: ```shell -cargo run -p hydroflow --example chat -- --name "alice" --role client +cargo run -p dfir_rs --example chat -- --name "alice" --role client ``` In the third terminal run the second client: ```shell -cargo run -p hydroflow --example chat -- --name "bob" --role client +cargo run -p dfir_rs --example chat -- --name "bob" --role client ``` If you type in the client terminals the messages should appear everywhere. @@ -39,35 +39,35 @@ In (up to) five separate tabs, run the following servers. ##### First ```shell -cargo run -p hydroflow --example chat -- --name "_" --address 127.0.0.1:12345 --role gossiping-server1 +cargo run -p dfir_rs --example chat -- --name "_" --address 127.0.0.1:12345 --role gossiping-server1 ``` ##### Second ```shell -cargo run -p hydroflow --example chat -- --name "_" --address 127.0.0.1:12346 --role gossiping-server2 +cargo run -p dfir_rs --example chat -- --name "_" --address 127.0.0.1:12346 --role gossiping-server2 ``` ##### Third ```shell -cargo run -p hydroflow --example chat -- --name "_" --address 127.0.0.1:12347 --role gossiping-server3 +cargo run -p dfir_rs --example chat -- --name "_" --address 127.0.0.1:12347 --role gossiping-server3 ``` ##### Fourth ```shell -cargo run -p hydroflow --example chat -- --name "_" --address 127.0.0.1:12348 --role gossiping-server4 +cargo run -p dfir_rs --example chat -- --name "_" --address 127.0.0.1:12348 --role gossiping-server4 ``` ##### Fifth ```shell -cargo run -p hydroflow --example chat -- --name "_" --address 127.0.0.1:12349 --role gossiping-server5 +cargo run -p dfir_rs --example chat -- --name "_" --address 127.0.0.1:12349 --role gossiping-server5 ``` #### Running the Clients In another terminal run the first client: ```shell -cargo run -p hydroflow --example chat -- --name "alice" --address 127.0.0.1:12345 --role client +cargo run -p dfir_rs --example chat -- --name "alice" --address 127.0.0.1:12345 --role client ``` In another terminal run the second client: ```shell -cargo run -p hydroflow --example chat -- --name "bob" --address 127.0.0.1:12349 --role client +cargo run -p dfir_rs --example chat -- --name "bob" --address 127.0.0.1:12349 --role client ``` If you type in the client terminals the messages should appear everywhere. Give it a few seconds though - unlike the @@ -77,19 +77,19 @@ cycles for the message to be delivered everywhere. ### Dump Graphs of the Flows #### Client ```shell -cargo run -p hydroflow --example chat -- --name "alice" --role client --graph mermaid +cargo run -p dfir_rs --example chat -- --name "alice" --role client --graph mermaid ``` #### Broadcast Server ```shell -cargo run -p hydroflow --example chat -- --name "_" --role server --graph mermaid +cargo run -p dfir_rs --example chat -- --name "_" --role server --graph mermaid ``` #### Gossip Server ```shell -cargo run -p hydroflow --example chat -- --name "_" --role gossiping-server1 --graph mermaid +cargo run -p dfir_rs --example chat -- --name "_" --role gossiping-server1 --graph mermaid ``` ### Display Help ```shell -cargo run -p hydroflow --example chat -- --help +cargo run -p dfir_rs --example chat -- --help ``` \ No newline at end of file diff --git a/hydroflow/examples/chat/client.rs b/dfir_rs/examples/chat/client.rs similarity index 96% rename from hydroflow/examples/chat/client.rs rename to dfir_rs/examples/chat/client.rs index 25f7e892fda4..6c084c8bc185 100644 --- a/hydroflow/examples/chat/client.rs +++ b/dfir_rs/examples/chat/client.rs @@ -1,7 +1,7 @@ use chrono::prelude::*; use colored::Colorize; -use hydroflow::dfir_syntax; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use crate::protocol::Message; use crate::{default_server_address, Opts}; diff --git a/hydroflow/examples/chat/main.rs b/dfir_rs/examples/chat/main.rs similarity index 96% rename from hydroflow/examples/chat/main.rs rename to dfir_rs/examples/chat/main.rs index a2e97c52e3b9..8b17af83aea9 100644 --- a/hydroflow/examples/chat/main.rs +++ b/dfir_rs/examples/chat/main.rs @@ -3,7 +3,7 @@ use std::net::SocketAddr; use clap::{Parser, ValueEnum}; use client::run_client; use dfir_lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::util::ipv4_resolve; +use dfir_rs::util::ipv4_resolve; use server::run_server; use crate::randomized_gossiping_server::run_gossiping_server; @@ -44,7 +44,7 @@ struct Opts { write_config: Option, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let opts = Opts::parse(); @@ -67,7 +67,7 @@ async fn main() { fn test() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server, _, mut server_output) = run_cargo_example( "chat", @@ -122,7 +122,7 @@ fn test() { fn test_gossip() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server1, _, mut server1_output) = run_cargo_example( "chat", diff --git a/hydroflow/examples/chat/protocol.rs b/dfir_rs/examples/chat/protocol.rs similarity index 100% rename from hydroflow/examples/chat/protocol.rs rename to dfir_rs/examples/chat/protocol.rs diff --git a/hydroflow/examples/chat/randomized_gossiping_server.rs b/dfir_rs/examples/chat/randomized_gossiping_server.rs similarity index 98% rename from hydroflow/examples/chat/randomized_gossiping_server.rs rename to dfir_rs/examples/chat/randomized_gossiping_server.rs index 3b7434f6d5bc..dac2d99bef06 100644 --- a/hydroflow/examples/chat/randomized_gossiping_server.rs +++ b/dfir_rs/examples/chat/randomized_gossiping_server.rs @@ -4,8 +4,8 @@ use std::time::Duration; use chrono::{DateTime, Utc}; use dfir_macro::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use rand::seq::SliceRandom; use rand::thread_rng; use serde::{Deserialize, Serialize}; diff --git a/hydroflow/examples/chat/server.rs b/dfir_rs/examples/chat/server.rs similarity index 94% rename from hydroflow/examples/chat/server.rs rename to dfir_rs/examples/chat/server.rs index 98f8b57f9e17..d1c71a41a301 100644 --- a/hydroflow/examples/chat/server.rs +++ b/dfir_rs/examples/chat/server.rs @@ -1,6 +1,6 @@ -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::bind_udp_bytes; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::bind_udp_bytes; use crate::protocol::{Message, MessageWithAddr}; use crate::{default_server_address, Opts}; diff --git a/hydroflow/examples/deadlock_detector/README.md b/dfir_rs/examples/deadlock_detector/README.md similarity index 100% rename from hydroflow/examples/deadlock_detector/README.md rename to dfir_rs/examples/deadlock_detector/README.md diff --git a/hydroflow/examples/deadlock_detector/helpers.rs b/dfir_rs/examples/deadlock_detector/helpers.rs similarity index 100% rename from hydroflow/examples/deadlock_detector/helpers.rs rename to dfir_rs/examples/deadlock_detector/helpers.rs diff --git a/hydroflow/examples/deadlock_detector/main.rs b/dfir_rs/examples/deadlock_detector/main.rs similarity index 95% rename from hydroflow/examples/deadlock_detector/main.rs rename to dfir_rs/examples/deadlock_detector/main.rs index 4ecc96ac5a36..1d725d165051 100644 --- a/hydroflow/examples/deadlock_detector/main.rs +++ b/dfir_rs/examples/deadlock_detector/main.rs @@ -5,7 +5,7 @@ use std::path::Path; /// This is a remedial distributed deadlock (cycle) detector use clap::Parser; -use hydroflow::lang::graph::{WriteConfig, WriteGraphType}; +use dfir_rs::lang::graph::{WriteConfig, WriteGraphType}; use peer::run_detector; use serde::Deserialize; @@ -44,7 +44,7 @@ fn read_addresses_from_file(path: impl AsRef) -> Result) { // setup message send/recv ports let server_socket = UdpSocket::bind(("127.0.0.1", opts.port)).await.unwrap(); - let (outbound, inbound, _) = hydroflow::util::udp_lines(server_socket); + let (outbound, inbound, _) = dfir_rs::util::udp_lines(server_socket); // We provide a command line for users to type waits-for edges (u32,u32). let reader = tokio::io::BufReader::new(tokio::io::stdin()); diff --git a/hydroflow/examples/deadlock_detector/peers.json b/dfir_rs/examples/deadlock_detector/peers.json similarity index 100% rename from hydroflow/examples/deadlock_detector/peers.json rename to dfir_rs/examples/deadlock_detector/peers.json diff --git a/hydroflow/examples/deadlock_detector/protocol.rs b/dfir_rs/examples/deadlock_detector/protocol.rs similarity index 100% rename from hydroflow/examples/deadlock_detector/protocol.rs rename to dfir_rs/examples/deadlock_detector/protocol.rs diff --git a/hydroflow/examples/echo_serde_json/README.md b/dfir_rs/examples/echo_serde_json/README.md similarity index 100% rename from hydroflow/examples/echo_serde_json/README.md rename to dfir_rs/examples/echo_serde_json/README.md diff --git a/hydroflow/examples/echo_serde_json/client.rs b/dfir_rs/examples/echo_serde_json/client.rs similarity index 91% rename from hydroflow/examples/echo_serde_json/client.rs rename to dfir_rs/examples/echo_serde_json/client.rs index dbac59c8264f..935edef527f2 100644 --- a/hydroflow/examples/echo_serde_json/client.rs +++ b/dfir_rs/examples/echo_serde_json/client.rs @@ -1,8 +1,8 @@ use std::net::SocketAddr; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::util::{UdpLinesSink, UdpLinesStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::{UdpLinesSink, UdpLinesStream}; use crate::helpers::{deserialize_json, serialize_json}; use crate::protocol::EchoMsg; diff --git a/hydroflow/examples/echo_serde_json/helpers.rs b/dfir_rs/examples/echo_serde_json/helpers.rs similarity index 100% rename from hydroflow/examples/echo_serde_json/helpers.rs rename to dfir_rs/examples/echo_serde_json/helpers.rs diff --git a/hydroflow/examples/echo_serde_json/main.rs b/dfir_rs/examples/echo_serde_json/main.rs similarity index 94% rename from hydroflow/examples/echo_serde_json/main.rs rename to dfir_rs/examples/echo_serde_json/main.rs index 6c3e31dc7dbf..ddc1eda0b409 100644 --- a/hydroflow/examples/echo_serde_json/main.rs +++ b/dfir_rs/examples/echo_serde_json/main.rs @@ -2,7 +2,7 @@ use std::net::SocketAddr; use clap::{Parser, ValueEnum}; use client::run_client; -use hydroflow::util::{bind_udp_lines, ipv4_resolve}; +use dfir_rs::util::{bind_udp_lines, ipv4_resolve}; use server::run_server; mod client; @@ -26,7 +26,7 @@ struct Opts { server_addr: Option, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { // parse command line arguments let opts = Opts::parse(); @@ -60,7 +60,7 @@ async fn main() { fn test() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server, _, mut server_output) = run_cargo_example( "echo_serde_json", diff --git a/hydroflow/examples/echo_serde_json/protocol.rs b/dfir_rs/examples/echo_serde_json/protocol.rs similarity index 100% rename from hydroflow/examples/echo_serde_json/protocol.rs rename to dfir_rs/examples/echo_serde_json/protocol.rs diff --git a/hydroflow/examples/echo_serde_json/server.rs b/dfir_rs/examples/echo_serde_json/server.rs similarity index 86% rename from hydroflow/examples/echo_serde_json/server.rs rename to dfir_rs/examples/echo_serde_json/server.rs index eb1773359afa..77566d49bf25 100644 --- a/hydroflow/examples/echo_serde_json/server.rs +++ b/dfir_rs/examples/echo_serde_json/server.rs @@ -1,9 +1,9 @@ use std::net::SocketAddr; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{UdpLinesSink, UdpLinesStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{UdpLinesSink, UdpLinesStream}; use crate::helpers::{deserialize_json, serialize_json}; use crate::protocol::EchoMsg; diff --git a/hydroflow/examples/echoserver/README.md b/dfir_rs/examples/echoserver/README.md similarity index 100% rename from hydroflow/examples/echoserver/README.md rename to dfir_rs/examples/echoserver/README.md diff --git a/hydroflow/examples/echoserver/client.rs b/dfir_rs/examples/echoserver/client.rs similarity index 94% rename from hydroflow/examples/echoserver/client.rs rename to dfir_rs/examples/echoserver/client.rs index a15a0b529bfc..2156b90c9ca0 100644 --- a/hydroflow/examples/echoserver/client.rs +++ b/dfir_rs/examples/echoserver/client.rs @@ -1,8 +1,8 @@ use std::net::SocketAddr; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::protocol::EchoMsg; use crate::Opts; diff --git a/hydroflow/examples/echoserver/main.rs b/dfir_rs/examples/echoserver/main.rs similarity index 93% rename from hydroflow/examples/echoserver/main.rs rename to dfir_rs/examples/echoserver/main.rs index 6734c790289d..8ef0553f11b6 100644 --- a/hydroflow/examples/echoserver/main.rs +++ b/dfir_rs/examples/echoserver/main.rs @@ -2,7 +2,7 @@ use std::net::SocketAddr; use clap::{Parser, ValueEnum}; use client::run_client; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use server::run_server; mod client; @@ -25,7 +25,7 @@ struct Opts { server_addr: Option, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { // parse command line arguments let opts = Opts::parse(); @@ -52,7 +52,7 @@ async fn main() { fn test() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server, _, mut server_output) = run_cargo_example("echoserver", "--role server --addr 127.0.0.1:2048"); diff --git a/hydroflow/examples/echoserver/protocol.rs b/dfir_rs/examples/echoserver/protocol.rs similarity index 100% rename from hydroflow/examples/echoserver/protocol.rs rename to dfir_rs/examples/echoserver/protocol.rs diff --git a/hydroflow/examples/echoserver/server.rs b/dfir_rs/examples/echoserver/server.rs similarity index 88% rename from hydroflow/examples/echoserver/server.rs rename to dfir_rs/examples/echoserver/server.rs index 68d9da52fcb5..f943e5824a18 100644 --- a/hydroflow/examples/echoserver/server.rs +++ b/dfir_rs/examples/echoserver/server.rs @@ -1,9 +1,9 @@ use std::net::SocketAddr; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::protocol::EchoMsg; diff --git a/hydroflow/examples/example_1_simplest.rs b/dfir_rs/examples/example_1_simplest.rs similarity index 89% rename from hydroflow/examples/example_1_simplest.rs rename to dfir_rs/examples/example_1_simplest.rs index 96ac5f6ee55c..e6cbce48c74a 100644 --- a/hydroflow/examples/example_1_simplest.rs +++ b/dfir_rs/examples/example_1_simplest.rs @@ -1,5 +1,5 @@ //[use]// -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; //[/use]// //[macro_call]// diff --git a/hydroflow/examples/example_2_simple_1.rs b/dfir_rs/examples/example_2_simple_1.rs similarity index 91% rename from hydroflow/examples/example_2_simple_1.rs rename to dfir_rs/examples/example_2_simple_1.rs index 33252a4625aa..8c4148ab54c8 100644 --- a/hydroflow/examples/example_2_simple_1.rs +++ b/dfir_rs/examples/example_2_simple_1.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { let mut flow = dfir_syntax! { diff --git a/hydroflow/examples/example_2_simple_2.rs b/dfir_rs/examples/example_2_simple_2.rs similarity index 93% rename from hydroflow/examples/example_2_simple_2.rs rename to dfir_rs/examples/example_2_simple_2.rs index 961d29f97eae..acf14246cab6 100644 --- a/hydroflow/examples/example_2_simple_2.rs +++ b/dfir_rs/examples/example_2_simple_2.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { let mut flow = dfir_syntax! { source_iter(0..10) diff --git a/hydroflow/examples/example_3_stream.rs b/dfir_rs/examples/example_3_stream.rs similarity index 88% rename from hydroflow/examples/example_3_stream.rs rename to dfir_rs/examples/example_3_stream.rs index 274b2cb78b8e..95f79252b061 100644 --- a/hydroflow/examples/example_3_stream.rs +++ b/dfir_rs/examples/example_3_stream.rs @@ -1,8 +1,8 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { // Create our channel input - let (input_example, example_recv) = hydroflow::util::unbounded_channel::(); + let (input_example, example_recv) = dfir_rs::util::unbounded_channel::(); let mut flow = dfir_syntax! { source_stream(example_recv) diff --git a/hydroflow/examples/example_4_neighbors.rs b/dfir_rs/examples/example_4_neighbors.rs similarity index 89% rename from hydroflow/examples/example_4_neighbors.rs rename to dfir_rs/examples/example_4_neighbors.rs index ade7f171c7d2..48205dc428e2 100644 --- a/hydroflow/examples/example_4_neighbors.rs +++ b/dfir_rs/examples/example_4_neighbors.rs @@ -1,8 +1,8 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { // An edge in the input data = a pair of `usize` vertex IDs. - let (edges_send, edges_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (edges_send, edges_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = dfir_syntax! { // inputs: the origin vertex (vertex 0) and stream of input edges diff --git a/hydroflow/examples/example_5_reachability.rs b/dfir_rs/examples/example_5_reachability.rs similarity index 91% rename from hydroflow/examples/example_5_reachability.rs rename to dfir_rs/examples/example_5_reachability.rs index 8626e9d0ea10..c6a90f09069c 100644 --- a/hydroflow/examples/example_5_reachability.rs +++ b/dfir_rs/examples/example_5_reachability.rs @@ -1,8 +1,8 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { // An edge in the input data = a pair of `usize` vertex IDs. - let (edges_send, edges_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (edges_send, edges_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = dfir_syntax! { // inputs: the origin vertex (vertex 0) and stream of input edges diff --git a/hydroflow/examples/example_6_unreachability.rs b/dfir_rs/examples/example_6_unreachability.rs similarity index 93% rename from hydroflow/examples/example_6_unreachability.rs rename to dfir_rs/examples/example_6_unreachability.rs index 186b9bb050ea..4287414c87e6 100644 --- a/hydroflow/examples/example_6_unreachability.rs +++ b/dfir_rs/examples/example_6_unreachability.rs @@ -1,8 +1,8 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pairs_send, pairs_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (pairs_send, pairs_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = dfir_syntax! { // inputs: the origin vertex (vertex 0) and stream of input edges diff --git a/hydroflow/examples/example_naturals.rs b/dfir_rs/examples/example_naturals.rs similarity index 91% rename from hydroflow/examples/example_naturals.rs rename to dfir_rs/examples/example_naturals.rs index b5410e71f1cc..066666609a3e 100644 --- a/hydroflow/examples/example_naturals.rs +++ b/dfir_rs/examples/example_naturals.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { let mut _flow = dfir_syntax! { diff --git a/hydroflow/examples/example_surface_flows_1_basic.rs b/dfir_rs/examples/example_surface_flows_1_basic.rs similarity index 88% rename from hydroflow/examples/example_surface_flows_1_basic.rs rename to dfir_rs/examples/example_surface_flows_1_basic.rs index e3e486662e72..8f56221b3bae 100644 --- a/hydroflow/examples/example_surface_flows_1_basic.rs +++ b/dfir_rs/examples/example_surface_flows_1_basic.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { let mut flow = dfir_syntax! { diff --git a/hydroflow/examples/example_surface_flows_2_varname.rs b/dfir_rs/examples/example_surface_flows_2_varname.rs similarity index 89% rename from hydroflow/examples/example_surface_flows_2_varname.rs rename to dfir_rs/examples/example_surface_flows_2_varname.rs index 5142e28a2719..60a88ecfb658 100644 --- a/hydroflow/examples/example_surface_flows_2_varname.rs +++ b/dfir_rs/examples/example_surface_flows_2_varname.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { let mut flow = dfir_syntax! { diff --git a/hydroflow/examples/example_surface_flows_3_ports.rs b/dfir_rs/examples/example_surface_flows_3_ports.rs similarity index 94% rename from hydroflow/examples/example_surface_flows_3_ports.rs rename to dfir_rs/examples/example_surface_flows_3_ports.rs index 4a8913c79e34..ceba080ae072 100644 --- a/hydroflow/examples/example_surface_flows_3_ports.rs +++ b/dfir_rs/examples/example_surface_flows_3_ports.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { let mut flow = dfir_syntax! { diff --git a/hydroflow/examples/example_surface_flows_4_context.rs b/dfir_rs/examples/example_surface_flows_4_context.rs similarity index 89% rename from hydroflow/examples/example_surface_flows_4_context.rs rename to dfir_rs/examples/example_surface_flows_4_context.rs index 8f1b1ce088e8..1309a2aa8421 100644 --- a/hydroflow/examples/example_surface_flows_4_context.rs +++ b/dfir_rs/examples/example_surface_flows_4_context.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { let mut flow = dfir_syntax! { diff --git a/hydroflow/examples/example_syntax_empty.rs b/dfir_rs/examples/example_syntax_empty.rs similarity index 85% rename from hydroflow/examples/example_syntax_empty.rs rename to dfir_rs/examples/example_syntax_empty.rs index 249bbfcd6cdc..82c6c85c85c4 100644 --- a/hydroflow/examples/example_syntax_empty.rs +++ b/dfir_rs/examples/example_syntax_empty.rs @@ -1,6 +1,6 @@ #![expect(unused_mut, unused_variables, reason = "example code")] -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut flow = dfir_syntax! { diff --git a/hydroflow/examples/example_syntax_hello_world.rs b/dfir_rs/examples/example_syntax_hello_world.rs similarity index 88% rename from hydroflow/examples/example_syntax_hello_world.rs rename to dfir_rs/examples/example_syntax_hello_world.rs index a0c580dc045c..66fb66dfebeb 100644 --- a/hydroflow/examples/example_syntax_hello_world.rs +++ b/dfir_rs/examples/example_syntax_hello_world.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/examples/example_syntax_input.rs b/dfir_rs/examples/example_syntax_input.rs similarity index 71% rename from hydroflow/examples/example_syntax_input.rs rename to dfir_rs/examples/example_syntax_input.rs index 5e654f2f497e..2603c1586532 100644 --- a/hydroflow/examples/example_syntax_input.rs +++ b/dfir_rs/examples/example_syntax_input.rs @@ -1,7 +1,7 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::<&str>(); + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<&str>(); let mut flow = dfir_syntax! { source_stream(input_recv) -> map(|x| x.to_uppercase()) -> for_each(|x| println!("{}", x)); diff --git a/hydroflow/examples/example_syntax_output.rs b/dfir_rs/examples/example_syntax_output.rs similarity index 56% rename from hydroflow/examples/example_syntax_output.rs rename to dfir_rs/examples/example_syntax_output.rs index 99e0dd7eccdb..294f65b39ce2 100644 --- a/hydroflow/examples/example_syntax_output.rs +++ b/dfir_rs/examples/example_syntax_output.rs @@ -1,13 +1,13 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { - let (output_send, mut output_recv) = hydroflow::util::unbounded_channel::(); + let (output_send, mut output_recv) = dfir_rs::util::unbounded_channel::(); let mut flow = dfir_syntax! { source_iter("Hello World".chars()) -> map(|c| c.to_ascii_uppercase()) -> for_each(|c| output_send.send(c).unwrap()); }; flow.run_available(); - let output = &*hydroflow::util::collect_ready::(&mut output_recv); + let output = &*dfir_rs::util::collect_ready::(&mut output_recv); assert_eq!(output, "HELLO WORLD"); } diff --git a/hydroflow/examples/hello_world/README.md b/dfir_rs/examples/hello_world/README.md similarity index 100% rename from hydroflow/examples/hello_world/README.md rename to dfir_rs/examples/hello_world/README.md diff --git a/hydroflow/examples/hello_world/main.rs b/dfir_rs/examples/hello_world/main.rs similarity index 87% rename from hydroflow/examples/hello_world/main.rs rename to dfir_rs/examples/hello_world/main.rs index 21f033fee0d3..e53731295cce 100644 --- a/hydroflow/examples/hello_world/main.rs +++ b/dfir_rs/examples/hello_world/main.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/examples/kvs/README.md b/dfir_rs/examples/kvs/README.md similarity index 100% rename from hydroflow/examples/kvs/README.md rename to dfir_rs/examples/kvs/README.md diff --git a/hydroflow/examples/kvs_mut/client.rs b/dfir_rs/examples/kvs/client.rs similarity index 94% rename from hydroflow/examples/kvs_mut/client.rs rename to dfir_rs/examples/kvs/client.rs index ce46ddc9b644..857f3390146f 100644 --- a/hydroflow/examples/kvs_mut/client.rs +++ b/dfir_rs/examples/kvs/client.rs @@ -1,7 +1,7 @@ use std::net::SocketAddr; -use hydroflow::dfir_syntax; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::helpers::parse_command; use crate::protocol::KvsResponse; diff --git a/hydroflow/examples/kvs/helpers.rs b/dfir_rs/examples/kvs/helpers.rs similarity index 100% rename from hydroflow/examples/kvs/helpers.rs rename to dfir_rs/examples/kvs/helpers.rs diff --git a/hydroflow/examples/kvs/main.rs b/dfir_rs/examples/kvs/main.rs similarity index 93% rename from hydroflow/examples/kvs/main.rs rename to dfir_rs/examples/kvs/main.rs index a4b38190f70f..46b17d3af31d 100644 --- a/hydroflow/examples/kvs/main.rs +++ b/dfir_rs/examples/kvs/main.rs @@ -2,8 +2,8 @@ use std::net::SocketAddr; use clap::{Parser, ValueEnum}; use client::run_client; -use hydroflow::lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::lang::graph::{WriteConfig, WriteGraphType}; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use server::run_server; mod client; @@ -31,7 +31,7 @@ struct Opts { write_config: Option, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let opts = Opts::parse(); let addr = opts.addr.unwrap(); @@ -55,7 +55,7 @@ async fn main() { fn test() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server, _, mut server_stdout) = run_cargo_example("kvs", "--role server --addr 127.0.0.1:2051"); diff --git a/hydroflow/examples/kvs/protocol.rs b/dfir_rs/examples/kvs/protocol.rs similarity index 100% rename from hydroflow/examples/kvs/protocol.rs rename to dfir_rs/examples/kvs/protocol.rs diff --git a/hydroflow/examples/kvs/server.rs b/dfir_rs/examples/kvs/server.rs similarity index 93% rename from hydroflow/examples/kvs/server.rs rename to dfir_rs/examples/kvs/server.rs index fec7477c8376..c3eaa851f0ce 100644 --- a/hydroflow/examples/kvs/server.rs +++ b/dfir_rs/examples/kvs/server.rs @@ -1,6 +1,6 @@ -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::protocol::{KvsMessageWithAddr, KvsResponse}; use crate::Opts; diff --git a/hydroflow/examples/kvs_bench/README.md b/dfir_rs/examples/kvs_bench/README.md similarity index 100% rename from hydroflow/examples/kvs_bench/README.md rename to dfir_rs/examples/kvs_bench/README.md diff --git a/hydroflow/examples/kvs_bench/buffer_pool/mod.rs b/dfir_rs/examples/kvs_bench/buffer_pool/mod.rs similarity index 100% rename from hydroflow/examples/kvs_bench/buffer_pool/mod.rs rename to dfir_rs/examples/kvs_bench/buffer_pool/mod.rs diff --git a/hydroflow/examples/kvs_bench/buffer_pool/serialization.rs b/dfir_rs/examples/kvs_bench/buffer_pool/serialization.rs similarity index 100% rename from hydroflow/examples/kvs_bench/buffer_pool/serialization.rs rename to dfir_rs/examples/kvs_bench/buffer_pool/serialization.rs diff --git a/hydroflow/examples/kvs_bench/main.rs b/dfir_rs/examples/kvs_bench/main.rs similarity index 97% rename from hydroflow/examples/kvs_bench/main.rs rename to dfir_rs/examples/kvs_bench/main.rs index 1eb9ce65bb45..11585f67d74e 100644 --- a/hydroflow/examples/kvs_bench/main.rs +++ b/dfir_rs/examples/kvs_bench/main.rs @@ -106,7 +106,7 @@ fn main() { continue; } - let (tx, rx) = hydroflow::util::unbounded_channel::(); + let (tx, rx) = dfir_rs::util::unbounded_channel::(); { let entry = nodes.entry(n1).or_default(); @@ -182,7 +182,7 @@ fn main() { #[test] fn test() { - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server, _, mut server_stdout) = run_cargo_example("kvs_bench", "bench --threads 2"); diff --git a/hydroflow/examples/kvs_bench/protocol/mod.rs b/dfir_rs/examples/kvs_bench/protocol/mod.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/mod.rs rename to dfir_rs/examples/kvs_bench/protocol/mod.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/kvs_request_delete_visitor.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/kvs_request_delete_visitor.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/kvs_request_delete_visitor.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/kvs_request_delete_visitor.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/kvs_request_get_visitor.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/kvs_request_get_visitor.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/kvs_request_get_visitor.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/kvs_request_get_visitor.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/kvs_request_gossip_visitor.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/kvs_request_gossip_visitor.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/kvs_request_gossip_visitor.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/kvs_request_gossip_visitor.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/kvs_request_put_visitor.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/kvs_request_put_visitor.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/kvs_request_put_visitor.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/kvs_request_put_visitor.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/lattices/map_union.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/lattices/map_union.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/lattices/map_union.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/lattices/map_union.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/lattices/mod.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/lattices/mod.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/lattices/mod.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/lattices/mod.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/lattices/my_last_write_wins.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/lattices/my_last_write_wins.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/lattices/my_last_write_wins.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/lattices/my_last_write_wins.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/lattices/point.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/lattices/point.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/lattices/point.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/lattices/point.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/lattices/with_bot.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/lattices/with_bot.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/lattices/with_bot.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/lattices/with_bot.rs diff --git a/hydroflow/examples/kvs_bench/protocol/serialization/mod.rs b/dfir_rs/examples/kvs_bench/protocol/serialization/mod.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/serialization/mod.rs rename to dfir_rs/examples/kvs_bench/protocol/serialization/mod.rs diff --git a/hydroflow/examples/kvs_bench/protocol/test/magic_buffer.rs b/dfir_rs/examples/kvs_bench/protocol/test/magic_buffer.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/test/magic_buffer.rs rename to dfir_rs/examples/kvs_bench/protocol/test/magic_buffer.rs diff --git a/hydroflow/examples/kvs_bench/protocol/test/mod.rs b/dfir_rs/examples/kvs_bench/protocol/test/mod.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/test/mod.rs rename to dfir_rs/examples/kvs_bench/protocol/test/mod.rs diff --git a/hydroflow/examples/kvs_bench/protocol/test/util.rs b/dfir_rs/examples/kvs_bench/protocol/test/util.rs similarity index 100% rename from hydroflow/examples/kvs_bench/protocol/test/util.rs rename to dfir_rs/examples/kvs_bench/protocol/test/util.rs diff --git a/hydroflow/examples/kvs_bench/server.rs b/dfir_rs/examples/kvs_bench/server.rs similarity index 97% rename from hydroflow/examples/kvs_bench/server.rs rename to dfir_rs/examples/kvs_bench/server.rs index 90440bb509eb..21467f6fd4c2 100644 --- a/hydroflow/examples/kvs_bench/server.rs +++ b/dfir_rs/examples/kvs_bench/server.rs @@ -6,10 +6,10 @@ use std::time::Duration; use bincode::options; use bytes::{BufMut, Bytes, BytesMut}; use dfir_lang::graph::{WriteConfig, WriteGraphType}; +use dfir_rs::compiled::pull::HalfMultisetJoinState; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::ticks::TickInstant; use futures::Stream; -use hydroflow::compiled::pull::HalfMultisetJoinState; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::ticks::TickInstant; use lattices::map_union::{MapUnionHashMap, MapUnionSingletonMap}; use lattices::set_union::SetUnionSingletonSet; use lattices::{Max, Point, WithBot}; @@ -47,12 +47,12 @@ pub fn run_server( let buffer_pool = BufferPool::::create_buffer_pool(); let (transducer_to_peers_tx, mut transducer_to_peers_rx) = - hydroflow::util::unsync_channel::<(Bytes, NodeId)>(None); + dfir_rs::util::unsync_channel::<(Bytes, NodeId)>(None); let (client_to_transducer_tx, client_to_transducer_rx) = - hydroflow::util::unsync_channel::<(KvsRequest, NodeId)>(None); + dfir_rs::util::unsync_channel::<(KvsRequest, NodeId)>(None); let (transducer_to_client_tx, mut _transducer_to_client_rx) = - hydroflow::util::unsync_channel::<(KvsResponse, NodeId)>(None); + dfir_rs::util::unsync_channel::<(KvsResponse, NodeId)>(None); let localset = task::LocalSet::new(); diff --git a/hydroflow/examples/kvs_mut/README.md b/dfir_rs/examples/kvs_mut/README.md similarity index 100% rename from hydroflow/examples/kvs_mut/README.md rename to dfir_rs/examples/kvs_mut/README.md diff --git a/hydroflow/examples/kvs/client.rs b/dfir_rs/examples/kvs_mut/client.rs similarity index 94% rename from hydroflow/examples/kvs/client.rs rename to dfir_rs/examples/kvs_mut/client.rs index ce46ddc9b644..857f3390146f 100644 --- a/hydroflow/examples/kvs/client.rs +++ b/dfir_rs/examples/kvs_mut/client.rs @@ -1,7 +1,7 @@ use std::net::SocketAddr; -use hydroflow::dfir_syntax; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::helpers::parse_command; use crate::protocol::KvsResponse; diff --git a/hydroflow/examples/kvs_mut/helpers.rs b/dfir_rs/examples/kvs_mut/helpers.rs similarity index 100% rename from hydroflow/examples/kvs_mut/helpers.rs rename to dfir_rs/examples/kvs_mut/helpers.rs diff --git a/hydroflow/examples/kvs_mut/main.rs b/dfir_rs/examples/kvs_mut/main.rs similarity index 93% rename from hydroflow/examples/kvs_mut/main.rs rename to dfir_rs/examples/kvs_mut/main.rs index 3838fe6faa7d..1e9e33d0b047 100644 --- a/hydroflow/examples/kvs_mut/main.rs +++ b/dfir_rs/examples/kvs_mut/main.rs @@ -2,8 +2,8 @@ use std::net::SocketAddr; use clap::{Parser, ValueEnum}; use client::run_client; -use hydroflow::lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::lang::graph::{WriteConfig, WriteGraphType}; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use server::run_server; mod client; @@ -31,7 +31,7 @@ struct Opts { write_config: Option, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let opts = Opts::parse(); let addr = opts.addr.unwrap(); @@ -55,7 +55,7 @@ async fn main() { fn test() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server, _, mut server_stdout) = run_cargo_example("kvs_mut", "--role server --addr 127.0.0.1:2061"); diff --git a/hydroflow/examples/kvs_mut/protocol.rs b/dfir_rs/examples/kvs_mut/protocol.rs similarity index 100% rename from hydroflow/examples/kvs_mut/protocol.rs rename to dfir_rs/examples/kvs_mut/protocol.rs diff --git a/hydroflow/examples/kvs_mut/server.rs b/dfir_rs/examples/kvs_mut/server.rs similarity index 94% rename from hydroflow/examples/kvs_mut/server.rs rename to dfir_rs/examples/kvs_mut/server.rs index df1b3a4692d2..5c0a96b11058 100644 --- a/hydroflow/examples/kvs_mut/server.rs +++ b/dfir_rs/examples/kvs_mut/server.rs @@ -1,6 +1,6 @@ -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{PersistenceKeyed, UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{PersistenceKeyed, UdpSink, UdpStream}; use crate::protocol::{KvsMessageWithAddr, KvsResponse}; use crate::Opts; diff --git a/hydroflow/examples/kvs_replicated/README.md b/dfir_rs/examples/kvs_replicated/README.md similarity index 100% rename from hydroflow/examples/kvs_replicated/README.md rename to dfir_rs/examples/kvs_replicated/README.md diff --git a/hydroflow/examples/kvs_replicated/client.rs b/dfir_rs/examples/kvs_replicated/client.rs similarity index 94% rename from hydroflow/examples/kvs_replicated/client.rs rename to dfir_rs/examples/kvs_replicated/client.rs index e799a486e98a..ccb54268e054 100644 --- a/hydroflow/examples/kvs_replicated/client.rs +++ b/dfir_rs/examples/kvs_replicated/client.rs @@ -1,5 +1,5 @@ -use hydroflow::dfir_syntax; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::helpers::parse_command; use crate::protocol::KvsMessage; diff --git a/hydroflow/examples/kvs_replicated/helpers.rs b/dfir_rs/examples/kvs_replicated/helpers.rs similarity index 100% rename from hydroflow/examples/kvs_replicated/helpers.rs rename to dfir_rs/examples/kvs_replicated/helpers.rs diff --git a/hydroflow/examples/kvs_replicated/main.rs b/dfir_rs/examples/kvs_replicated/main.rs similarity index 93% rename from hydroflow/examples/kvs_replicated/main.rs rename to dfir_rs/examples/kvs_replicated/main.rs index 0d4117a2a35e..f5b053929914 100644 --- a/hydroflow/examples/kvs_replicated/main.rs +++ b/dfir_rs/examples/kvs_replicated/main.rs @@ -2,8 +2,8 @@ use std::net::SocketAddr; use clap::{Parser, ValueEnum}; use client::run_client; -use hydroflow::lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::lang::graph::{WriteConfig, WriteGraphType}; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use server::run_server; mod client; @@ -31,7 +31,7 @@ struct Opts { write_config: Option, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let opts = Opts::parse(); let addr = opts.addr; @@ -55,7 +55,7 @@ async fn main() { fn test() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server_1, _, mut server_1_stdout) = run_cargo_example("kvs_replicated", "--role server --addr 127.0.0.1:2051"); diff --git a/hydroflow/examples/kvs_replicated/protocol.rs b/dfir_rs/examples/kvs_replicated/protocol.rs similarity index 100% rename from hydroflow/examples/kvs_replicated/protocol.rs rename to dfir_rs/examples/kvs_replicated/protocol.rs diff --git a/hydroflow/examples/kvs_replicated/server.rs b/dfir_rs/examples/kvs_replicated/server.rs similarity index 96% rename from hydroflow/examples/kvs_replicated/server.rs rename to dfir_rs/examples/kvs_replicated/server.rs index 75efc44ed9d5..be5de2a2ca91 100644 --- a/hydroflow/examples/kvs_replicated/server.rs +++ b/dfir_rs/examples/kvs_replicated/server.rs @@ -1,6 +1,6 @@ -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::protocol::{KvsMessage, KvsMessageWithAddr}; use crate::Opts; diff --git a/hydroflow/examples/lamport_clock/README.md b/dfir_rs/examples/lamport_clock/README.md similarity index 100% rename from hydroflow/examples/lamport_clock/README.md rename to dfir_rs/examples/lamport_clock/README.md diff --git a/hydroflow/examples/lamport_clock/client.rs b/dfir_rs/examples/lamport_clock/client.rs similarity index 95% rename from hydroflow/examples/lamport_clock/client.rs rename to dfir_rs/examples/lamport_clock/client.rs index 0747325cea2a..de65c7cb7fd3 100644 --- a/hydroflow/examples/lamport_clock/client.rs +++ b/dfir_rs/examples/lamport_clock/client.rs @@ -1,9 +1,9 @@ use std::net::SocketAddr; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::lattices::{Max, Merge}; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::{Max, Merge}; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::protocol::EchoMsg; use crate::Opts; diff --git a/hydroflow/examples/lamport_clock/main.rs b/dfir_rs/examples/lamport_clock/main.rs similarity index 94% rename from hydroflow/examples/lamport_clock/main.rs rename to dfir_rs/examples/lamport_clock/main.rs index 603c0e6d0c24..42bf3f4874e9 100644 --- a/hydroflow/examples/lamport_clock/main.rs +++ b/dfir_rs/examples/lamport_clock/main.rs @@ -3,7 +3,7 @@ use std::net::SocketAddr; use clap::{Parser, ValueEnum}; use client::run_client; use dfir_lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use server::run_server; mod client; @@ -30,7 +30,7 @@ struct Opts { write_config: Option, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { // parse command line arguments let opts = Opts::parse(); @@ -57,7 +57,7 @@ async fn main() { fn test() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server, _, mut server_stdout) = run_cargo_example("lamport_clock", "--role server --addr 127.0.0.1:11052"); diff --git a/hydroflow/examples/lamport_clock/protocol.rs b/dfir_rs/examples/lamport_clock/protocol.rs similarity index 85% rename from hydroflow/examples/lamport_clock/protocol.rs rename to dfir_rs/examples/lamport_clock/protocol.rs index cd2629fd7db0..e1f24c9935bb 100644 --- a/hydroflow/examples/lamport_clock/protocol.rs +++ b/dfir_rs/examples/lamport_clock/protocol.rs @@ -1,4 +1,4 @@ -use hydroflow::lattices::Max; +use dfir_rs::lattices::Max; use serde::{Deserialize, Serialize}; #[derive(PartialEq, Eq, Clone, Serialize, Deserialize, Debug)] diff --git a/hydroflow/examples/lamport_clock/server.rs b/dfir_rs/examples/lamport_clock/server.rs similarity index 92% rename from hydroflow/examples/lamport_clock/server.rs rename to dfir_rs/examples/lamport_clock/server.rs index 7cae5b29035d..2ad00a19f83f 100644 --- a/hydroflow/examples/lamport_clock/server.rs +++ b/dfir_rs/examples/lamport_clock/server.rs @@ -1,10 +1,10 @@ use std::net::SocketAddr; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::lattices::{Max, Merge}; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::{Max, Merge}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::protocol::EchoMsg; use crate::Opts; diff --git a/hydroflow/examples/python_udf/main.rs b/dfir_rs/examples/python_udf/main.rs similarity index 97% rename from hydroflow/examples/python_udf/main.rs rename to dfir_rs/examples/python_udf/main.rs index 1dcd4f7c2c30..2182e95b6957 100644 --- a/hydroflow/examples/python_udf/main.rs +++ b/dfir_rs/examples/python_udf/main.rs @@ -1,7 +1,7 @@ use dfir_macro::dfir_syntax; use pyo3::{Py, PyAny, PyResult, Python}; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { eprintln!("Vec sender starting..."); diff --git a/hydroflow/examples/rga/README.md b/dfir_rs/examples/rga/README.md similarity index 100% rename from hydroflow/examples/rga/README.md rename to dfir_rs/examples/rga/README.md diff --git a/hydroflow/examples/rga/adjacency.rs b/dfir_rs/examples/rga/adjacency.rs similarity index 97% rename from hydroflow/examples/rga/adjacency.rs rename to dfir_rs/examples/rga/adjacency.rs index a354b5d6b7b6..6376f3fd476a 100644 --- a/hydroflow/examples/rga/adjacency.rs +++ b/dfir_rs/examples/rga/adjacency.rs @@ -1,7 +1,7 @@ use std::collections::VecDeque; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; use tokio::sync::mpsc::UnboundedSender; use tokio_stream::wrappers::UnboundedReceiverStream; diff --git a/hydroflow/examples/rga/datalog.rs b/dfir_rs/examples/rga/datalog.rs similarity index 98% rename from hydroflow/examples/rga/datalog.rs rename to dfir_rs/examples/rga/datalog.rs index f0a52e3e6b4a..3b63c446bfee 100644 --- a/hydroflow/examples/rga/datalog.rs +++ b/dfir_rs/examples/rga/datalog.rs @@ -1,5 +1,5 @@ -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; use tokio::sync::mpsc::UnboundedSender; use tokio_stream::wrappers::UnboundedReceiverStream; diff --git a/hydroflow/examples/rga/datalog_agg.rs b/dfir_rs/examples/rga/datalog_agg.rs similarity index 98% rename from hydroflow/examples/rga/datalog_agg.rs rename to dfir_rs/examples/rga/datalog_agg.rs index a3fcd0b51466..cb2b153f2ab7 100644 --- a/hydroflow/examples/rga/datalog_agg.rs +++ b/dfir_rs/examples/rga/datalog_agg.rs @@ -1,5 +1,5 @@ -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; use tokio::sync::mpsc::UnboundedSender; use tokio_stream::wrappers::UnboundedReceiverStream; diff --git a/hydroflow/examples/rga/main.rs b/dfir_rs/examples/rga/main.rs similarity index 95% rename from hydroflow/examples/rga/main.rs rename to dfir_rs/examples/rga/main.rs index a57ff6689615..c7a6d8332037 100644 --- a/hydroflow/examples/rga/main.rs +++ b/dfir_rs/examples/rga/main.rs @@ -5,7 +5,7 @@ use clap::{Parser, ValueEnum}; use datalog::rga_datalog; use datalog_agg::rga_datalog_agg; use dfir_lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::util::collect_ready_async; +use dfir_rs::util::collect_ready_async; use minimal::rga_minimal; use protocol::{Timestamp, Token}; use tokio::sync::mpsc::UnboundedSender; @@ -35,7 +35,7 @@ struct Opts { write_config: Option, } -#[hydroflow::main] +#[dfir_rs::main] pub async fn main() { { // Set up tracing logger. @@ -47,9 +47,9 @@ pub async fn main() { } // An edge in the input data = a pair of `Token` vertex IDs. - let (input_send, input_recv) = hydroflow::util::unbounded_channel::<(Token, Timestamp)>(); - let (rga_send, mut rga_recv) = hydroflow::util::unbounded_channel::<(Token, Timestamp)>(); - let (list_send, mut list_recv) = hydroflow::util::unbounded_channel::<(Timestamp, Timestamp)>(); + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<(Token, Timestamp)>(); + let (rga_send, mut rga_recv) = dfir_rs::util::unbounded_channel::<(Token, Timestamp)>(); + let (list_send, mut list_recv) = dfir_rs::util::unbounded_channel::<(Timestamp, Timestamp)>(); let opts = Opts::parse(); let mut hf = match opts.implementation { @@ -164,7 +164,7 @@ fn format_dot_node(n: Token) -> String { #[test] fn test() { - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; fn escape_regex(input: &str) -> String { input diff --git a/hydroflow/examples/rga/minimal.rs b/dfir_rs/examples/rga/minimal.rs similarity index 87% rename from hydroflow/examples/rga/minimal.rs rename to dfir_rs/examples/rga/minimal.rs index 5f70c40ea6c0..1696d40d2036 100644 --- a/hydroflow/examples/rga/minimal.rs +++ b/dfir_rs/examples/rga/minimal.rs @@ -1,5 +1,5 @@ -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; use tokio::sync::mpsc::UnboundedSender; use tokio_stream::wrappers::UnboundedReceiverStream; diff --git a/hydroflow/examples/rga/protocol.rs b/dfir_rs/examples/rga/protocol.rs similarity index 100% rename from hydroflow/examples/rga/protocol.rs rename to dfir_rs/examples/rga/protocol.rs diff --git a/hydroflow/examples/shopping/README.md b/dfir_rs/examples/shopping/README.md similarity index 100% rename from hydroflow/examples/shopping/README.md rename to dfir_rs/examples/shopping/README.md diff --git a/hydroflow/examples/shopping/driver.rs b/dfir_rs/examples/shopping/driver.rs similarity index 94% rename from hydroflow/examples/shopping/driver.rs rename to dfir_rs/examples/shopping/driver.rs index f7bfdd7c56de..64a9dd53326c 100644 --- a/hydroflow/examples/shopping/driver.rs +++ b/dfir_rs/examples/shopping/driver.rs @@ -1,6 +1,6 @@ use std::net::SocketAddr; -use hydroflow::util::ipv4_resolve; +use dfir_rs::util::ipv4_resolve; use crate::flows::bp_flow::bp_flow; use crate::flows::client_state_flow::client_state_flow; @@ -20,9 +20,9 @@ async fn spawn_listener( bp_listener_addr: SocketAddr, ssiv_listener_addr: SocketAddr, ) { - let (_, tuple_listener_in, _) = hydroflow::util::bind_udp_bytes(tuple_listener_addr).await; - let (_, bp_listener_in, _) = hydroflow::util::bind_udp_bytes(bp_listener_addr).await; - let (_, ssiv_listener_in, _) = hydroflow::util::bind_udp_bytes(ssiv_listener_addr).await; + let (_, tuple_listener_in, _) = dfir_rs::util::bind_udp_bytes(tuple_listener_addr).await; + let (_, bp_listener_in, _) = dfir_rs::util::bind_udp_bytes(bp_listener_addr).await; + let (_, ssiv_listener_in, _) = dfir_rs::util::bind_udp_bytes(ssiv_listener_addr).await; // spawn a listener thread to print out what each flow sends over the network std::thread::spawn(move || { let runtime = tokio::runtime::Builder::new_current_thread() @@ -41,7 +41,7 @@ async fn spawn_listener( pub(crate) async fn run_driver(opts: Opts) { // the address for the output; the listener will listen to this address let out_addr = ipv4_resolve("localhost:0").unwrap(); - let (out, _, _) = hydroflow::util::bind_udp_bytes(out_addr).await; + let (out, _, _) = dfir_rs::util::bind_udp_bytes(out_addr).await; // define the shopping workload from the test data let client1 = tuple_wrap(client1_vec().into_iter()); @@ -81,7 +81,7 @@ pub(crate) async fn run_driver(opts: Opts) { // addresses for a client proxy thread let client_addr = ipv4_resolve("localhost:23457").unwrap(); let client_out_addr = ipv4_resolve("localhost:23460").unwrap(); - let (client_out, _, _) = hydroflow::util::bind_udp_bytes(client_out_addr).await; + let (client_out, _, _) = dfir_rs::util::bind_udp_bytes(client_out_addr).await; // shopping input is handled by the client proxy transducer // so the server transducer should get an empty iterator as its first argument @@ -170,14 +170,14 @@ pub(crate) async fn run_driver(opts: Opts) { // address for a client proxy thread let client_addr = ipv4_resolve("localhost:23457").unwrap(); let client_out_addr = ipv4_resolve("localhost:23460").unwrap(); - let (client_out, _, _) = hydroflow::util::bind_udp_bytes(client_out_addr).await; + let (client_out, _, _) = dfir_rs::util::bind_udp_bytes(client_out_addr).await; // Spawn 3 server replicas asynchronously for pair in server_addrs.iter().zip(gossip_addrs.iter()) { let (&addr, &gossip_addr) = pair; let out_addr = ipv4_resolve("localhost:0").unwrap(); - let (out, _, _) = hydroflow::util::bind_udp_bytes(out_addr).await; + let (out, _, _) = dfir_rs::util::bind_udp_bytes(out_addr).await; let gossip_addrs = gossip_addrs.clone(); // shopping input is handled by the client proxy transducer diff --git a/hydroflow/examples/shopping/flows/bp_flow.rs b/dfir_rs/examples/shopping/flows/bp_flow.rs similarity index 93% rename from hydroflow/examples/shopping/flows/bp_flow.rs rename to dfir_rs/examples/shopping/flows/bp_flow.rs index 0506e39bebcd..1e446128cfb7 100644 --- a/hydroflow/examples/shopping/flows/bp_flow.rs +++ b/dfir_rs/examples/shopping/flows/bp_flow.rs @@ -1,10 +1,10 @@ use std::net::SocketAddr; use bytes::Bytes; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::Merge; +use dfir_rs::scheduled::graph::Hydroflow; use futures::stream::SplitSink; -use hydroflow::dfir_syntax; -use hydroflow::lattices::Merge; -use hydroflow::scheduled::graph::Hydroflow; use tokio_util::codec::LengthDelimitedCodec; use tokio_util::udp::UdpFramed; diff --git a/hydroflow/examples/shopping/flows/client_state_flow.rs b/dfir_rs/examples/shopping/flows/client_state_flow.rs similarity index 90% rename from hydroflow/examples/shopping/flows/client_state_flow.rs rename to dfir_rs/examples/shopping/flows/client_state_flow.rs index 59f4fbde1fdc..a8a0f8fe03b9 100644 --- a/hydroflow/examples/shopping/flows/client_state_flow.rs +++ b/dfir_rs/examples/shopping/flows/client_state_flow.rs @@ -1,10 +1,10 @@ use std::net::SocketAddr; use bytes::Bytes; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::Merge; +use dfir_rs::scheduled::graph::Hydroflow; use futures::stream::SplitSink; -use hydroflow::dfir_syntax; -use hydroflow::lattices::Merge; -use hydroflow::scheduled::graph::Hydroflow; use tokio_util::codec::LengthDelimitedCodec; use tokio_util::udp::UdpFramed; @@ -27,7 +27,7 @@ pub(crate) async fn client_state_flow( const SSIV_BOT: fn() -> SealedSetOfIndexedValues = Default::default; // Set up the Udp socket for proxy-server communication - let (carts_out, carts_in, _) = hydroflow::util::bind_udp_bytes(local_addr).await; + let (carts_out, carts_in, _) = dfir_rs::util::bind_udp_bytes(local_addr).await; // This is like server_state_flow, but we split it into two transducers at a different spot. // Here, the first transducer takes in shopping_ssiv requests and runs a stateful fold_keyed, persisting all the shopping requests in ssiv's. diff --git a/hydroflow/examples/shopping/flows/listener_flow.rs b/dfir_rs/examples/shopping/flows/listener_flow.rs similarity index 90% rename from hydroflow/examples/shopping/flows/listener_flow.rs rename to dfir_rs/examples/shopping/flows/listener_flow.rs index 6b79e7cae7ed..6384362cbbde 100644 --- a/hydroflow/examples/shopping/flows/listener_flow.rs +++ b/dfir_rs/examples/shopping/flows/listener_flow.rs @@ -1,8 +1,8 @@ use std::net::SocketAddr; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::UdpStream; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::UdpStream; use crate::lattices::{BoundedPrefix, SealedSetOfIndexedValues}; use crate::structs::{ClientClass, LineItem, Request}; diff --git a/hydroflow/examples/shopping/flows/mod.rs b/dfir_rs/examples/shopping/flows/mod.rs similarity index 100% rename from hydroflow/examples/shopping/flows/mod.rs rename to dfir_rs/examples/shopping/flows/mod.rs diff --git a/hydroflow/examples/shopping/flows/orig_flow.rs b/dfir_rs/examples/shopping/flows/orig_flow.rs similarity index 94% rename from hydroflow/examples/shopping/flows/orig_flow.rs rename to dfir_rs/examples/shopping/flows/orig_flow.rs index a1c3be04c701..004e0dfc44ac 100644 --- a/hydroflow/examples/shopping/flows/orig_flow.rs +++ b/dfir_rs/examples/shopping/flows/orig_flow.rs @@ -1,9 +1,9 @@ use std::net::SocketAddr; use bytes::Bytes; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; use futures::stream::SplitSink; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; use tokio_util::codec::LengthDelimitedCodec; use tokio_util::udp::UdpFramed; diff --git a/hydroflow/examples/shopping/flows/push_group_flow.rs b/dfir_rs/examples/shopping/flows/push_group_flow.rs similarity index 94% rename from hydroflow/examples/shopping/flows/push_group_flow.rs rename to dfir_rs/examples/shopping/flows/push_group_flow.rs index 7e9b3bb09ce7..e17532753e6b 100644 --- a/hydroflow/examples/shopping/flows/push_group_flow.rs +++ b/dfir_rs/examples/shopping/flows/push_group_flow.rs @@ -1,10 +1,10 @@ use std::net::SocketAddr; use bytes::Bytes; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::Merge; +use dfir_rs::scheduled::graph::Hydroflow; use futures::stream::SplitSink; -use hydroflow::dfir_syntax; -use hydroflow::lattices::Merge; -use hydroflow::scheduled::graph::Hydroflow; use tokio_util::codec::LengthDelimitedCodec; use tokio_util::udp::UdpFramed; diff --git a/hydroflow/examples/shopping/flows/rep_server_flow.rs b/dfir_rs/examples/shopping/flows/rep_server_flow.rs similarity index 88% rename from hydroflow/examples/shopping/flows/rep_server_flow.rs rename to dfir_rs/examples/shopping/flows/rep_server_flow.rs index 9291e699c819..f9857abb9783 100644 --- a/hydroflow/examples/shopping/flows/rep_server_flow.rs +++ b/dfir_rs/examples/shopping/flows/rep_server_flow.rs @@ -1,10 +1,10 @@ use std::net::SocketAddr; use bytes::Bytes; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::Merge; +use dfir_rs::scheduled::graph::Hydroflow; use futures::stream::SplitSink; -use hydroflow::dfir_syntax; -use hydroflow::lattices::Merge; -use hydroflow::scheduled::graph::Hydroflow; use tokio_util::codec::LengthDelimitedCodec; use tokio_util::udp::UdpFramed; @@ -21,7 +21,7 @@ pub(crate) async fn rep_server_flow( gossip_addr: SocketAddr, server_addrs: impl Iterator + 'static, ) -> Hydroflow<'static> { - let (broadcast_out, broadcast_in, _) = hydroflow::util::bind_udp_bytes(gossip_addr).await; + let (broadcast_out, broadcast_in, _) = dfir_rs::util::bind_udp_bytes(gossip_addr).await; let client_class = client_class_iter(); let ssiv_merge = as Merge>>::merge; @@ -29,7 +29,7 @@ pub(crate) async fn rep_server_flow( const SSIV_BOT: fn() -> SealedSetOfIndexedValues = Default::default; // Set up the Udp socket for proxy-server communication - let (reqs_out, reqs_in, _) = hydroflow::util::bind_udp_bytes(local_addr).await; + let (reqs_out, reqs_in, _) = dfir_rs::util::bind_udp_bytes(local_addr).await; dfir_syntax! { // Client Proxy diff --git a/hydroflow/examples/shopping/flows/server_state_flow.rs b/dfir_rs/examples/shopping/flows/server_state_flow.rs similarity index 91% rename from hydroflow/examples/shopping/flows/server_state_flow.rs rename to dfir_rs/examples/shopping/flows/server_state_flow.rs index aef557af4b9c..34e5525d15ea 100644 --- a/hydroflow/examples/shopping/flows/server_state_flow.rs +++ b/dfir_rs/examples/shopping/flows/server_state_flow.rs @@ -1,10 +1,10 @@ use std::net::SocketAddr; use bytes::Bytes; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::Merge; +use dfir_rs::scheduled::graph::Hydroflow; use futures::stream::SplitSink; -use hydroflow::dfir_syntax; -use hydroflow::lattices::Merge; -use hydroflow::scheduled::graph::Hydroflow; use tokio_util::codec::LengthDelimitedCodec; use tokio_util::udp::UdpFramed; @@ -27,7 +27,7 @@ pub(crate) async fn server_state_flow( const SSIV_BOT: fn() -> SealedSetOfIndexedValues = Default::default; // Set up the Udp socket for proxy-server communication - let (reqs_out, reqs_in, _) = hydroflow::util::bind_udp_bytes(local_addr).await; + let (reqs_out, reqs_in, _) = dfir_rs::util::bind_udp_bytes(local_addr).await; // This is like push_group_flow, but we split it into two transducers that communicate via reqs_out and reqs_in. // The first transducer takes in shopping_ssiv requests, and forwards them via reqs_out to the second transducer. diff --git a/hydroflow/examples/shopping/flows/ssiv_flow.rs b/dfir_rs/examples/shopping/flows/ssiv_flow.rs similarity index 93% rename from hydroflow/examples/shopping/flows/ssiv_flow.rs rename to dfir_rs/examples/shopping/flows/ssiv_flow.rs index c8f5ced5ce9c..8ef07c48ebc3 100644 --- a/hydroflow/examples/shopping/flows/ssiv_flow.rs +++ b/dfir_rs/examples/shopping/flows/ssiv_flow.rs @@ -1,10 +1,10 @@ use std::net::SocketAddr; use bytes::Bytes; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::Merge; +use dfir_rs::scheduled::graph::Hydroflow; use futures::stream::SplitSink; -use hydroflow::dfir_syntax; -use hydroflow::lattices::Merge; -use hydroflow::scheduled::graph::Hydroflow; use tokio_util::codec::LengthDelimitedCodec; use tokio_util::udp::UdpFramed; diff --git a/hydroflow/examples/shopping/lattices.rs b/dfir_rs/examples/shopping/lattices.rs similarity index 99% rename from hydroflow/examples/shopping/lattices.rs rename to dfir_rs/examples/shopping/lattices.rs index b3c21b661f15..aa30f0297558 100644 --- a/hydroflow/examples/shopping/lattices.rs +++ b/dfir_rs/examples/shopping/lattices.rs @@ -1,7 +1,7 @@ use std::cmp::Ordering; use std::collections::BTreeMap; -use hydroflow::lattices::{LatticeFrom, LatticeOrd, Merge}; +use dfir_rs::lattices::{LatticeFrom, LatticeOrd, Merge}; use itertools::Itertools; use serde::{Deserialize, Serialize}; diff --git a/hydroflow/examples/shopping/main.rs b/dfir_rs/examples/shopping/main.rs similarity index 98% rename from hydroflow/examples/shopping/main.rs rename to dfir_rs/examples/shopping/main.rs index 6dd0e9239b98..a90ad7aedc06 100644 --- a/hydroflow/examples/shopping/main.rs +++ b/dfir_rs/examples/shopping/main.rs @@ -27,7 +27,7 @@ struct Opts { write_config: Option, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let opts = Opts::parse(); @@ -37,7 +37,7 @@ async fn main() { #[test] fn test() { - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; fn escape_regex(input: &str) -> String { input diff --git a/hydroflow/examples/shopping/misc/replicated2.dot b/dfir_rs/examples/shopping/misc/replicated2.dot similarity index 100% rename from hydroflow/examples/shopping/misc/replicated2.dot rename to dfir_rs/examples/shopping/misc/replicated2.dot diff --git a/hydroflow/examples/shopping/misc/replicated2.pdf b/dfir_rs/examples/shopping/misc/replicated2.pdf similarity index 100% rename from hydroflow/examples/shopping/misc/replicated2.pdf rename to dfir_rs/examples/shopping/misc/replicated2.pdf diff --git a/hydroflow/examples/shopping/structs.rs b/dfir_rs/examples/shopping/structs.rs similarity index 100% rename from hydroflow/examples/shopping/structs.rs rename to dfir_rs/examples/shopping/structs.rs diff --git a/hydroflow/examples/shopping/test_data.rs b/dfir_rs/examples/shopping/test_data.rs similarity index 100% rename from hydroflow/examples/shopping/test_data.rs rename to dfir_rs/examples/shopping/test_data.rs diff --git a/hydroflow/examples/shopping/wrappers.rs b/dfir_rs/examples/shopping/wrappers.rs similarity index 100% rename from hydroflow/examples/shopping/wrappers.rs rename to dfir_rs/examples/shopping/wrappers.rs diff --git a/hydroflow/examples/three_clique/README.md b/dfir_rs/examples/three_clique/README.md similarity index 100% rename from hydroflow/examples/three_clique/README.md rename to dfir_rs/examples/three_clique/README.md diff --git a/hydroflow/examples/three_clique/main.rs b/dfir_rs/examples/three_clique/main.rs similarity index 94% rename from hydroflow/examples/three_clique/main.rs rename to dfir_rs/examples/three_clique/main.rs index a23341a4118d..d5a645dac83a 100644 --- a/hydroflow/examples/three_clique/main.rs +++ b/dfir_rs/examples/three_clique/main.rs @@ -1,6 +1,6 @@ use clap::Parser; use dfir_lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; // This example detects size three cliques in a graph. Size three cliques are also known as triangles. // The equivalent datalog program would be Triangle(x,y,z) := Edge(x,y), Edge(y,z), Edge(z,x) @@ -16,7 +16,7 @@ struct Opts { pub fn main() { let opts = Opts::parse(); // An edge in the input data = a pair of `usize` vertex IDs. - let (edges_send, edges_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (edges_send, edges_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); #[expect(clippy::map_identity, reason = "code symmetry")] let mut df = dfir_syntax! { @@ -79,7 +79,7 @@ pub fn main() { #[test] fn test() { - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_child, _, mut stdout) = run_cargo_example("three_clique", ""); diff --git a/hydroflow/examples/two_pc_hf/README.md b/dfir_rs/examples/two_pc_hf/README.md similarity index 100% rename from hydroflow/examples/two_pc_hf/README.md rename to dfir_rs/examples/two_pc_hf/README.md diff --git a/hydroflow/examples/two_pc_hf/coordinator.rs b/dfir_rs/examples/two_pc_hf/coordinator.rs similarity index 87% rename from hydroflow/examples/two_pc_hf/coordinator.rs rename to dfir_rs/examples/two_pc_hf/coordinator.rs index 203a8638ca13..00b105fb7e40 100644 --- a/hydroflow/examples/two_pc_hf/coordinator.rs +++ b/dfir_rs/examples/two_pc_hf/coordinator.rs @@ -1,8 +1,8 @@ use std::net::SocketAddr; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::helpers::parse_out; use crate::protocol::{CoordMsg, MsgType, SubordResponse}; @@ -40,7 +40,7 @@ pub(crate) async fn run_coordinator(outbound: UdpSink, inbound: UdpStream, opts: }); msgs[errs] -> for_each(|m| println!("Received unexpected message type: {:?}", m)); msgs[endeds] - -> map(|m: SubordResponse| hydroflow::util::PersistenceKeyed::Delete(m.xid)) + -> map(|m: SubordResponse| dfir_rs::util::PersistenceKeyed::Delete(m.xid)) -> defer_tick() -> phase_map; @@ -61,7 +61,7 @@ pub(crate) async fn run_coordinator(outbound: UdpSink, inbound: UdpStream, opts: -> filter_map(|l: Result| parse_out(l.unwrap())) -> tee(); initiate - -> flat_map(|xid: u16| [hydroflow::util::PersistenceKeyed::Delete(xid), hydroflow::util::PersistenceKeyed::Persist(xid, 1)]) + -> flat_map(|xid: u16| [dfir_rs::util::PersistenceKeyed::Delete(xid), dfir_rs::util::PersistenceKeyed::Persist(xid, 1)]) -> phase_map; initiate -> map(|xid:u16| CoordMsg{xid, mtype: MsgType::Prepare}) @@ -72,7 +72,7 @@ pub(crate) async fn run_coordinator(outbound: UdpSink, inbound: UdpStream, opts: // We'll respond to each abort message: this is redundant but correct (and monotone) abort_p1s = msgs[aborts] -> tee(); abort_p1s - -> flat_map(|m: SubordResponse| [hydroflow::util::PersistenceKeyed::Delete(m.xid), hydroflow::util::PersistenceKeyed::Persist(m.xid, 2)]) + -> flat_map(|m: SubordResponse| [dfir_rs::util::PersistenceKeyed::Delete(m.xid), dfir_rs::util::PersistenceKeyed::Persist(m.xid, 2)]) -> defer_tick() -> phase_map; abort_p1s @@ -106,7 +106,7 @@ pub(crate) async fn run_coordinator(outbound: UdpSink, inbound: UdpStream, opts: -> tee(); // update the phase_map check_committed - -> flat_map(|xid| [hydroflow::util::PersistenceKeyed::Delete(xid), hydroflow::util::PersistenceKeyed::Persist(xid, 2)]) + -> flat_map(|xid| [dfir_rs::util::PersistenceKeyed::Delete(xid), dfir_rs::util::PersistenceKeyed::Persist(xid, 2)]) -> defer_tick() -> phase_map; // broadcast the P2 commit message @@ -117,7 +117,7 @@ pub(crate) async fn run_coordinator(outbound: UdpSink, inbound: UdpStream, opts: // Handle p2 acknowledgments by sending an End message ack_p2s = msgs[acks] -> tee(); ack_p2s - -> flat_map(|m: SubordResponse| [hydroflow::util::PersistenceKeyed::Delete(m.xid), hydroflow::util::PersistenceKeyed::Persist(m.xid, 3)]) + -> flat_map(|m: SubordResponse| [dfir_rs::util::PersistenceKeyed::Delete(m.xid), dfir_rs::util::PersistenceKeyed::Persist(m.xid, 3)]) -> defer_tick() -> phase_map; ack_p2s diff --git a/hydroflow/examples/two_pc_hf/helpers.rs b/dfir_rs/examples/two_pc_hf/helpers.rs similarity index 100% rename from hydroflow/examples/two_pc_hf/helpers.rs rename to dfir_rs/examples/two_pc_hf/helpers.rs diff --git a/hydroflow/examples/two_pc_hf/main.rs b/dfir_rs/examples/two_pc_hf/main.rs similarity index 96% rename from hydroflow/examples/two_pc_hf/main.rs rename to dfir_rs/examples/two_pc_hf/main.rs index 1f7e6c58716e..94ff69272f9d 100644 --- a/hydroflow/examples/two_pc_hf/main.rs +++ b/dfir_rs/examples/two_pc_hf/main.rs @@ -4,7 +4,7 @@ use std::path::Path; use clap::{Parser, ValueEnum}; use coordinator::run_coordinator; use dfir_lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use serde::Deserialize; use subordinate::run_subordinate; @@ -46,7 +46,7 @@ struct Addresses { subordinates: Vec, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let opts = Opts::parse(); let addr = opts.addr; @@ -67,7 +67,7 @@ async fn main() { fn test() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; const TEST_NAME: &str = "two_pc_hf"; diff --git a/hydroflow/examples/two_pc_hf/members.json b/dfir_rs/examples/two_pc_hf/members.json similarity index 100% rename from hydroflow/examples/two_pc_hf/members.json rename to dfir_rs/examples/two_pc_hf/members.json diff --git a/hydroflow/examples/two_pc_hf/protocol.rs b/dfir_rs/examples/two_pc_hf/protocol.rs similarity index 100% rename from hydroflow/examples/two_pc_hf/protocol.rs rename to dfir_rs/examples/two_pc_hf/protocol.rs diff --git a/hydroflow/examples/two_pc_hf/subordinate.rs b/dfir_rs/examples/two_pc_hf/subordinate.rs similarity index 95% rename from hydroflow/examples/two_pc_hf/subordinate.rs rename to dfir_rs/examples/two_pc_hf/subordinate.rs index ecc69a22b47d..001c4db11725 100644 --- a/hydroflow/examples/two_pc_hf/subordinate.rs +++ b/dfir_rs/examples/two_pc_hf/subordinate.rs @@ -1,8 +1,8 @@ use std::net::SocketAddr; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{UdpSink, UdpStream}; use crate::helpers::decide; use crate::protocol::{CoordMsg, MsgType, SubordResponse}; diff --git a/hydroflow/examples/vector_clock/README.md b/dfir_rs/examples/vector_clock/README.md similarity index 100% rename from hydroflow/examples/vector_clock/README.md rename to dfir_rs/examples/vector_clock/README.md diff --git a/hydroflow/examples/vector_clock/client.rs b/dfir_rs/examples/vector_clock/client.rs similarity index 97% rename from hydroflow/examples/vector_clock/client.rs rename to dfir_rs/examples/vector_clock/client.rs index 2d32204f5f83..99fe0d32c381 100644 --- a/hydroflow/examples/vector_clock/client.rs +++ b/dfir_rs/examples/vector_clock/client.rs @@ -1,8 +1,8 @@ use std::net::SocketAddr; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::{UdpSink, UdpStream}; use lattices::map_union::MapUnionSingletonMap; use lattices::{Max, Merge}; diff --git a/hydroflow/examples/vector_clock/main.rs b/dfir_rs/examples/vector_clock/main.rs similarity index 94% rename from hydroflow/examples/vector_clock/main.rs rename to dfir_rs/examples/vector_clock/main.rs index e221059b90fd..97abb8965b4b 100644 --- a/hydroflow/examples/vector_clock/main.rs +++ b/dfir_rs/examples/vector_clock/main.rs @@ -2,7 +2,7 @@ use std::net::SocketAddr; use clap::{Parser, ValueEnum}; use client::run_client; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use server::run_server; mod client; @@ -34,7 +34,7 @@ struct Opts { graph: Option, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { // parse command line arguments let opts = Opts::parse(); @@ -61,7 +61,7 @@ async fn main() { fn test() { use std::io::Write; - use hydroflow::util::{run_cargo_example, wait_for_process_output}; + use dfir_rs::util::{run_cargo_example, wait_for_process_output}; let (_server, _, mut server_stdout) = run_cargo_example("vector_clock", "--role server --addr 127.0.0.1:11053"); diff --git a/hydroflow/examples/vector_clock/protocol.rs b/dfir_rs/examples/vector_clock/protocol.rs similarity index 100% rename from hydroflow/examples/vector_clock/protocol.rs rename to dfir_rs/examples/vector_clock/protocol.rs diff --git a/hydroflow/examples/vector_clock/server.rs b/dfir_rs/examples/vector_clock/server.rs similarity index 93% rename from hydroflow/examples/vector_clock/server.rs rename to dfir_rs/examples/vector_clock/server.rs index f29bf7f08b2a..c8644eda810b 100644 --- a/hydroflow/examples/vector_clock/server.rs +++ b/dfir_rs/examples/vector_clock/server.rs @@ -1,9 +1,9 @@ use std::net::SocketAddr; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{UdpSink, UdpStream}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{UdpSink, UdpStream}; use lattices::map_union::MapUnionSingletonMap; use lattices::{Max, Merge}; diff --git a/hydroflow/src/compiled/mod.rs b/dfir_rs/src/compiled/mod.rs similarity index 100% rename from hydroflow/src/compiled/mod.rs rename to dfir_rs/src/compiled/mod.rs diff --git a/hydroflow/src/compiled/pull/anti_join.rs b/dfir_rs/src/compiled/pull/anti_join.rs similarity index 100% rename from hydroflow/src/compiled/pull/anti_join.rs rename to dfir_rs/src/compiled/pull/anti_join.rs diff --git a/hydroflow/src/compiled/pull/cross_join.rs b/dfir_rs/src/compiled/pull/cross_join.rs similarity index 100% rename from hydroflow/src/compiled/pull/cross_join.rs rename to dfir_rs/src/compiled/pull/cross_join.rs diff --git a/hydroflow/src/compiled/pull/half_join_state/fold.rs b/dfir_rs/src/compiled/pull/half_join_state/fold.rs similarity index 100% rename from hydroflow/src/compiled/pull/half_join_state/fold.rs rename to dfir_rs/src/compiled/pull/half_join_state/fold.rs diff --git a/hydroflow/src/compiled/pull/half_join_state/fold_from.rs b/dfir_rs/src/compiled/pull/half_join_state/fold_from.rs similarity index 100% rename from hydroflow/src/compiled/pull/half_join_state/fold_from.rs rename to dfir_rs/src/compiled/pull/half_join_state/fold_from.rs diff --git a/hydroflow/src/compiled/pull/half_join_state/mod.rs b/dfir_rs/src/compiled/pull/half_join_state/mod.rs similarity index 100% rename from hydroflow/src/compiled/pull/half_join_state/mod.rs rename to dfir_rs/src/compiled/pull/half_join_state/mod.rs diff --git a/hydroflow/src/compiled/pull/half_join_state/multiset.rs b/dfir_rs/src/compiled/pull/half_join_state/multiset.rs similarity index 100% rename from hydroflow/src/compiled/pull/half_join_state/multiset.rs rename to dfir_rs/src/compiled/pull/half_join_state/multiset.rs diff --git a/hydroflow/src/compiled/pull/half_join_state/reduce.rs b/dfir_rs/src/compiled/pull/half_join_state/reduce.rs similarity index 100% rename from hydroflow/src/compiled/pull/half_join_state/reduce.rs rename to dfir_rs/src/compiled/pull/half_join_state/reduce.rs diff --git a/hydroflow/src/compiled/pull/half_join_state/set.rs b/dfir_rs/src/compiled/pull/half_join_state/set.rs similarity index 100% rename from hydroflow/src/compiled/pull/half_join_state/set.rs rename to dfir_rs/src/compiled/pull/half_join_state/set.rs diff --git a/hydroflow/src/compiled/pull/mod.rs b/dfir_rs/src/compiled/pull/mod.rs similarity index 100% rename from hydroflow/src/compiled/pull/mod.rs rename to dfir_rs/src/compiled/pull/mod.rs diff --git a/hydroflow/src/compiled/pull/symmetric_hash_join.rs b/dfir_rs/src/compiled/pull/symmetric_hash_join.rs similarity index 100% rename from hydroflow/src/compiled/pull/symmetric_hash_join.rs rename to dfir_rs/src/compiled/pull/symmetric_hash_join.rs diff --git a/hydroflow/src/declarative_macro.rs b/dfir_rs/src/declarative_macro.rs similarity index 100% rename from hydroflow/src/declarative_macro.rs rename to dfir_rs/src/declarative_macro.rs diff --git a/hydroflow/src/lib.rs b/dfir_rs/src/lib.rs similarity index 97% rename from hydroflow/src/lib.rs rename to dfir_rs/src/lib.rs index 54e746e22b79..06724b92d4d4 100644 --- a/hydroflow/src/lib.rs +++ b/dfir_rs/src/lib.rs @@ -8,7 +8,7 @@ //! Hydroflow's custom "surface syntax." //! //! ```rust -//! let mut hf = hydroflow::dfir_syntax! { +//! let mut hf = dfir_rs::dfir_syntax! { //! source_iter(["hello", "world"]) -> for_each(|s| println!("{}", s)); //! }; //! hf.run_available(); diff --git a/hydroflow/src/scheduled/context.rs b/dfir_rs/src/scheduled/context.rs similarity index 100% rename from hydroflow/src/scheduled/context.rs rename to dfir_rs/src/scheduled/context.rs diff --git a/hydroflow/src/scheduled/graph.rs b/dfir_rs/src/scheduled/graph.rs similarity index 99% rename from hydroflow/src/scheduled/graph.rs rename to dfir_rs/src/scheduled/graph.rs index 40eab34da94d..e0ec40b685e1 100644 --- a/hydroflow/src/scheduled/graph.rs +++ b/dfir_rs/src/scheduled/graph.rs @@ -874,10 +874,10 @@ pub(super) struct SubgraphData<'a> { preds: Vec, succs: Vec, - /// If this subgraph is scheduled in [`Hydroflow::stratum_queues`]. + /// If this subgraph is scheduled in [`dfir_rs::stratum_queues`]. /// [`Cell`] allows modifying this field when iterating `Self::preds` or /// `Self::succs`, as all `SubgraphData` are owned by the same vec - /// `Hydroflow::subgraphs`. + /// `dfir_rs::subgraphs`. is_scheduled: Cell, /// Keep track of the last tick that this subgraph was run in diff --git a/hydroflow/src/scheduled/graph_ext.rs b/dfir_rs/src/scheduled/graph_ext.rs similarity index 100% rename from hydroflow/src/scheduled/graph_ext.rs rename to dfir_rs/src/scheduled/graph_ext.rs diff --git a/hydroflow/src/scheduled/handoff/handoff_list.rs b/dfir_rs/src/scheduled/handoff/handoff_list.rs similarity index 100% rename from hydroflow/src/scheduled/handoff/handoff_list.rs rename to dfir_rs/src/scheduled/handoff/handoff_list.rs diff --git a/hydroflow/src/scheduled/handoff/mod.rs b/dfir_rs/src/scheduled/handoff/mod.rs similarity index 100% rename from hydroflow/src/scheduled/handoff/mod.rs rename to dfir_rs/src/scheduled/handoff/mod.rs diff --git a/hydroflow/src/scheduled/handoff/tee.rs b/dfir_rs/src/scheduled/handoff/tee.rs similarity index 100% rename from hydroflow/src/scheduled/handoff/tee.rs rename to dfir_rs/src/scheduled/handoff/tee.rs diff --git a/hydroflow/src/scheduled/handoff/vector.rs b/dfir_rs/src/scheduled/handoff/vector.rs similarity index 100% rename from hydroflow/src/scheduled/handoff/vector.rs rename to dfir_rs/src/scheduled/handoff/vector.rs diff --git a/hydroflow/src/scheduled/input.rs b/dfir_rs/src/scheduled/input.rs similarity index 100% rename from hydroflow/src/scheduled/input.rs rename to dfir_rs/src/scheduled/input.rs diff --git a/hydroflow/src/scheduled/mod.rs b/dfir_rs/src/scheduled/mod.rs similarity index 100% rename from hydroflow/src/scheduled/mod.rs rename to dfir_rs/src/scheduled/mod.rs diff --git a/hydroflow/src/scheduled/net/mod.rs b/dfir_rs/src/scheduled/net/mod.rs similarity index 100% rename from hydroflow/src/scheduled/net/mod.rs rename to dfir_rs/src/scheduled/net/mod.rs diff --git a/hydroflow/src/scheduled/net/network_vertex.rs b/dfir_rs/src/scheduled/net/network_vertex.rs similarity index 100% rename from hydroflow/src/scheduled/net/network_vertex.rs rename to dfir_rs/src/scheduled/net/network_vertex.rs diff --git a/hydroflow/src/scheduled/port.rs b/dfir_rs/src/scheduled/port.rs similarity index 100% rename from hydroflow/src/scheduled/port.rs rename to dfir_rs/src/scheduled/port.rs diff --git a/hydroflow/src/scheduled/query.rs b/dfir_rs/src/scheduled/query.rs similarity index 100% rename from hydroflow/src/scheduled/query.rs rename to dfir_rs/src/scheduled/query.rs diff --git a/hydroflow/src/scheduled/reactor.rs b/dfir_rs/src/scheduled/reactor.rs similarity index 100% rename from hydroflow/src/scheduled/reactor.rs rename to dfir_rs/src/scheduled/reactor.rs diff --git a/hydroflow/src/scheduled/state.rs b/dfir_rs/src/scheduled/state.rs similarity index 100% rename from hydroflow/src/scheduled/state.rs rename to dfir_rs/src/scheduled/state.rs diff --git a/hydroflow/src/scheduled/subgraph.rs b/dfir_rs/src/scheduled/subgraph.rs similarity index 100% rename from hydroflow/src/scheduled/subgraph.rs rename to dfir_rs/src/scheduled/subgraph.rs diff --git a/hydroflow/src/scheduled/ticks.rs b/dfir_rs/src/scheduled/ticks.rs similarity index 95% rename from hydroflow/src/scheduled/ticks.rs rename to dfir_rs/src/scheduled/ticks.rs index 1d11d83a2130..205f1db40bf7 100644 --- a/hydroflow/src/scheduled/ticks.rs +++ b/dfir_rs/src/scheduled/ticks.rs @@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize}; /// `TickInstant` instances can be subtracted to calculate the `TickDuration` between them. /// /// ``` -/// # use hydroflow::scheduled::ticks::{TickDuration, TickInstant}; +/// # use dfir_rs::scheduled::ticks::{TickDuration, TickInstant}; /// /// assert_eq!(TickInstant(1) - TickInstant(0), TickDuration::SINGLE_TICK); /// assert_eq!(TickInstant(0) - TickInstant(1), -TickDuration::SINGLE_TICK); @@ -30,13 +30,13 @@ pub struct TickInstant(pub u64); /// `TickDuration` instances can be negative to allow for calculation of `TickInstant` instances in the past. /// /// ``` -/// # use hydroflow::scheduled::ticks::{TickDuration, TickInstant}; +/// # use dfir_rs::scheduled::ticks::{TickDuration, TickInstant}; /// assert_eq!(TickInstant(1) + TickDuration::new(-1), TickInstant(0)) /// ``` /// `TickDuration` instances can be added/subtracted to/from other `TickDuration` instances /// /// ``` -/// # use hydroflow::scheduled::ticks::TickDuration; +/// # use dfir_rs::scheduled::ticks::TickDuration; /// assert_eq!(TickDuration::ZERO + TickDuration::ZERO, TickDuration::ZERO); /// assert_eq!( /// TickDuration::ZERO + TickDuration::SINGLE_TICK, @@ -81,7 +81,7 @@ impl TickDuration { /// the same `TickInstant` or `TickDuration`. /// /// ``` - /// # use hydroflow::scheduled::ticks::{TickDuration, TickInstant}; + /// # use dfir_rs::scheduled::ticks::{TickDuration, TickInstant}; /// # use dfir_lang::graph::ops::DelayType::Tick; /// let ticks = TickInstant::new(100); /// assert_eq!(ticks + TickDuration::ZERO, ticks); @@ -98,7 +98,7 @@ impl TickDuration { /// It is the duration between two consecutive `TickInstant` instances. /// /// ``` - /// # use hydroflow::scheduled::ticks::{TickDuration, TickInstant}; + /// # use dfir_rs::scheduled::ticks::{TickDuration, TickInstant}; /// assert_eq!(TickInstant(0) + TickDuration::SINGLE_TICK, TickInstant(1)) /// ``` pub const SINGLE_TICK: Self = TickDuration { ticks: 1 }; diff --git a/hydroflow/src/util/clear.rs b/dfir_rs/src/util/clear.rs similarity index 100% rename from hydroflow/src/util/clear.rs rename to dfir_rs/src/util/clear.rs diff --git a/hydroflow/src/util/demux_enum.rs b/dfir_rs/src/util/demux_enum.rs similarity index 94% rename from hydroflow/src/util/demux_enum.rs rename to dfir_rs/src/util/demux_enum.rs index 4cce125b304d..f177a59425d0 100644 --- a/hydroflow/src/util/demux_enum.rs +++ b/dfir_rs/src/util/demux_enum.rs @@ -30,5 +30,5 @@ pub trait SingleVariant: DemuxEnumBase { } /// Base implementation to constrain that [`DemuxEnum`] is implemented. -#[diagnostic::on_unimplemented(note = "use `#[derive(hydroflow::DemuxEnum)]`")] +#[diagnostic::on_unimplemented(note = "use `#[derive(dfir_rs::DemuxEnum)]`")] pub trait DemuxEnumBase {} diff --git a/hydroflow/src/util/deploy.rs b/dfir_rs/src/util/deploy.rs similarity index 100% rename from hydroflow/src/util/deploy.rs rename to dfir_rs/src/util/deploy.rs diff --git a/hydroflow/src/util/mod.rs b/dfir_rs/src/util/mod.rs similarity index 99% rename from hydroflow/src/util/mod.rs rename to dfir_rs/src/util/mod.rs index 831be8bab9ee..e864d4282721 100644 --- a/hydroflow/src/util/mod.rs +++ b/dfir_rs/src/util/mod.rs @@ -297,7 +297,7 @@ impl Drop for DroppableChild { pub fn run_cargo_example(test_name: &str, args: &str) -> (DroppableChild, ChildStdin, ChildStdout) { let mut server = if args.is_empty() { std::process::Command::new("cargo") - .args(["run", "-p", "hydroflow", "--example"]) + .args(["run", "-p", "dfir_rs", "--example"]) .arg(test_name) .stdin(Stdio::piped()) .stdout(Stdio::piped()) @@ -305,7 +305,7 @@ pub fn run_cargo_example(test_name: &str, args: &str) -> (DroppableChild, ChildS .unwrap() } else { std::process::Command::new("cargo") - .args(["run", "-p", "hydroflow", "--example"]) + .args(["run", "-p", "dfir_rs", "--example"]) .arg(test_name) .arg("--") .args(args.split(' ')) diff --git a/hydroflow/src/util/monotonic.rs b/dfir_rs/src/util/monotonic.rs similarity index 100% rename from hydroflow/src/util/monotonic.rs rename to dfir_rs/src/util/monotonic.rs diff --git a/hydroflow/src/util/monotonic_map.rs b/dfir_rs/src/util/monotonic_map.rs similarity index 100% rename from hydroflow/src/util/monotonic_map.rs rename to dfir_rs/src/util/monotonic_map.rs diff --git a/hydroflow/src/util/multiset.rs b/dfir_rs/src/util/multiset.rs similarity index 100% rename from hydroflow/src/util/multiset.rs rename to dfir_rs/src/util/multiset.rs diff --git a/hydroflow/src/util/simulation.rs b/dfir_rs/src/util/simulation.rs similarity index 100% rename from hydroflow/src/util/simulation.rs rename to dfir_rs/src/util/simulation.rs diff --git a/hydroflow/src/util/socket.rs b/dfir_rs/src/util/socket.rs similarity index 100% rename from hydroflow/src/util/socket.rs rename to dfir_rs/src/util/socket.rs diff --git a/hydroflow/src/util/sparse_vec.rs b/dfir_rs/src/util/sparse_vec.rs similarity index 100% rename from hydroflow/src/util/sparse_vec.rs rename to dfir_rs/src/util/sparse_vec.rs diff --git a/hydroflow/src/util/tcp.rs b/dfir_rs/src/util/tcp.rs similarity index 100% rename from hydroflow/src/util/tcp.rs rename to dfir_rs/src/util/tcp.rs diff --git a/hydroflow/src/util/udp.rs b/dfir_rs/src/util/udp.rs similarity index 100% rename from hydroflow/src/util/udp.rs rename to dfir_rs/src/util/udp.rs diff --git a/hydroflow/src/util/unsync/mod.rs b/dfir_rs/src/util/unsync/mod.rs similarity index 100% rename from hydroflow/src/util/unsync/mod.rs rename to dfir_rs/src/util/unsync/mod.rs diff --git a/hydroflow/src/util/unsync/mpsc.rs b/dfir_rs/src/util/unsync/mpsc.rs similarity index 100% rename from hydroflow/src/util/unsync/mpsc.rs rename to dfir_rs/src/util/unsync/mpsc.rs diff --git a/hydroflow/tests/compile-fail/datalog_badparse.rs b/dfir_rs/tests/compile-fail/datalog_badparse.rs similarity index 91% rename from hydroflow/tests/compile-fail/datalog_badparse.rs rename to dfir_rs/tests/compile-fail/datalog_badparse.rs index 61bc95500e81..1db267bc5362 100644 --- a/hydroflow/tests/compile-fail/datalog_badparse.rs +++ b/dfir_rs/tests/compile-fail/datalog_badparse.rs @@ -1,4 +1,4 @@ -use hydroflow::datalog; +use dfir_rs::datalog; fn main() { let mut df = datalog!(r#" diff --git a/hydroflow/tests/compile-fail/datalog_badparse.stderr b/dfir_rs/tests/compile-fail/datalog_badparse.stderr similarity index 100% rename from hydroflow/tests/compile-fail/datalog_badparse.stderr rename to dfir_rs/tests/compile-fail/datalog_badparse.stderr diff --git a/hydroflow/tests/compile-fail/datalog_filter_badtypes.rs b/dfir_rs/tests/compile-fail/datalog_filter_badtypes.rs similarity index 92% rename from hydroflow/tests/compile-fail/datalog_filter_badtypes.rs rename to dfir_rs/tests/compile-fail/datalog_filter_badtypes.rs index da104da491ac..69e608c4dfa7 100644 --- a/hydroflow/tests/compile-fail/datalog_filter_badtypes.rs +++ b/dfir_rs/tests/compile-fail/datalog_filter_badtypes.rs @@ -1,4 +1,4 @@ -use hydroflow::datalog; +use dfir_rs::datalog; #[derive(Clone, PartialEq, Eq, Hash)] struct Uncomparable; diff --git a/hydroflow/tests/compile-fail/datalog_filter_badtypes.stderr b/dfir_rs/tests/compile-fail/datalog_filter_badtypes.stderr similarity index 100% rename from hydroflow/tests/compile-fail/datalog_filter_badtypes.stderr rename to dfir_rs/tests/compile-fail/datalog_filter_badtypes.stderr diff --git a/hydroflow/tests/compile-fail/datalog_join_badtypes.rs b/dfir_rs/tests/compile-fail/datalog_join_badtypes.rs similarity index 92% rename from hydroflow/tests/compile-fail/datalog_join_badtypes.rs rename to dfir_rs/tests/compile-fail/datalog_join_badtypes.rs index e02cf17de2b8..7a4e49ab43b8 100644 --- a/hydroflow/tests/compile-fail/datalog_join_badtypes.rs +++ b/dfir_rs/tests/compile-fail/datalog_join_badtypes.rs @@ -1,4 +1,4 @@ -use hydroflow::datalog; +use dfir_rs::datalog; fn main() { let mut df = datalog!(r#" diff --git a/hydroflow/tests/compile-fail/datalog_join_badtypes.stderr b/dfir_rs/tests/compile-fail/datalog_join_badtypes.stderr similarity index 100% rename from hydroflow/tests/compile-fail/datalog_join_badtypes.stderr rename to dfir_rs/tests/compile-fail/datalog_join_badtypes.stderr diff --git a/hydroflow/tests/compile-fail/surface_anti_join_badtypes.rs b/dfir_rs/tests/compile-fail/surface_anti_join_badtypes.rs similarity index 89% rename from hydroflow/tests/compile-fail/surface_anti_join_badtypes.rs rename to dfir_rs/tests/compile-fail/surface_anti_join_badtypes.rs index fbe83c139bd9..68771c49be09 100644 --- a/hydroflow/tests/compile-fail/surface_anti_join_badtypes.rs +++ b/dfir_rs/tests/compile-fail/surface_anti_join_badtypes.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_anti_join_badtypes.stderr b/dfir_rs/tests/compile-fail/surface_anti_join_badtypes.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_anti_join_badtypes.stderr rename to dfir_rs/tests/compile-fail/surface_anti_join_badtypes.stderr diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_both.rs b/dfir_rs/tests/compile-fail/surface_badgeneric_both.rs similarity index 85% rename from hydroflow/tests/compile-fail/surface_badgeneric_both.rs rename to dfir_rs/tests/compile-fail/surface_badgeneric_both.rs index e1aae34a4e88..974215ee3623 100644 --- a/hydroflow/tests/compile-fail/surface_badgeneric_both.rs +++ b/dfir_rs/tests/compile-fail/surface_badgeneric_both.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_both.stderr b/dfir_rs/tests/compile-fail/surface_badgeneric_both.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_badgeneric_both.stderr rename to dfir_rs/tests/compile-fail/surface_badgeneric_both.stderr diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_extra.rs b/dfir_rs/tests/compile-fail/surface_badgeneric_extra.rs similarity index 89% rename from hydroflow/tests/compile-fail/surface_badgeneric_extra.rs rename to dfir_rs/tests/compile-fail/surface_badgeneric_extra.rs index 39873842da04..bcb736cf37c4 100644 --- a/hydroflow/tests/compile-fail/surface_badgeneric_extra.rs +++ b/dfir_rs/tests/compile-fail/surface_badgeneric_extra.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_extra.stderr b/dfir_rs/tests/compile-fail/surface_badgeneric_extra.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_badgeneric_extra.stderr rename to dfir_rs/tests/compile-fail/surface_badgeneric_extra.stderr diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_lifetime.rs b/dfir_rs/tests/compile-fail/surface_badgeneric_lifetime.rs similarity index 85% rename from hydroflow/tests/compile-fail/surface_badgeneric_lifetime.rs rename to dfir_rs/tests/compile-fail/surface_badgeneric_lifetime.rs index 67a13b2b2754..30a78ba18a4b 100644 --- a/hydroflow/tests/compile-fail/surface_badgeneric_lifetime.rs +++ b/dfir_rs/tests/compile-fail/surface_badgeneric_lifetime.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_lifetime.stderr b/dfir_rs/tests/compile-fail/surface_badgeneric_lifetime.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_badgeneric_lifetime.stderr rename to dfir_rs/tests/compile-fail/surface_badgeneric_lifetime.stderr diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_nocolon.rs b/dfir_rs/tests/compile-fail/surface_badgeneric_nocolon.rs similarity index 84% rename from hydroflow/tests/compile-fail/surface_badgeneric_nocolon.rs rename to dfir_rs/tests/compile-fail/surface_badgeneric_nocolon.rs index 204f4761f904..0cf4be0fed51 100644 --- a/hydroflow/tests/compile-fail/surface_badgeneric_nocolon.rs +++ b/dfir_rs/tests/compile-fail/surface_badgeneric_nocolon.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_nocolon.stderr b/dfir_rs/tests/compile-fail/surface_badgeneric_nocolon.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_badgeneric_nocolon.stderr rename to dfir_rs/tests/compile-fail/surface_badgeneric_nocolon.stderr diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_type.rs b/dfir_rs/tests/compile-fail/surface_badgeneric_type.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_badgeneric_type.rs rename to dfir_rs/tests/compile-fail/surface_badgeneric_type.rs index 9627ef1eaab9..99046b241d90 100644 --- a/hydroflow/tests/compile-fail/surface_badgeneric_type.rs +++ b/dfir_rs/tests/compile-fail/surface_badgeneric_type.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_badgeneric_type.stderr b/dfir_rs/tests/compile-fail/surface_badgeneric_type.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_badgeneric_type.stderr rename to dfir_rs/tests/compile-fail/surface_badgeneric_type.stderr diff --git a/hydroflow/tests/compile-fail/surface_conflicting_name.rs b/dfir_rs/tests/compile-fail/surface_conflicting_name.rs similarity index 83% rename from hydroflow/tests/compile-fail/surface_conflicting_name.rs rename to dfir_rs/tests/compile-fail/surface_conflicting_name.rs index 8135fb2b0e02..b12f30d7e172 100644 --- a/hydroflow/tests/compile-fail/surface_conflicting_name.rs +++ b/dfir_rs/tests/compile-fail/surface_conflicting_name.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_conflicting_name.stderr b/dfir_rs/tests/compile-fail/surface_conflicting_name.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_conflicting_name.stderr rename to dfir_rs/tests/compile-fail/surface_conflicting_name.stderr diff --git a/hydroflow/tests/compile-fail/surface_degenerate_merge.rs b/dfir_rs/tests/compile-fail/surface_degenerate_merge.rs similarity index 77% rename from hydroflow/tests/compile-fail/surface_degenerate_merge.rs rename to dfir_rs/tests/compile-fail/surface_degenerate_merge.rs index e9ae5ace4b8c..38ce3a4cb725 100644 --- a/hydroflow/tests/compile-fail/surface_degenerate_merge.rs +++ b/dfir_rs/tests/compile-fail/surface_degenerate_merge.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_degenerate_merge.stderr b/dfir_rs/tests/compile-fail/surface_degenerate_merge.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_degenerate_merge.stderr rename to dfir_rs/tests/compile-fail/surface_degenerate_merge.stderr diff --git a/hydroflow/tests/compile-fail/surface_degenerate_null.rs b/dfir_rs/tests/compile-fail/surface_degenerate_null.rs similarity index 86% rename from hydroflow/tests/compile-fail/surface_degenerate_null.rs rename to dfir_rs/tests/compile-fail/surface_degenerate_null.rs index a02a97c516bb..8ea5cc1c2844 100644 --- a/hydroflow/tests/compile-fail/surface_degenerate_null.rs +++ b/dfir_rs/tests/compile-fail/surface_degenerate_null.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; /// Technically this should/could compile, but it is a completely useless edge case. fn main() { diff --git a/hydroflow/tests/compile-fail/surface_degenerate_null.stderr b/dfir_rs/tests/compile-fail/surface_degenerate_null.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_degenerate_null.stderr rename to dfir_rs/tests/compile-fail/surface_degenerate_null.stderr diff --git a/hydroflow/tests/compile-fail/surface_degenerate_tee.rs b/dfir_rs/tests/compile-fail/surface_degenerate_tee.rs similarity index 76% rename from hydroflow/tests/compile-fail/surface_degenerate_tee.rs rename to dfir_rs/tests/compile-fail/surface_degenerate_tee.rs index 428d5dad5c98..8b10290769cb 100644 --- a/hydroflow/tests/compile-fail/surface_degenerate_tee.rs +++ b/dfir_rs/tests/compile-fail/surface_degenerate_tee.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_degenerate_tee.stderr b/dfir_rs/tests/compile-fail/surface_degenerate_tee.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_degenerate_tee.stderr rename to dfir_rs/tests/compile-fail/surface_degenerate_tee.stderr diff --git a/hydroflow/tests/compile-fail/surface_demux_badarg.rs b/dfir_rs/tests/compile-fail/surface_demux_badarg.rs similarity index 91% rename from hydroflow/tests/compile-fail/surface_demux_badarg.rs rename to dfir_rs/tests/compile-fail/surface_demux_badarg.rs index 66855090bc1b..898e96dd801a 100644 --- a/hydroflow/tests/compile-fail/surface_demux_badarg.rs +++ b/dfir_rs/tests/compile-fail/surface_demux_badarg.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_demux_badarg.stderr b/dfir_rs/tests/compile-fail/surface_demux_badarg.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demux_badarg.stderr rename to dfir_rs/tests/compile-fail/surface_demux_badarg.stderr diff --git a/hydroflow/tests/compile-fail/surface_demux_badclosure.rs b/dfir_rs/tests/compile-fail/surface_demux_badclosure.rs similarity index 91% rename from hydroflow/tests/compile-fail/surface_demux_badclosure.rs rename to dfir_rs/tests/compile-fail/surface_demux_badclosure.rs index 53cc194b32a8..001b5366b2e1 100644 --- a/hydroflow/tests/compile-fail/surface_demux_badclosure.rs +++ b/dfir_rs/tests/compile-fail/surface_demux_badclosure.rs @@ -1,4 +1,4 @@ -use hydroflow::{dfir_syntax, var_args}; +use dfir_rs::{dfir_syntax, var_args}; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_demux_badclosure.stderr b/dfir_rs/tests/compile-fail/surface_demux_badclosure.stderr similarity index 77% rename from hydroflow/tests/compile-fail/surface_demux_badclosure.stderr rename to dfir_rs/tests/compile-fail/surface_demux_badclosure.stderr index ca97d8828426..6ac2f4ed23ff 100644 --- a/hydroflow/tests/compile-fail/surface_demux_badclosure.stderr +++ b/dfir_rs/tests/compile-fail/surface_demux_badclosure.stderr @@ -5,9 +5,9 @@ error: Closure provided to `demux(..)` must have two arguments: the first argume | ^^^^^^^^^^^^^^^^^^ warning: unused import: `var_args` - --> tests/compile-fail/surface_demux_badclosure.rs:1:30 + --> tests/compile-fail/surface_demux_badclosure.rs:1:28 | -1 | use hydroflow::{dfir_syntax, var_args}; - | ^^^^^^^^ +1 | use dfir_rs::{dfir_syntax, var_args}; + | ^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default diff --git a/hydroflow/tests/compile-fail/surface_demux_port_duplicate.rs b/dfir_rs/tests/compile-fail/surface_demux_port_duplicate.rs similarity index 92% rename from hydroflow/tests/compile-fail/surface_demux_port_duplicate.rs rename to dfir_rs/tests/compile-fail/surface_demux_port_duplicate.rs index 5711f4e861e5..7d20af3f000c 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_duplicate.rs +++ b/dfir_rs/tests/compile-fail/surface_demux_port_duplicate.rs @@ -1,4 +1,4 @@ -use hydroflow::{dfir_syntax, var_args}; +use dfir_rs::{dfir_syntax, var_args}; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_demux_port_duplicate.stderr b/dfir_rs/tests/compile-fail/surface_demux_port_duplicate.stderr similarity index 80% rename from hydroflow/tests/compile-fail/surface_demux_port_duplicate.stderr rename to dfir_rs/tests/compile-fail/surface_demux_port_duplicate.stderr index e714f2d10425..92e339c216db 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_duplicate.stderr +++ b/dfir_rs/tests/compile-fail/surface_demux_port_duplicate.stderr @@ -11,9 +11,9 @@ error: Output connection conflicts with above ($DIR/tests/compile-fail/surface_d | ^ warning: unused import: `var_args` - --> tests/compile-fail/surface_demux_port_duplicate.rs:1:30 + --> tests/compile-fail/surface_demux_port_duplicate.rs:1:28 | -1 | use hydroflow::{dfir_syntax, var_args}; - | ^^^^^^^^ +1 | use dfir_rs::{dfir_syntax, var_args}; + | ^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default diff --git a/hydroflow/tests/compile-fail/surface_demux_port_elided.rs b/dfir_rs/tests/compile-fail/surface_demux_port_elided.rs similarity index 91% rename from hydroflow/tests/compile-fail/surface_demux_port_elided.rs rename to dfir_rs/tests/compile-fail/surface_demux_port_elided.rs index 8dad86fae063..77e3124450d1 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_elided.rs +++ b/dfir_rs/tests/compile-fail/surface_demux_port_elided.rs @@ -1,4 +1,4 @@ -use hydroflow::{dfir_syntax, var_args}; +use dfir_rs::{dfir_syntax, var_args}; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_demux_port_elided.stderr b/dfir_rs/tests/compile-fail/surface_demux_port_elided.stderr similarity index 81% rename from hydroflow/tests/compile-fail/surface_demux_port_elided.stderr rename to dfir_rs/tests/compile-fail/surface_demux_port_elided.stderr index 456d66c9812d..4b6a56d5b06d 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_elided.stderr +++ b/dfir_rs/tests/compile-fail/surface_demux_port_elided.stderr @@ -11,9 +11,9 @@ error: `demux(..)` closure argument `odds` missing corresponding output port. | ^^^^ warning: unused import: `var_args` - --> tests/compile-fail/surface_demux_port_elided.rs:1:30 + --> tests/compile-fail/surface_demux_port_elided.rs:1:28 | -1 | use hydroflow::{dfir_syntax, var_args}; - | ^^^^^^^^ +1 | use dfir_rs::{dfir_syntax, var_args}; + | ^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default diff --git a/hydroflow/tests/compile-fail/surface_demux_port_extra.rs b/dfir_rs/tests/compile-fail/surface_demux_port_extra.rs similarity index 92% rename from hydroflow/tests/compile-fail/surface_demux_port_extra.rs rename to dfir_rs/tests/compile-fail/surface_demux_port_extra.rs index ebfd9ac5cb85..40367966cfe3 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_extra.rs +++ b/dfir_rs/tests/compile-fail/surface_demux_port_extra.rs @@ -1,4 +1,4 @@ -use hydroflow::{dfir_syntax, var_args}; +use dfir_rs::{dfir_syntax, var_args}; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_demux_port_extra.stderr b/dfir_rs/tests/compile-fail/surface_demux_port_extra.stderr similarity index 84% rename from hydroflow/tests/compile-fail/surface_demux_port_extra.stderr rename to dfir_rs/tests/compile-fail/surface_demux_port_extra.stderr index 02569577b99a..a49e729ec2fe 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_extra.stderr +++ b/dfir_rs/tests/compile-fail/surface_demux_port_extra.stderr @@ -11,9 +11,9 @@ error: Port `d` not found in the arguments specified in `demux(..)`'s closure: ( | ^ warning: unused import: `var_args` - --> tests/compile-fail/surface_demux_port_extra.rs:1:30 + --> tests/compile-fail/surface_demux_port_extra.rs:1:28 | -1 | use hydroflow::{dfir_syntax, var_args}; - | ^^^^^^^^ +1 | use dfir_rs::{dfir_syntax, var_args}; + | ^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default diff --git a/hydroflow/tests/compile-fail/surface_demux_port_extramissing.rs b/dfir_rs/tests/compile-fail/surface_demux_port_extramissing.rs similarity index 92% rename from hydroflow/tests/compile-fail/surface_demux_port_extramissing.rs rename to dfir_rs/tests/compile-fail/surface_demux_port_extramissing.rs index f97cd81363aa..05f6ff4eb7cf 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_extramissing.rs +++ b/dfir_rs/tests/compile-fail/surface_demux_port_extramissing.rs @@ -1,4 +1,4 @@ -use hydroflow::{dfir_syntax, var_args}; +use dfir_rs::{dfir_syntax, var_args}; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_demux_port_extramissing.stderr b/dfir_rs/tests/compile-fail/surface_demux_port_extramissing.stderr similarity index 87% rename from hydroflow/tests/compile-fail/surface_demux_port_extramissing.stderr rename to dfir_rs/tests/compile-fail/surface_demux_port_extramissing.stderr index 8d576f4b7c74..6aa6bc50face 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_extramissing.stderr +++ b/dfir_rs/tests/compile-fail/surface_demux_port_extramissing.stderr @@ -17,9 +17,9 @@ error: `demux(..)` closure argument `a` missing corresponding output port. | ^ warning: unused import: `var_args` - --> tests/compile-fail/surface_demux_port_extramissing.rs:1:30 + --> tests/compile-fail/surface_demux_port_extramissing.rs:1:28 | -1 | use hydroflow::{dfir_syntax, var_args}; - | ^^^^^^^^ +1 | use dfir_rs::{dfir_syntax, var_args}; + | ^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default diff --git a/hydroflow/tests/compile-fail/surface_demux_port_missing.rs b/dfir_rs/tests/compile-fail/surface_demux_port_missing.rs similarity index 91% rename from hydroflow/tests/compile-fail/surface_demux_port_missing.rs rename to dfir_rs/tests/compile-fail/surface_demux_port_missing.rs index 0eeef03a51b7..2f44fb87e849 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_missing.rs +++ b/dfir_rs/tests/compile-fail/surface_demux_port_missing.rs @@ -1,4 +1,4 @@ -use hydroflow::{dfir_syntax, var_args}; +use dfir_rs::{dfir_syntax, var_args}; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_demux_port_missing.stderr b/dfir_rs/tests/compile-fail/surface_demux_port_missing.stderr similarity index 72% rename from hydroflow/tests/compile-fail/surface_demux_port_missing.stderr rename to dfir_rs/tests/compile-fail/surface_demux_port_missing.stderr index cbc7021f6eef..68be99a8d2bb 100644 --- a/hydroflow/tests/compile-fail/surface_demux_port_missing.stderr +++ b/dfir_rs/tests/compile-fail/surface_demux_port_missing.stderr @@ -5,9 +5,9 @@ error: `demux(..)` closure argument `c` missing corresponding output port. | ^ warning: unused import: `var_args` - --> tests/compile-fail/surface_demux_port_missing.rs:1:30 + --> tests/compile-fail/surface_demux_port_missing.rs:1:28 | -1 | use hydroflow::{dfir_syntax, var_args}; - | ^^^^^^^^ +1 | use dfir_rs::{dfir_syntax, var_args}; + | ^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_missingtypeparam.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_missingtypeparam.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_demuxenum_missingtypeparam.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_missingtypeparam.rs index 9632cae3f340..819ab6d66735 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_missingtypeparam.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_missingtypeparam.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_missingtypeparam.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_missingtypeparam.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_missingtypeparam.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_missingtypeparam.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_notenum.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_notenum.rs similarity index 94% rename from hydroflow/tests/compile-fail/surface_demuxenum_notenum.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_notenum.rs index dd0e2cd7943a..e44c4fac79af 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_notenum.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_notenum.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { struct Shape { diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_notenum.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_notenum.stderr similarity index 98% rename from hydroflow/tests/compile-fail/surface_demuxenum_notenum.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_notenum.stderr index be5512428e64..08694f796d87 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_notenum.stderr +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_notenum.stderr @@ -4,7 +4,7 @@ error[E0277]: the trait bound `Shape: DemuxEnumBase` is not satisfied 12 | ]) -> demux_enum::(); | ^^^^^ the trait `DemuxEnumBase` is not implemented for `Shape` | - = note: use `#[derive(hydroflow::DemuxEnum)]` + = note: use `#[derive(dfir_rs::DemuxEnum)]` note: required by a bound in `check_impl_demux_enum` --> tests/compile-fail/surface_demuxenum_notenum.rs:12:28 | diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate.rs similarity index 89% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate.rs index 19321d419ad8..2be0863f871f 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate_one.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate_one.rs similarity index 83% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate_one.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate_one.rs index 93c40fd491af..b0c071fa6780 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate_one.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate_one.rs @@ -1,5 +1,5 @@ -use hydroflow::dfir_syntax; -use hydroflow::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate_one.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate_one.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_duplicate_one.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_duplicate_one.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_elided.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_port_elided.rs similarity index 89% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_elided.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_elided.rs index 6905a8eebc62..380d9861922f 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_port_elided.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_port_elided.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_elided.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_port_elided.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_elided.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_elided.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_extra.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_port_extra.rs similarity index 89% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_extra.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_extra.rs index 0dc82ade7f81..ec1a2bcbc6d5 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_port_extra.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_port_extra.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_extra.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_port_extra.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_extra.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_extra.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_extra_zero.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_port_extra_zero.rs similarity index 77% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_extra_zero.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_extra_zero.rs index b6b06c2de48d..080097d569f5 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_port_extra_zero.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_port_extra_zero.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_extra_zero.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_port_extra_zero.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_extra_zero.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_extra_zero.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_extramissing.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_port_extramissing.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_extramissing.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_extramissing.rs index 9842b2a863a1..af834bc5dd12 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_port_extramissing.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_port_extramissing.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_extramissing.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_port_extramissing.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_extramissing.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_extramissing.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_missing.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_port_missing.rs similarity index 87% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_missing.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_missing.rs index e6679a604766..af470a4cc327 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_port_missing.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_port_missing.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_missing.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_port_missing.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_missing.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_missing.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_missing_one.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_port_missing_one.rs similarity index 84% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_missing_one.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_missing_one.rs index f4e3e1b015fc..cc7ff3b52b13 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_port_missing_one.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_port_missing_one.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_missing_one.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_port_missing_one.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_missing_one.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_missing_one.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_wrong_one.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_port_wrong_one.rs similarity index 80% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_wrong_one.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_wrong_one.rs index 0947e8ed5161..523ace6f39d2 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_port_wrong_one.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_port_wrong_one.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_port_wrong_one.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_port_wrong_one.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_port_wrong_one.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_port_wrong_one.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_wrongenum.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongenum.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_demuxenum_wrongenum.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_wrongenum.rs index 864b820d6e85..1bd5e3a358a1 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_wrongenum.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongenum.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_wrongenum.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongenum.stderr similarity index 98% rename from hydroflow/tests/compile-fail/surface_demuxenum_wrongenum.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_wrongenum.stderr index 6758b9f894e4..5e35f99ef85a 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_wrongenum.stderr +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongenum.stderr @@ -4,7 +4,7 @@ error[E0277]: the trait bound `std::option::Option<()>: DemuxEnumBase` is not sa 17 | ]) -> demux_enum::>(); | ^^^^^^^^^^ the trait `DemuxEnumBase` is not implemented for `std::option::Option<()>` | - = note: use `#[derive(hydroflow::DemuxEnum)]` + = note: use `#[derive(dfir_rs::DemuxEnum)]` = help: the trait `DemuxEnumBase` is implemented for `Shape` note: required by a bound in `check_impl_demux_enum` --> tests/compile-fail/surface_demuxenum_wrongenum.rs:17:28 diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_1.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_1.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_1.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_1.rs index 6a673418dacd..0e284bcd1a24 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_1.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_1.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_1.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_1.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_1.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_1.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_2.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_2.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_2.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_2.rs index e2428cff96b6..057953980de9 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_2.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_2.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_2.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_2.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_wrongfields_2.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_wrongfields_2.stderr diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_wrongtype.rs b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongtype.rs similarity index 85% rename from hydroflow/tests/compile-fail/surface_demuxenum_wrongtype.rs rename to dfir_rs/tests/compile-fail/surface_demuxenum_wrongtype.rs index 58b06d8f3272..c18b573a77c7 100644 --- a/hydroflow/tests/compile-fail/surface_demuxenum_wrongtype.rs +++ b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongtype.rs @@ -1,5 +1,5 @@ -use hydroflow::util::demux_enum::DemuxEnum; -use hydroflow::dfir_syntax; +use dfir_rs::util::demux_enum::DemuxEnum; +use dfir_rs::dfir_syntax; fn main() { #[derive(DemuxEnum)] diff --git a/hydroflow/tests/compile-fail/surface_demuxenum_wrongtype.stderr b/dfir_rs/tests/compile-fail/surface_demuxenum_wrongtype.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_demuxenum_wrongtype.stderr rename to dfir_rs/tests/compile-fail/surface_demuxenum_wrongtype.stderr diff --git a/hydroflow/tests/compile-fail/surface_dest_sink_baditem.ci.stderr b/dfir_rs/tests/compile-fail/surface_dest_sink_baditem.ci.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_dest_sink_baditem.ci.stderr rename to dfir_rs/tests/compile-fail/surface_dest_sink_baditem.ci.stderr diff --git a/hydroflow/tests/compile-fail/surface_dest_sink_baditem.rs.ignore b/dfir_rs/tests/compile-fail/surface_dest_sink_baditem.rs.ignore similarity index 82% rename from hydroflow/tests/compile-fail/surface_dest_sink_baditem.rs.ignore rename to dfir_rs/tests/compile-fail/surface_dest_sink_baditem.rs.ignore index 42aa586b9f3d..77c384ef95ea 100644 --- a/hydroflow/tests/compile-fail/surface_dest_sink_baditem.rs.ignore +++ b/dfir_rs/tests/compile-fail/surface_dest_sink_baditem.rs.ignore @@ -1,9 +1,9 @@ use std::net::{Ipv4Addr, SocketAddr}; -use hydroflow::dfir_syntax; -use hydroflow::util::bind_udp_bytes; +use dfir_rs::dfir_syntax; +use dfir_rs::util::bind_udp_bytes; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let socket_addr: SocketAddr = (Ipv4Addr::LOCALHOST, 0).into(); let (outbound, _inbound, _) = bind_udp_bytes(socket_addr).await; diff --git a/hydroflow/tests/compile-fail/surface_dest_sink_baditem.stderr b/dfir_rs/tests/compile-fail/surface_dest_sink_baditem.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_dest_sink_baditem.stderr rename to dfir_rs/tests/compile-fail/surface_dest_sink_baditem.stderr diff --git a/hydroflow/tests/compile-fail/surface_dest_sink_badsink.rs.ignore b/dfir_rs/tests/compile-fail/surface_dest_sink_badsink.rs.ignore similarity index 84% rename from hydroflow/tests/compile-fail/surface_dest_sink_badsink.rs.ignore rename to dfir_rs/tests/compile-fail/surface_dest_sink_badsink.rs.ignore index fe96cdba060d..31c8c2eb7ae8 100644 --- a/hydroflow/tests/compile-fail/surface_dest_sink_badsink.rs.ignore +++ b/dfir_rs/tests/compile-fail/surface_dest_sink_badsink.rs.ignore @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let sink = "not a sink"; diff --git a/dfir_rs/tests/compile-fail/surface_dest_sink_badsink.stderr b/dfir_rs/tests/compile-fail/surface_dest_sink_badsink.stderr new file mode 100644 index 000000000000..b43017eb5428 --- /dev/null +++ b/dfir_rs/tests/compile-fail/surface_dest_sink_badsink.stderr @@ -0,0 +1,28 @@ +error[E0277]: the trait bound `&str: dfir_rs::futures::Sink<_>` is not satisfied + --> tests/compile-fail/surface_dest_sink_badsink.rs:6:41 + | +6 | source_iter(0..10) -> dest_sink(sink); + | ----------^^^^- + | | | + | | the trait `dfir_rs::futures::Sink<_>` is not implemented for `&str` + | required by a bound introduced by this call + | + = help: the following other types implement trait `dfir_rs::futures::Sink`: + <&dfir_rs::futures::futures_channel::mpsc::UnboundedSender as dfir_rs::futures::Sink> + <&mut S as dfir_rs::futures::Sink> + as dfir_rs::futures::Sink> + as dfir_rs::futures::Sink> + as dfir_rs::futures::Sink> + as dfir_rs::futures::Sink<(u32, T)>> + as dfir_rs::futures::Sink> + as dfir_rs::futures::Sink<_Item>> + and $N others +note: required by a bound in `sink_feed_flush` + --> tests/compile-fail/surface_dest_sink_badsink.rs:5:18 + | +5 | let mut df = dfir_syntax! { + | __________________^ +6 | | source_iter(0..10) -> dest_sink(sink); +7 | | }; + | |_____^ required by this bound in `sink_feed_flush` + = note: this error originates in the macro `dfir_syntax` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/hydroflow/tests/compile-fail/surface_fold_keyed_badtype_int.rs b/dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_int.rs similarity index 81% rename from hydroflow/tests/compile-fail/surface_fold_keyed_badtype_int.rs rename to dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_int.rs index b8f19068e7ba..767a59d6e8f0 100644 --- a/hydroflow/tests/compile-fail/surface_fold_keyed_badtype_int.rs +++ b/dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_int.rs @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_iter(0..1) -> reduce_keyed(|old: &mut u32, val: u32| { *old += val; }) -> for_each(std::mem::drop); diff --git a/hydroflow/tests/compile-fail/surface_fold_keyed_badtype_int.stderr b/dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_int.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_fold_keyed_badtype_int.stderr rename to dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_int.stderr diff --git a/hydroflow/tests/compile-fail/surface_fold_keyed_badtype_option.rs b/dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_option.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_fold_keyed_badtype_option.rs rename to dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_option.rs index 854ec73a3f08..b453aaf70dc7 100644 --- a/hydroflow/tests/compile-fail/surface_fold_keyed_badtype_option.rs +++ b/dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_option.rs @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_iter([ Some(5), None, Some(12) ]) -> reduce_keyed(|old: &mut u32, val: u32| { *old += val; }) -> for_each(std::mem::drop); diff --git a/hydroflow/tests/compile-fail/surface_fold_keyed_badtype_option.stderr b/dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_option.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_fold_keyed_badtype_option.stderr rename to dfir_rs/tests/compile-fail/surface_fold_keyed_badtype_option.stderr diff --git a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_bad.ci.stderr b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_bad.ci.stderr similarity index 95% rename from hydroflow/tests/compile-fail/surface_fold_keyed_generics_bad.ci.stderr rename to dfir_rs/tests/compile-fail/surface_fold_keyed_generics_bad.ci.stderr index 8ed7f2cfa054..ab43386175a1 100644 --- a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_bad.ci.stderr +++ b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_bad.ci.stderr @@ -1,7 +1,7 @@ -warning: unused import: `hydroflow::dfir_syntax` +warning: unused import: `dfir_rs::dfir_syntax` --> tests/compile-fail/surface_fold_keyed_generics_bad.rs:1:5 | -1 |use hydroflow::dfir_syntax; +1 |use dfir_rs::dfir_syntax; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default diff --git a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_bad.rs.ignore b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_bad.rs.ignore similarity index 86% rename from hydroflow/tests/compile-fail/surface_fold_keyed_generics_bad.rs.ignore rename to dfir_rs/tests/compile-fail/surface_fold_keyed_generics_bad.rs.ignore index 63913ef21d9e..b3cd3c5c002f 100644 --- a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_bad.rs.ignore +++ b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_bad.rs.ignore @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_iter(["hello", "world"]) -> fold_keyed::<'tick, &str, usize>(String::new, |old: &mut _, val| { *old += val; diff --git a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_bad.stderr b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_bad.stderr similarity index 96% rename from hydroflow/tests/compile-fail/surface_fold_keyed_generics_bad.stderr rename to dfir_rs/tests/compile-fail/surface_fold_keyed_generics_bad.stderr index f1e085ac4c70..31c9b04a96a2 100644 --- a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_bad.stderr +++ b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_bad.stderr @@ -1,7 +1,7 @@ -warning: unused import: `hydroflow::dfir_syntax` +warning: unused import: `dfir_rs::dfir_syntax` --> tests/compile-fail/surface_fold_keyed_generics_bad.rs:1:5 | -1 |use hydroflow::dfir_syntax; +1 |use dfir_rs::dfir_syntax; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default diff --git a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_extra.rs b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_extra.rs similarity index 81% rename from hydroflow/tests/compile-fail/surface_fold_keyed_generics_extra.rs rename to dfir_rs/tests/compile-fail/surface_fold_keyed_generics_extra.rs index 09893be7694c..feff9439c519 100644 --- a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_extra.rs +++ b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_extra.rs @@ -1,7 +1,7 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_iter(["hello", "world"]) -> fold_keyed::<'tick, &str, String, ()>(String::new, |old: &mut _, val| { *old += val; diff --git a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_extra.stderr b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_extra.stderr similarity index 79% rename from hydroflow/tests/compile-fail/surface_fold_keyed_generics_extra.stderr rename to dfir_rs/tests/compile-fail/surface_fold_keyed_generics_extra.stderr index 8e663f8f32f9..e70911a9b346 100644 --- a/hydroflow/tests/compile-fail/surface_fold_keyed_generics_extra.stderr +++ b/dfir_rs/tests/compile-fail/surface_fold_keyed_generics_extra.stderr @@ -4,10 +4,10 @@ error: `fold_keyed` should have at least 0 and at most 2 generic type arguments, 6 | -> fold_keyed::<'tick, &str, String, ()>(String::new, |old: &mut _, val| { | ^^^^^^^^^^^^^^^^^^^^^^^ -warning: unused import: `hydroflow::dfir_syntax` +warning: unused import: `dfir_rs::dfir_syntax` --> tests/compile-fail/surface_fold_keyed_generics_extra.rs:1:5 | -1 | use hydroflow::dfir_syntax; - | ^^^^^^^^^^^^^^^^^^^^^^ +1 | use dfir_rs::dfir_syntax; + | ^^^^^^^^^^^^^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default diff --git a/hydroflow/tests/compile-fail/surface_forwardref_chain_double.rs b/dfir_rs/tests/compile-fail/surface_forwardref_chain_double.rs similarity index 90% rename from hydroflow/tests/compile-fail/surface_forwardref_chain_double.rs rename to dfir_rs/tests/compile-fail/surface_forwardref_chain_double.rs index 0394ecb07fe3..a161e060ab5c 100644 --- a/hydroflow/tests/compile-fail/surface_forwardref_chain_double.rs +++ b/dfir_rs/tests/compile-fail/surface_forwardref_chain_double.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_forwardref_chain_double.stderr b/dfir_rs/tests/compile-fail/surface_forwardref_chain_double.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_forwardref_chain_double.stderr rename to dfir_rs/tests/compile-fail/surface_forwardref_chain_double.stderr diff --git a/hydroflow/tests/compile-fail/surface_forwardref_chain_single.rs b/dfir_rs/tests/compile-fail/surface_forwardref_chain_single.rs similarity index 89% rename from hydroflow/tests/compile-fail/surface_forwardref_chain_single.rs rename to dfir_rs/tests/compile-fail/surface_forwardref_chain_single.rs index ba2d26d51e3a..9c93e014ae08 100644 --- a/hydroflow/tests/compile-fail/surface_forwardref_chain_single.rs +++ b/dfir_rs/tests/compile-fail/surface_forwardref_chain_single.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_forwardref_chain_single.stderr b/dfir_rs/tests/compile-fail/surface_forwardref_chain_single.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_forwardref_chain_single.stderr rename to dfir_rs/tests/compile-fail/surface_forwardref_chain_single.stderr diff --git a/hydroflow/tests/compile-fail/surface_forwardref_self1.rs b/dfir_rs/tests/compile-fail/surface_forwardref_self1.rs similarity index 77% rename from hydroflow/tests/compile-fail/surface_forwardref_self1.rs rename to dfir_rs/tests/compile-fail/surface_forwardref_self1.rs index 1bc374448a95..464d5ac286ff 100644 --- a/hydroflow/tests/compile-fail/surface_forwardref_self1.rs +++ b/dfir_rs/tests/compile-fail/surface_forwardref_self1.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_forwardref_self1.stderr b/dfir_rs/tests/compile-fail/surface_forwardref_self1.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_forwardref_self1.stderr rename to dfir_rs/tests/compile-fail/surface_forwardref_self1.stderr diff --git a/hydroflow/tests/compile-fail/surface_forwardref_self2.rs b/dfir_rs/tests/compile-fail/surface_forwardref_self2.rs similarity index 80% rename from hydroflow/tests/compile-fail/surface_forwardref_self2.rs rename to dfir_rs/tests/compile-fail/surface_forwardref_self2.rs index c921aca66a66..4aa9021d5aa6 100644 --- a/hydroflow/tests/compile-fail/surface_forwardref_self2.rs +++ b/dfir_rs/tests/compile-fail/surface_forwardref_self2.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_forwardref_self2.stderr b/dfir_rs/tests/compile-fail/surface_forwardref_self2.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_forwardref_self2.stderr rename to dfir_rs/tests/compile-fail/surface_forwardref_self2.stderr diff --git a/hydroflow/tests/compile-fail/surface_forwardref_self2_indirect.rs b/dfir_rs/tests/compile-fail/surface_forwardref_self2_indirect.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_forwardref_self2_indirect.rs rename to dfir_rs/tests/compile-fail/surface_forwardref_self2_indirect.rs index 213ee2d12acd..ea45af994f07 100644 --- a/hydroflow/tests/compile-fail/surface_forwardref_self2_indirect.rs +++ b/dfir_rs/tests/compile-fail/surface_forwardref_self2_indirect.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_forwardref_self2_indirect.stderr b/dfir_rs/tests/compile-fail/surface_forwardref_self2_indirect.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_forwardref_self2_indirect.stderr rename to dfir_rs/tests/compile-fail/surface_forwardref_self2_indirect.stderr diff --git a/hydroflow/tests/compile-fail/surface_forwardref_self3.rs b/dfir_rs/tests/compile-fail/surface_forwardref_self3.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_forwardref_self3.rs rename to dfir_rs/tests/compile-fail/surface_forwardref_self3.rs index 7f0f34003d65..318149c64ed5 100644 --- a/hydroflow/tests/compile-fail/surface_forwardref_self3.rs +++ b/dfir_rs/tests/compile-fail/surface_forwardref_self3.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_forwardref_self3.stderr b/dfir_rs/tests/compile-fail/surface_forwardref_self3.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_forwardref_self3.stderr rename to dfir_rs/tests/compile-fail/surface_forwardref_self3.stderr diff --git a/hydroflow/tests/compile-fail/surface_identity_wronggeneric.rs b/dfir_rs/tests/compile-fail/surface_identity_wronggeneric.rs similarity index 84% rename from hydroflow/tests/compile-fail/surface_identity_wronggeneric.rs rename to dfir_rs/tests/compile-fail/surface_identity_wronggeneric.rs index 4de2fb7bef0e..729cf26868b3 100644 --- a/hydroflow/tests/compile-fail/surface_identity_wronggeneric.rs +++ b/dfir_rs/tests/compile-fail/surface_identity_wronggeneric.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_identity_wronggeneric.stderr b/dfir_rs/tests/compile-fail/surface_identity_wronggeneric.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_identity_wronggeneric.stderr rename to dfir_rs/tests/compile-fail/surface_identity_wronggeneric.stderr diff --git a/hydroflow/tests/compile-fail/surface_join_badtypes.rs b/dfir_rs/tests/compile-fail/surface_join_badtypes.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_join_badtypes.rs rename to dfir_rs/tests/compile-fail/surface_join_badtypes.rs index d64ced9b19d1..dba802fe207c 100644 --- a/hydroflow/tests/compile-fail/surface_join_badtypes.rs +++ b/dfir_rs/tests/compile-fail/surface_join_badtypes.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_join_badtypes.stderr b/dfir_rs/tests/compile-fail/surface_join_badtypes.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_join_badtypes.stderr rename to dfir_rs/tests/compile-fail/surface_join_badtypes.stderr diff --git a/hydroflow/tests/compile-fail/surface_join_generics_extra.rs b/dfir_rs/tests/compile-fail/surface_join_generics_extra.rs similarity index 90% rename from hydroflow/tests/compile-fail/surface_join_generics_extra.rs rename to dfir_rs/tests/compile-fail/surface_join_generics_extra.rs index a81c883f098c..8c5c325eca56 100644 --- a/hydroflow/tests/compile-fail/surface_join_generics_extra.rs +++ b/dfir_rs/tests/compile-fail/surface_join_generics_extra.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_join_generics_extra.stderr b/dfir_rs/tests/compile-fail/surface_join_generics_extra.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_join_generics_extra.stderr rename to dfir_rs/tests/compile-fail/surface_join_generics_extra.stderr diff --git a/hydroflow/tests/compile-fail/surface_join_persistence_bad.rs b/dfir_rs/tests/compile-fail/surface_join_persistence_bad.rs similarity index 89% rename from hydroflow/tests/compile-fail/surface_join_persistence_bad.rs rename to dfir_rs/tests/compile-fail/surface_join_persistence_bad.rs index 8e1b2e51d7ef..45eebd22d61c 100644 --- a/hydroflow/tests/compile-fail/surface_join_persistence_bad.rs +++ b/dfir_rs/tests/compile-fail/surface_join_persistence_bad.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_join_persistence_bad.stderr b/dfir_rs/tests/compile-fail/surface_join_persistence_bad.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_join_persistence_bad.stderr rename to dfir_rs/tests/compile-fail/surface_join_persistence_bad.stderr diff --git a/hydroflow/tests/compile-fail/surface_join_persistence_extra.rs b/dfir_rs/tests/compile-fail/surface_join_persistence_extra.rs similarity index 90% rename from hydroflow/tests/compile-fail/surface_join_persistence_extra.rs rename to dfir_rs/tests/compile-fail/surface_join_persistence_extra.rs index 9c7f3ca603e9..246e33e25d06 100644 --- a/hydroflow/tests/compile-fail/surface_join_persistence_extra.rs +++ b/dfir_rs/tests/compile-fail/surface_join_persistence_extra.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_join_persistence_extra.stderr b/dfir_rs/tests/compile-fail/surface_join_persistence_extra.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_join_persistence_extra.stderr rename to dfir_rs/tests/compile-fail/surface_join_persistence_extra.stderr diff --git a/hydroflow/tests/compile-fail/surface_lattice_fold_badgeneric.rs.ignore b/dfir_rs/tests/compile-fail/surface_lattice_fold_badgeneric.rs.ignore similarity index 89% rename from hydroflow/tests/compile-fail/surface_lattice_fold_badgeneric.rs.ignore rename to dfir_rs/tests/compile-fail/surface_lattice_fold_badgeneric.rs.ignore index eb35f08441f0..edef68d09337 100644 --- a/hydroflow/tests/compile-fail/surface_lattice_fold_badgeneric.rs.ignore +++ b/dfir_rs/tests/compile-fail/surface_lattice_fold_badgeneric.rs.ignore @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_lattice_fold_badgeneric.stderr b/dfir_rs/tests/compile-fail/surface_lattice_fold_badgeneric.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_lattice_fold_badgeneric.stderr rename to dfir_rs/tests/compile-fail/surface_lattice_fold_badgeneric.stderr diff --git a/hydroflow/tests/compile-fail/surface_lattice_fold_noarg.rs b/dfir_rs/tests/compile-fail/surface_lattice_fold_noarg.rs similarity index 61% rename from hydroflow/tests/compile-fail/surface_lattice_fold_noarg.rs rename to dfir_rs/tests/compile-fail/surface_lattice_fold_noarg.rs index ecc40e045cd1..6a964f729e97 100644 --- a/hydroflow/tests/compile-fail/surface_lattice_fold_noarg.rs +++ b/dfir_rs/tests/compile-fail/surface_lattice_fold_noarg.rs @@ -1,9 +1,9 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { source_iter([1,2,3,4,5]) - -> lattice_fold::>() + -> lattice_fold::>() -> for_each(|x| println!("Least upper bound: {:?}", x)); }; df.run_available(); diff --git a/hydroflow/tests/compile-fail/surface_lattice_fold_noarg.stderr b/dfir_rs/tests/compile-fail/surface_lattice_fold_noarg.stderr similarity index 62% rename from hydroflow/tests/compile-fail/surface_lattice_fold_noarg.stderr rename to dfir_rs/tests/compile-fail/surface_lattice_fold_noarg.stderr index c283bc4c724b..44e4fc783a37 100644 --- a/hydroflow/tests/compile-fail/surface_lattice_fold_noarg.stderr +++ b/dfir_rs/tests/compile-fail/surface_lattice_fold_noarg.stderr @@ -1,11 +1,11 @@ error: `lattice_fold` should have exactly 0 generic type arguments, actually has 1. --> tests/compile-fail/surface_lattice_fold_noarg.rs:6:31 | -6 | -> lattice_fold::>() - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +6 | -> lattice_fold::>() + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: expected 1 argument(s), found 0 --> tests/compile-fail/surface_lattice_fold_noarg.rs:6:16 | -6 | -> lattice_fold::>() - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +6 | -> lattice_fold::>() + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/dfir_rs/tests/compile-fail/surface_lattice_fold_wronggeneric.rs b/dfir_rs/tests/compile-fail/surface_lattice_fold_wronggeneric.rs new file mode 100644 index 000000000000..85653594ee5d --- /dev/null +++ b/dfir_rs/tests/compile-fail/surface_lattice_fold_wronggeneric.rs @@ -0,0 +1,10 @@ +use dfir_rs::dfir_syntax; + +fn main() { + let mut df = dfir_syntax! { + source_iter([1,2,3,4,5]) + -> lattice_fold::<'static, dfir_rs::lattices::set_union::SetUnionHashSet>(dfir_rs::lattices::set_union::SetUnionHashSet::::default()) + -> for_each(|x| println!("Least upper bound: {:?}", x)); + }; + df.run_available(); +} diff --git a/hydroflow/tests/compile-fail/surface_lattice_fold_wronggeneric.stderr b/dfir_rs/tests/compile-fail/surface_lattice_fold_wronggeneric.stderr similarity index 56% rename from hydroflow/tests/compile-fail/surface_lattice_fold_wronggeneric.stderr rename to dfir_rs/tests/compile-fail/surface_lattice_fold_wronggeneric.stderr index f9f901aec6df..15d72bb3b68a 100644 --- a/hydroflow/tests/compile-fail/surface_lattice_fold_wronggeneric.stderr +++ b/dfir_rs/tests/compile-fail/surface_lattice_fold_wronggeneric.stderr @@ -1,5 +1,5 @@ error: `lattice_fold` should have exactly 0 generic type arguments, actually has 1. --> tests/compile-fail/surface_lattice_fold_wronggeneric.rs:6:31 | -6 | ... -> lattice_fold::<'static, hydroflow::lattices::set_union::SetUnionHashSet>(hydroflow::lattices::set_union::SetUnionHashSet::<... - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +6 | ... -> lattice_fold::<'static, dfir_rs::lattices::set_union::SetUnionHashSet>(dfir_rs::lattices::set_union::SetUnionHashSet::... + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/hydroflow/tests/compile-fail/surface_lattice_reduce_badgeneric.rs.ignore b/dfir_rs/tests/compile-fail/surface_lattice_reduce_badgeneric.rs.ignore similarity index 89% rename from hydroflow/tests/compile-fail/surface_lattice_reduce_badgeneric.rs.ignore rename to dfir_rs/tests/compile-fail/surface_lattice_reduce_badgeneric.rs.ignore index 7b842cdad15a..7a9bef94d052 100644 --- a/hydroflow/tests/compile-fail/surface_lattice_reduce_badgeneric.rs.ignore +++ b/dfir_rs/tests/compile-fail/surface_lattice_reduce_badgeneric.rs.ignore @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_lattice_reduce_badgeneric.stderr b/dfir_rs/tests/compile-fail/surface_lattice_reduce_badgeneric.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_lattice_reduce_badgeneric.stderr rename to dfir_rs/tests/compile-fail/surface_lattice_reduce_badgeneric.stderr diff --git a/hydroflow/tests/compile-fail/surface_lattice_reduce_wronggeneric.rs b/dfir_rs/tests/compile-fail/surface_lattice_reduce_wronggeneric.rs similarity index 59% rename from hydroflow/tests/compile-fail/surface_lattice_reduce_wronggeneric.rs rename to dfir_rs/tests/compile-fail/surface_lattice_reduce_wronggeneric.rs index c88e29a24d28..1d2f0f5aaafb 100644 --- a/hydroflow/tests/compile-fail/surface_lattice_reduce_wronggeneric.rs +++ b/dfir_rs/tests/compile-fail/surface_lattice_reduce_wronggeneric.rs @@ -1,9 +1,9 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { source_iter([1,2,3,4,5]) - -> lattice_reduce::<'static, hydroflow::lattices::set_union::SetUnionHashSet>() + -> lattice_reduce::<'static, dfir_rs::lattices::set_union::SetUnionHashSet>() -> for_each(|x| println!("Least upper bound: {:?}", x)); }; df.run_available(); diff --git a/hydroflow/tests/compile-fail/surface_lattice_reduce_wronggeneric.stderr b/dfir_rs/tests/compile-fail/surface_lattice_reduce_wronggeneric.stderr similarity index 62% rename from hydroflow/tests/compile-fail/surface_lattice_reduce_wronggeneric.stderr rename to dfir_rs/tests/compile-fail/surface_lattice_reduce_wronggeneric.stderr index a28bbd7dfd82..04629db217ac 100644 --- a/hydroflow/tests/compile-fail/surface_lattice_reduce_wronggeneric.stderr +++ b/dfir_rs/tests/compile-fail/surface_lattice_reduce_wronggeneric.stderr @@ -1,5 +1,5 @@ error: `lattice_reduce` should have exactly 0 generic type arguments, actually has 1. --> tests/compile-fail/surface_lattice_reduce_wronggeneric.rs:6:33 | -6 | -> lattice_reduce::<'static, hydroflow::lattices::set_union::SetUnionHashSet>() - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +6 | -> lattice_reduce::<'static, dfir_rs::lattices::set_union::SetUnionHashSet>() + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/hydroflow/tests/compile-fail/surface_latticereduce_wronggeneric.stderr b/dfir_rs/tests/compile-fail/surface_latticereduce_wronggeneric.stderr similarity index 80% rename from hydroflow/tests/compile-fail/surface_latticereduce_wronggeneric.stderr rename to dfir_rs/tests/compile-fail/surface_latticereduce_wronggeneric.stderr index 714a5d8013ff..48fe8530d565 100644 --- a/hydroflow/tests/compile-fail/surface_latticereduce_wronggeneric.stderr +++ b/dfir_rs/tests/compile-fail/surface_latticereduce_wronggeneric.stderr @@ -3,7 +3,7 @@ error[E0271]: expected `Drain<'_, {integer}>` to be an iterator that yields `Set | 5 | source_iter([1,2,3,4,5]) | ^^^^^^^^^^^^^^^^^^^^^^^^ expected `SetUnion>`, found integer -6 | -> lattice_reduce::<'static, hydroflow::lattices::set_union::SetUnionHashSet>() +6 | -> lattice_reduce::<'static, dfir_rs::lattices::set_union::SetUnionHashSet>() | ---------------------------------------------------- required by a bound introduced by this call | = note: expected struct `SetUnion>` @@ -11,5 +11,5 @@ error[E0271]: expected `Drain<'_, {integer}>` to be an iterator that yields `Set note: required by a bound in `check_inputs` --> tests/compile-fail/surface_lattice_reduce_wronggeneric.rs:6:41 | -6 | -> lattice_reduce::<'static, hydroflow::lattices::set_union::SetUnionHashSet>() +6 | -> lattice_reduce::<'static, dfir_rs::lattices::set_union::SetUnionHashSet>() | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `check_inputs` diff --git a/hydroflow/tests/compile-fail/surface_loop_cycle.rs b/dfir_rs/tests/compile-fail/surface_loop_cycle.rs similarity index 78% rename from hydroflow/tests/compile-fail/surface_loop_cycle.rs rename to dfir_rs/tests/compile-fail/surface_loop_cycle.rs index 247d24656309..81e8f6b9a229 100644 --- a/hydroflow/tests/compile-fail/surface_loop_cycle.rs +++ b/dfir_rs/tests/compile-fail/surface_loop_cycle.rs @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { loop { a = identity() -> identity() -> identity() -> identity(); a -> a; diff --git a/hydroflow/tests/compile-fail/surface_loop_cycle.stderr b/dfir_rs/tests/compile-fail/surface_loop_cycle.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_loop_cycle.stderr rename to dfir_rs/tests/compile-fail/surface_loop_cycle.stderr diff --git a/hydroflow/tests/compile-fail/surface_loop_missing_unwindowing.rs b/dfir_rs/tests/compile-fail/surface_loop_missing_unwindowing.rs similarity index 78% rename from hydroflow/tests/compile-fail/surface_loop_missing_unwindowing.rs rename to dfir_rs/tests/compile-fail/surface_loop_missing_unwindowing.rs index bc71a180223a..f88ba9616755 100644 --- a/hydroflow/tests/compile-fail/surface_loop_missing_unwindowing.rs +++ b/dfir_rs/tests/compile-fail/surface_loop_missing_unwindowing.rs @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { a = source_iter(0..10); loop { b = a -> batch(); diff --git a/hydroflow/tests/compile-fail/surface_loop_missing_unwindowing.stderr b/dfir_rs/tests/compile-fail/surface_loop_missing_unwindowing.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_loop_missing_unwindowing.stderr rename to dfir_rs/tests/compile-fail/surface_loop_missing_unwindowing.stderr diff --git a/hydroflow/tests/compile-fail/surface_loop_missing_windowing.rs b/dfir_rs/tests/compile-fail/surface_loop_missing_windowing.rs similarity index 74% rename from hydroflow/tests/compile-fail/surface_loop_missing_windowing.rs rename to dfir_rs/tests/compile-fail/surface_loop_missing_windowing.rs index 808d192b4154..2794887b5656 100644 --- a/hydroflow/tests/compile-fail/surface_loop_missing_windowing.rs +++ b/dfir_rs/tests/compile-fail/surface_loop_missing_windowing.rs @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { a = source_iter(0..10); loop { a -> null(); diff --git a/hydroflow/tests/compile-fail/surface_loop_missing_windowing.stderr b/dfir_rs/tests/compile-fail/surface_loop_missing_windowing.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_loop_missing_windowing.stderr rename to dfir_rs/tests/compile-fail/surface_loop_missing_windowing.stderr diff --git a/hydroflow/tests/compile-fail/surface_loop_multiple_window.rs b/dfir_rs/tests/compile-fail/surface_loop_multiple_window.rs similarity index 80% rename from hydroflow/tests/compile-fail/surface_loop_multiple_window.rs rename to dfir_rs/tests/compile-fail/surface_loop_multiple_window.rs index 6ae283d4b449..1ee9423253b7 100644 --- a/hydroflow/tests/compile-fail/surface_loop_multiple_window.rs +++ b/dfir_rs/tests/compile-fail/surface_loop_multiple_window.rs @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { a = source_iter(0..10); loop { loop { diff --git a/hydroflow/tests/compile-fail/surface_loop_multiple_window.stderr b/dfir_rs/tests/compile-fail/surface_loop_multiple_window.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_loop_multiple_window.stderr rename to dfir_rs/tests/compile-fail/surface_loop_multiple_window.stderr diff --git a/hydroflow/tests/compile-fail/surface_loop_source.rs b/dfir_rs/tests/compile-fail/surface_loop_source.rs similarity index 72% rename from hydroflow/tests/compile-fail/surface_loop_source.rs rename to dfir_rs/tests/compile-fail/surface_loop_source.rs index e7ee4467d99c..b4c94b11eae1 100644 --- a/hydroflow/tests/compile-fail/surface_loop_source.rs +++ b/dfir_rs/tests/compile-fail/surface_loop_source.rs @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { loop { source_iter(0..10) -> null(); } diff --git a/hydroflow/tests/compile-fail/surface_loop_source.stderr b/dfir_rs/tests/compile-fail/surface_loop_source.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_loop_source.stderr rename to dfir_rs/tests/compile-fail/surface_loop_source.stderr diff --git a/hydroflow/tests/compile-fail/surface_map_badtypes.rs b/dfir_rs/tests/compile-fail/surface_map_badtypes.rs similarity index 84% rename from hydroflow/tests/compile-fail/surface_map_badtypes.rs rename to dfir_rs/tests/compile-fail/surface_map_badtypes.rs index 7886d454b305..4a337fa068f9 100644 --- a/hydroflow/tests/compile-fail/surface_map_badtypes.rs +++ b/dfir_rs/tests/compile-fail/surface_map_badtypes.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_map_badtypes.stderr b/dfir_rs/tests/compile-fail/surface_map_badtypes.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_map_badtypes.stderr rename to dfir_rs/tests/compile-fail/surface_map_badtypes.stderr diff --git a/hydroflow/tests/compile-fail/surface_merge_badtypes.rs b/dfir_rs/tests/compile-fail/surface_merge_badtypes.rs similarity index 87% rename from hydroflow/tests/compile-fail/surface_merge_badtypes.rs rename to dfir_rs/tests/compile-fail/surface_merge_badtypes.rs index 9e48170f28f3..c5d1553a1c91 100644 --- a/hydroflow/tests/compile-fail/surface_merge_badtypes.rs +++ b/dfir_rs/tests/compile-fail/surface_merge_badtypes.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_merge_badtypes.stderr b/dfir_rs/tests/compile-fail/surface_merge_badtypes.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_merge_badtypes.stderr rename to dfir_rs/tests/compile-fail/surface_merge_badtypes.stderr diff --git a/hydroflow/tests/compile-fail/surface_missing_args.rs b/dfir_rs/tests/compile-fail/surface_missing_args.rs similarity index 80% rename from hydroflow/tests/compile-fail/surface_missing_args.rs rename to dfir_rs/tests/compile-fail/surface_missing_args.rs index f48502b9b69e..f390d807fed7 100644 --- a/hydroflow/tests/compile-fail/surface_missing_args.rs +++ b/dfir_rs/tests/compile-fail/surface_missing_args.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_missing_args.stderr b/dfir_rs/tests/compile-fail/surface_missing_args.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_missing_args.stderr rename to dfir_rs/tests/compile-fail/surface_missing_args.stderr diff --git a/hydroflow/tests/compile-fail/surface_negative_loop.rs b/dfir_rs/tests/compile-fail/surface_negative_loop.rs similarity index 86% rename from hydroflow/tests/compile-fail/surface_negative_loop.rs rename to dfir_rs/tests/compile-fail/surface_negative_loop.rs index 8be5c04e9eab..012468c732d8 100644 --- a/hydroflow/tests/compile-fail/surface_negative_loop.rs +++ b/dfir_rs/tests/compile-fail/surface_negative_loop.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_negative_loop.stderr b/dfir_rs/tests/compile-fail/surface_negative_loop.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_negative_loop.stderr rename to dfir_rs/tests/compile-fail/surface_negative_loop.stderr diff --git a/hydroflow/tests/compile-fail/surface_null.rs b/dfir_rs/tests/compile-fail/surface_null.rs similarity index 77% rename from hydroflow/tests/compile-fail/surface_null.rs rename to dfir_rs/tests/compile-fail/surface_null.rs index bc3eec041faf..21d2da868e9a 100644 --- a/hydroflow/tests/compile-fail/surface_null.rs +++ b/dfir_rs/tests/compile-fail/surface_null.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_null.stderr b/dfir_rs/tests/compile-fail/surface_null.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_null.stderr rename to dfir_rs/tests/compile-fail/surface_null.stderr diff --git a/hydroflow/tests/compile-fail/surface_partition_badarg.rs b/dfir_rs/tests/compile-fail/surface_partition_badarg.rs similarity index 91% rename from hydroflow/tests/compile-fail/surface_partition_badarg.rs rename to dfir_rs/tests/compile-fail/surface_partition_badarg.rs index f0f18e869297..ccf8348f9112 100644 --- a/hydroflow/tests/compile-fail/surface_partition_badarg.rs +++ b/dfir_rs/tests/compile-fail/surface_partition_badarg.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_partition_badarg.stderr b/dfir_rs/tests/compile-fail/surface_partition_badarg.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_partition_badarg.stderr rename to dfir_rs/tests/compile-fail/surface_partition_badarg.stderr diff --git a/hydroflow/tests/compile-fail/surface_partition_badclosure.rs b/dfir_rs/tests/compile-fail/surface_partition_badclosure.rs similarity index 93% rename from hydroflow/tests/compile-fail/surface_partition_badclosure.rs rename to dfir_rs/tests/compile-fail/surface_partition_badclosure.rs index 57e03d6d7b19..d7f2569ad922 100644 --- a/hydroflow/tests/compile-fail/surface_partition_badclosure.rs +++ b/dfir_rs/tests/compile-fail/surface_partition_badclosure.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_partition_badclosure.stderr b/dfir_rs/tests/compile-fail/surface_partition_badclosure.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_partition_badclosure.stderr rename to dfir_rs/tests/compile-fail/surface_partition_badclosure.stderr diff --git a/hydroflow/tests/compile-fail/surface_partition_port_duplicate.rs b/dfir_rs/tests/compile-fail/surface_partition_port_duplicate.rs similarity index 94% rename from hydroflow/tests/compile-fail/surface_partition_port_duplicate.rs rename to dfir_rs/tests/compile-fail/surface_partition_port_duplicate.rs index d957de5ae7c3..019f9a7f2236 100644 --- a/hydroflow/tests/compile-fail/surface_partition_port_duplicate.rs +++ b/dfir_rs/tests/compile-fail/surface_partition_port_duplicate.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_partition_port_duplicate.stderr b/dfir_rs/tests/compile-fail/surface_partition_port_duplicate.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_partition_port_duplicate.stderr rename to dfir_rs/tests/compile-fail/surface_partition_port_duplicate.stderr diff --git a/hydroflow/tests/compile-fail/surface_partition_port_elided.rs b/dfir_rs/tests/compile-fail/surface_partition_port_elided.rs similarity index 93% rename from hydroflow/tests/compile-fail/surface_partition_port_elided.rs rename to dfir_rs/tests/compile-fail/surface_partition_port_elided.rs index 69228fa3d1b4..89c7b09bf260 100644 --- a/hydroflow/tests/compile-fail/surface_partition_port_elided.rs +++ b/dfir_rs/tests/compile-fail/surface_partition_port_elided.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_partition_port_elided.stderr b/dfir_rs/tests/compile-fail/surface_partition_port_elided.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_partition_port_elided.stderr rename to dfir_rs/tests/compile-fail/surface_partition_port_elided.stderr diff --git a/hydroflow/tests/compile-fail/surface_partition_port_extra.rs b/dfir_rs/tests/compile-fail/surface_partition_port_extra.rs similarity index 94% rename from hydroflow/tests/compile-fail/surface_partition_port_extra.rs rename to dfir_rs/tests/compile-fail/surface_partition_port_extra.rs index c357ea78d492..ef6da0534a7b 100644 --- a/hydroflow/tests/compile-fail/surface_partition_port_extra.rs +++ b/dfir_rs/tests/compile-fail/surface_partition_port_extra.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_partition_port_extra.stderr b/dfir_rs/tests/compile-fail/surface_partition_port_extra.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_partition_port_extra.stderr rename to dfir_rs/tests/compile-fail/surface_partition_port_extra.stderr diff --git a/hydroflow/tests/compile-fail/surface_partition_port_extramissing.rs b/dfir_rs/tests/compile-fail/surface_partition_port_extramissing.rs similarity index 94% rename from hydroflow/tests/compile-fail/surface_partition_port_extramissing.rs rename to dfir_rs/tests/compile-fail/surface_partition_port_extramissing.rs index e2eabc4159f3..0d730f3887f1 100644 --- a/hydroflow/tests/compile-fail/surface_partition_port_extramissing.rs +++ b/dfir_rs/tests/compile-fail/surface_partition_port_extramissing.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_partition_port_extramissing.stderr b/dfir_rs/tests/compile-fail/surface_partition_port_extramissing.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_partition_port_extramissing.stderr rename to dfir_rs/tests/compile-fail/surface_partition_port_extramissing.stderr diff --git a/hydroflow/tests/compile-fail/surface_partition_port_inconsistent.rs b/dfir_rs/tests/compile-fail/surface_partition_port_inconsistent.rs similarity index 93% rename from hydroflow/tests/compile-fail/surface_partition_port_inconsistent.rs rename to dfir_rs/tests/compile-fail/surface_partition_port_inconsistent.rs index 647a9b50f0fc..e7495d68bcdd 100644 --- a/hydroflow/tests/compile-fail/surface_partition_port_inconsistent.rs +++ b/dfir_rs/tests/compile-fail/surface_partition_port_inconsistent.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_partition_port_inconsistent.stderr b/dfir_rs/tests/compile-fail/surface_partition_port_inconsistent.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_partition_port_inconsistent.stderr rename to dfir_rs/tests/compile-fail/surface_partition_port_inconsistent.stderr diff --git a/hydroflow/tests/compile-fail/surface_partition_port_indexgap.rs b/dfir_rs/tests/compile-fail/surface_partition_port_indexgap.rs similarity index 91% rename from hydroflow/tests/compile-fail/surface_partition_port_indexgap.rs rename to dfir_rs/tests/compile-fail/surface_partition_port_indexgap.rs index 349162984bc8..b1b1932554fe 100644 --- a/hydroflow/tests/compile-fail/surface_partition_port_indexgap.rs +++ b/dfir_rs/tests/compile-fail/surface_partition_port_indexgap.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_partition_port_indexgap.stderr b/dfir_rs/tests/compile-fail/surface_partition_port_indexgap.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_partition_port_indexgap.stderr rename to dfir_rs/tests/compile-fail/surface_partition_port_indexgap.stderr diff --git a/hydroflow/tests/compile-fail/surface_partition_port_missing.rs b/dfir_rs/tests/compile-fail/surface_partition_port_missing.rs similarity index 93% rename from hydroflow/tests/compile-fail/surface_partition_port_missing.rs rename to dfir_rs/tests/compile-fail/surface_partition_port_missing.rs index cf5a133742e9..970d7efe7f20 100644 --- a/hydroflow/tests/compile-fail/surface_partition_port_missing.rs +++ b/dfir_rs/tests/compile-fail/surface_partition_port_missing.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_partition_port_missing.stderr b/dfir_rs/tests/compile-fail/surface_partition_port_missing.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_partition_port_missing.stderr rename to dfir_rs/tests/compile-fail/surface_partition_port_missing.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_conflict.rs b/dfir_rs/tests/compile-fail/surface_port_conflict.rs similarity index 87% rename from hydroflow/tests/compile-fail/surface_port_conflict.rs rename to dfir_rs/tests/compile-fail/surface_port_conflict.rs index 21a0f9868142..492b94c03003 100644 --- a/hydroflow/tests/compile-fail/surface_port_conflict.rs +++ b/dfir_rs/tests/compile-fail/surface_port_conflict.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_conflict.stderr b/dfir_rs/tests/compile-fail/surface_port_conflict.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_conflict.stderr rename to dfir_rs/tests/compile-fail/surface_port_conflict.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_join.rs b/dfir_rs/tests/compile-fail/surface_port_join.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_port_join.rs rename to dfir_rs/tests/compile-fail/surface_port_join.rs index c29c104a2238..00b207dfd169 100644 --- a/hydroflow/tests/compile-fail/surface_port_join.rs +++ b/dfir_rs/tests/compile-fail/surface_port_join.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_join.stderr b/dfir_rs/tests/compile-fail/surface_port_join.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_join.stderr rename to dfir_rs/tests/compile-fail/surface_port_join.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_join_forwardref.rs b/dfir_rs/tests/compile-fail/surface_port_join_forwardref.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_port_join_forwardref.rs rename to dfir_rs/tests/compile-fail/surface_port_join_forwardref.rs index 6fea3bfe1bb4..ae40b5d33845 100644 --- a/hydroflow/tests/compile-fail/surface_port_join_forwardref.rs +++ b/dfir_rs/tests/compile-fail/surface_port_join_forwardref.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_join_forwardref.stderr b/dfir_rs/tests/compile-fail/surface_port_join_forwardref.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_join_forwardref.stderr rename to dfir_rs/tests/compile-fail/surface_port_join_forwardref.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a.rs b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a.rs similarity index 91% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a.rs rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a.rs index 925b4a4837e1..00dc2bc5ddb3 100644 --- a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a.rs +++ b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a.stderr b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a.stderr rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.rs b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.rs similarity index 91% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.rs rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.rs index 54c1928a6de6..ec3b5c47c99f 100644 --- a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.rs +++ b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.stderr b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.stderr rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_a_forwardref.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.rs b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.rs similarity index 89% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.rs rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.rs index 5b80d538c3df..9546ccfa92b7 100644 --- a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.rs +++ b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.stderr b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.stderr rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_inn.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.rs b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.rs similarity index 89% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.rs rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.rs index 49c4d2500420..9b65ed7e0422 100644 --- a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.rs +++ b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.stderr b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.stderr rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_knot_b_out.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_simple.rs b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_simple.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_simple.rs rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_simple.rs index 4a4f698a05e6..b81e3f18201e 100644 --- a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_simple.rs +++ b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_simple.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_naked_overwrite_simple.stderr b/dfir_rs/tests/compile-fail/surface_port_naked_overwrite_simple.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_naked_overwrite_simple.stderr rename to dfir_rs/tests/compile-fail/surface_port_naked_overwrite_simple.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_unused_both.rs b/dfir_rs/tests/compile-fail/surface_port_unused_both.rs similarity index 85% rename from hydroflow/tests/compile-fail/surface_port_unused_both.rs rename to dfir_rs/tests/compile-fail/surface_port_unused_both.rs index 36499647db22..43534ae42511 100644 --- a/hydroflow/tests/compile-fail/surface_port_unused_both.rs +++ b/dfir_rs/tests/compile-fail/surface_port_unused_both.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_unused_both.stderr b/dfir_rs/tests/compile-fail/surface_port_unused_both.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_unused_both.stderr rename to dfir_rs/tests/compile-fail/surface_port_unused_both.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_unused_both_indirect.rs b/dfir_rs/tests/compile-fail/surface_port_unused_both_indirect.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_port_unused_both_indirect.rs rename to dfir_rs/tests/compile-fail/surface_port_unused_both_indirect.rs index 5e83ace012e6..a8850c95f777 100644 --- a/hydroflow/tests/compile-fail/surface_port_unused_both_indirect.rs +++ b/dfir_rs/tests/compile-fail/surface_port_unused_both_indirect.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_unused_both_indirect.stderr b/dfir_rs/tests/compile-fail/surface_port_unused_both_indirect.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_unused_both_indirect.stderr rename to dfir_rs/tests/compile-fail/surface_port_unused_both_indirect.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_unused_both_parens.rs b/dfir_rs/tests/compile-fail/surface_port_unused_both_parens.rs similarity index 86% rename from hydroflow/tests/compile-fail/surface_port_unused_both_parens.rs rename to dfir_rs/tests/compile-fail/surface_port_unused_both_parens.rs index 09b34a6320d8..ff55cb6ff098 100644 --- a/hydroflow/tests/compile-fail/surface_port_unused_both_parens.rs +++ b/dfir_rs/tests/compile-fail/surface_port_unused_both_parens.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_unused_both_parens.stderr b/dfir_rs/tests/compile-fail/surface_port_unused_both_parens.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_unused_both_parens.stderr rename to dfir_rs/tests/compile-fail/surface_port_unused_both_parens.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_unused_in.rs b/dfir_rs/tests/compile-fail/surface_port_unused_in.rs similarity index 83% rename from hydroflow/tests/compile-fail/surface_port_unused_in.rs rename to dfir_rs/tests/compile-fail/surface_port_unused_in.rs index 0a5fbd5bcd6c..c26fd34a5bca 100644 --- a/hydroflow/tests/compile-fail/surface_port_unused_in.rs +++ b/dfir_rs/tests/compile-fail/surface_port_unused_in.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_unused_in.stderr b/dfir_rs/tests/compile-fail/surface_port_unused_in.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_unused_in.stderr rename to dfir_rs/tests/compile-fail/surface_port_unused_in.stderr diff --git a/hydroflow/tests/compile-fail/surface_port_unused_out.rs b/dfir_rs/tests/compile-fail/surface_port_unused_out.rs similarity index 83% rename from hydroflow/tests/compile-fail/surface_port_unused_out.rs rename to dfir_rs/tests/compile-fail/surface_port_unused_out.rs index c5d8cfdb6329..45d3c1a00866 100644 --- a/hydroflow/tests/compile-fail/surface_port_unused_out.rs +++ b/dfir_rs/tests/compile-fail/surface_port_unused_out.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_port_unused_out.stderr b/dfir_rs/tests/compile-fail/surface_port_unused_out.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_port_unused_out.stderr rename to dfir_rs/tests/compile-fail/surface_port_unused_out.stderr diff --git a/hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_int.rs b/dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_int.rs similarity index 81% rename from hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_int.rs rename to dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_int.rs index 3b3d57ca9327..ac8f07ed9d8a 100644 --- a/hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_int.rs +++ b/dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_int.rs @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_iter(0..1) -> fold_keyed(|| 0, |old: &mut u32, val: u32| { *old += val; }) -> for_each(std::mem::drop); diff --git a/hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_int.stderr b/dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_int.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_int.stderr rename to dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_int.stderr diff --git a/hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_option.rs b/dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_option.rs similarity index 83% rename from hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_option.rs rename to dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_option.rs index 18f3c0e5abe8..f98eb6a10e6d 100644 --- a/hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_option.rs +++ b/dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_option.rs @@ -1,5 +1,5 @@ fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_iter([ Some(5), None, Some(12) ]) -> fold_keyed(|| 0, |old: &mut u32, val: u32| { *old += val; }) -> for_each(std::mem::drop); diff --git a/hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_option.stderr b/dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_option.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_reduce_keyed_badtype_option.stderr rename to dfir_rs/tests/compile-fail/surface_reduce_keyed_badtype_option.stderr diff --git a/hydroflow/tests/compile-fail/surface_singleton_badexpr.rs b/dfir_rs/tests/compile-fail/surface_singleton_badexpr.rs similarity index 88% rename from hydroflow/tests/compile-fail/surface_singleton_badexpr.rs rename to dfir_rs/tests/compile-fail/surface_singleton_badexpr.rs index 93b5dced6e7d..f91299952a01 100644 --- a/hydroflow/tests/compile-fail/surface_singleton_badexpr.rs +++ b/dfir_rs/tests/compile-fail/surface_singleton_badexpr.rs @@ -1,6 +1,6 @@ /// Correct reference but using it wrong (bad expression). fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { my_ref = source_iter(15_u32..=25) -> fold(|| 0, |a, b| *a = std::cmp::max(*a, b)); source_iter(10_u32..=30) -> persist() diff --git a/hydroflow/tests/compile-fail/surface_singleton_badexpr.stderr b/dfir_rs/tests/compile-fail/surface_singleton_badexpr.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_singleton_badexpr.stderr rename to dfir_rs/tests/compile-fail/surface_singleton_badexpr.stderr diff --git a/hydroflow/tests/compile-fail/surface_singleton_nostate.rs b/dfir_rs/tests/compile-fail/surface_singleton_nostate.rs similarity index 87% rename from hydroflow/tests/compile-fail/surface_singleton_nostate.rs rename to dfir_rs/tests/compile-fail/surface_singleton_nostate.rs index e95a74e33ec0..307564c95cf4 100644 --- a/hydroflow/tests/compile-fail/surface_singleton_nostate.rs +++ b/dfir_rs/tests/compile-fail/surface_singleton_nostate.rs @@ -1,6 +1,6 @@ /// Reference an operator that doesn't have singleton state. pub fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { my_ref = source_iter(15..=25) -> null(); source_iter(10..=30) -> persist::<'static>() diff --git a/hydroflow/tests/compile-fail/surface_singleton_nostate.stderr b/dfir_rs/tests/compile-fail/surface_singleton_nostate.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_singleton_nostate.stderr rename to dfir_rs/tests/compile-fail/surface_singleton_nostate.stderr diff --git a/hydroflow/tests/compile-fail/surface_singleton_nostate_undefined.rs b/dfir_rs/tests/compile-fail/surface_singleton_nostate_undefined.rs similarity index 86% rename from hydroflow/tests/compile-fail/surface_singleton_nostate_undefined.rs rename to dfir_rs/tests/compile-fail/surface_singleton_nostate_undefined.rs index d9c5a0a6b9ff..ce45df67147d 100644 --- a/hydroflow/tests/compile-fail/surface_singleton_nostate_undefined.rs +++ b/dfir_rs/tests/compile-fail/surface_singleton_nostate_undefined.rs @@ -1,5 +1,5 @@ pub fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { my_ref = source_iter(15..=25) -> null(); source_iter(10..=30) -> persist::<'static>() diff --git a/hydroflow/tests/compile-fail/surface_singleton_nostate_undefined.stderr b/dfir_rs/tests/compile-fail/surface_singleton_nostate_undefined.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_singleton_nostate_undefined.stderr rename to dfir_rs/tests/compile-fail/surface_singleton_nostate_undefined.stderr diff --git a/hydroflow/tests/compile-fail/surface_singleton_undefined.rs b/dfir_rs/tests/compile-fail/surface_singleton_undefined.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_singleton_undefined.rs rename to dfir_rs/tests/compile-fail/surface_singleton_undefined.rs index 5ad6896694ac..fd33e2ad35a3 100644 --- a/hydroflow/tests/compile-fail/surface_singleton_undefined.rs +++ b/dfir_rs/tests/compile-fail/surface_singleton_undefined.rs @@ -1,5 +1,5 @@ pub fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_iter(10..=30) -> persist::<'static>() -> filter(|value| value <= #unknown.as_reveal_ref()) diff --git a/hydroflow/tests/compile-fail/surface_singleton_undefined.stderr b/dfir_rs/tests/compile-fail/surface_singleton_undefined.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_singleton_undefined.stderr rename to dfir_rs/tests/compile-fail/surface_singleton_undefined.stderr diff --git a/hydroflow/tests/compile-fail/surface_singleton_undefined_nostate.rs b/dfir_rs/tests/compile-fail/surface_singleton_undefined_nostate.rs similarity index 86% rename from hydroflow/tests/compile-fail/surface_singleton_undefined_nostate.rs rename to dfir_rs/tests/compile-fail/surface_singleton_undefined_nostate.rs index 6e7d416217fe..7c6a25201cee 100644 --- a/hydroflow/tests/compile-fail/surface_singleton_undefined_nostate.rs +++ b/dfir_rs/tests/compile-fail/surface_singleton_undefined_nostate.rs @@ -1,5 +1,5 @@ pub fn main() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { my_ref = source_iter(15..=25) -> null(); source_iter(10..=30) -> persist::<'static>() diff --git a/hydroflow/tests/compile-fail/surface_singleton_undefined_nostate.stderr b/dfir_rs/tests/compile-fail/surface_singleton_undefined_nostate.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_singleton_undefined_nostate.stderr rename to dfir_rs/tests/compile-fail/surface_singleton_undefined_nostate.stderr diff --git a/hydroflow/tests/compile-fail/surface_source_interval_badarg.rs b/dfir_rs/tests/compile-fail/surface_source_interval_badarg.rs similarity index 79% rename from hydroflow/tests/compile-fail/surface_source_interval_badarg.rs rename to dfir_rs/tests/compile-fail/surface_source_interval_badarg.rs index c38aae398a38..d8973d2b4d09 100644 --- a/hydroflow/tests/compile-fail/surface_source_interval_badarg.rs +++ b/dfir_rs/tests/compile-fail/surface_source_interval_badarg.rs @@ -1,6 +1,6 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let mut df = dfir_syntax! { // Should be a `Duration`. diff --git a/hydroflow/tests/compile-fail/surface_source_interval_badarg.stderr b/dfir_rs/tests/compile-fail/surface_source_interval_badarg.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_source_interval_badarg.stderr rename to dfir_rs/tests/compile-fail/surface_source_interval_badarg.stderr diff --git a/hydroflow/tests/compile-fail/surface_source_iter_badtype.rs.ignore b/dfir_rs/tests/compile-fail/surface_source_iter_badtype.rs.ignore similarity index 82% rename from hydroflow/tests/compile-fail/surface_source_iter_badtype.rs.ignore rename to dfir_rs/tests/compile-fail/surface_source_iter_badtype.rs.ignore index d35367409591..8e0851ce80a9 100644 --- a/hydroflow/tests/compile-fail/surface_source_iter_badtype.rs.ignore +++ b/dfir_rs/tests/compile-fail/surface_source_iter_badtype.rs.ignore @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_source_iter_badtype.stderr b/dfir_rs/tests/compile-fail/surface_source_iter_badtype.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_source_iter_badtype.stderr rename to dfir_rs/tests/compile-fail/surface_source_iter_badtype.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_eol_arrow.rs b/dfir_rs/tests/compile-fail/surface_syntax_eol_arrow.rs similarity index 79% rename from hydroflow/tests/compile-fail/surface_syntax_eol_arrow.rs rename to dfir_rs/tests/compile-fail/surface_syntax_eol_arrow.rs index e114d94d272b..640e33f7e5b5 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_eol_arrow.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_eol_arrow.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_eol_arrow.stderr b/dfir_rs/tests/compile-fail/surface_syntax_eol_arrow.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_eol_arrow.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_eol_arrow.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_eol_indexing.rs b/dfir_rs/tests/compile-fail/surface_syntax_eol_indexing.rs similarity index 80% rename from hydroflow/tests/compile-fail/surface_syntax_eol_indexing.rs rename to dfir_rs/tests/compile-fail/surface_syntax_eol_indexing.rs index 14fffeb89b3d..96af7116cdf1 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_eol_indexing.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_eol_indexing.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_eol_indexing.stderr b/dfir_rs/tests/compile-fail/surface_syntax_eol_indexing.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_eol_indexing.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_eol_indexing.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_eol_missingop.rs b/dfir_rs/tests/compile-fail/surface_syntax_eol_missingop.rs similarity index 79% rename from hydroflow/tests/compile-fail/surface_syntax_eol_missingop.rs rename to dfir_rs/tests/compile-fail/surface_syntax_eol_missingop.rs index 5524178c4a40..5276af5589ff 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_eol_missingop.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_eol_missingop.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_eol_missingop.stderr b/dfir_rs/tests/compile-fail/surface_syntax_eol_missingop.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_eol_missingop.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_eol_missingop.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_eol_op.rs b/dfir_rs/tests/compile-fail/surface_syntax_eol_op.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_syntax_eol_op.rs rename to dfir_rs/tests/compile-fail/surface_syntax_eol_op.rs index 88a3deb807a6..2ba32d51c88b 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_eol_op.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_eol_op.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_eol_op.stderr b/dfir_rs/tests/compile-fail/surface_syntax_eol_op.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_eol_op.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_eol_op.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_indexing_empty.rs b/dfir_rs/tests/compile-fail/surface_syntax_indexing_empty.rs similarity index 80% rename from hydroflow/tests/compile-fail/surface_syntax_indexing_empty.rs rename to dfir_rs/tests/compile-fail/surface_syntax_indexing_empty.rs index f4009f88b5d8..65fe978414d3 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_indexing_empty.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_indexing_empty.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_indexing_empty.stderr b/dfir_rs/tests/compile-fail/surface_syntax_indexing_empty.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_indexing_empty.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_indexing_empty.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_noarrow_indexing.rs b/dfir_rs/tests/compile-fail/surface_syntax_noarrow_indexing.rs similarity index 84% rename from hydroflow/tests/compile-fail/surface_syntax_noarrow_indexing.rs rename to dfir_rs/tests/compile-fail/surface_syntax_noarrow_indexing.rs index ea0fa7b599ec..8caa3b3d926c 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_noarrow_indexing.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_noarrow_indexing.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_noarrow_indexing.stderr b/dfir_rs/tests/compile-fail/surface_syntax_noarrow_indexing.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_noarrow_indexing.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_noarrow_indexing.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_noarrow_op.rs b/dfir_rs/tests/compile-fail/surface_syntax_noarrow_op.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_syntax_noarrow_op.rs rename to dfir_rs/tests/compile-fail/surface_syntax_noarrow_op.rs index 682d38e72670..2ba74b77237d 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_noarrow_op.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_noarrow_op.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_noarrow_op.stderr b/dfir_rs/tests/compile-fail/surface_syntax_noarrow_op.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_noarrow_op.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_noarrow_op.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_noarrow_paren.rs b/dfir_rs/tests/compile-fail/surface_syntax_noarrow_paren.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_syntax_noarrow_paren.rs rename to dfir_rs/tests/compile-fail/surface_syntax_noarrow_paren.rs index 380808db1e37..c7ade304c619 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_noarrow_paren.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_noarrow_paren.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_noarrow_paren.stderr b/dfir_rs/tests/compile-fail/surface_syntax_noarrow_paren.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_noarrow_paren.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_noarrow_paren.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren.rs b/dfir_rs/tests/compile-fail/surface_syntax_paren.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_syntax_paren.rs rename to dfir_rs/tests/compile-fail/surface_syntax_paren.rs index b40062cefe74..089199421b52 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_paren.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_paren.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren.stderr b/dfir_rs/tests/compile-fail/surface_syntax_paren.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_paren.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_paren.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_arrow.rs b/dfir_rs/tests/compile-fail/surface_syntax_paren_arrow.rs similarity index 79% rename from hydroflow/tests/compile-fail/surface_syntax_paren_arrow.rs rename to dfir_rs/tests/compile-fail/surface_syntax_paren_arrow.rs index e52fbcbc7fc3..f868d85f07b6 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_paren_arrow.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_paren_arrow.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_arrow.stderr b/dfir_rs/tests/compile-fail/surface_syntax_paren_arrow.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_paren_arrow.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_paren_arrow.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_indexing.rs b/dfir_rs/tests/compile-fail/surface_syntax_paren_indexing.rs similarity index 80% rename from hydroflow/tests/compile-fail/surface_syntax_paren_indexing.rs rename to dfir_rs/tests/compile-fail/surface_syntax_paren_indexing.rs index f8395c67770f..2ceee9559785 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_paren_indexing.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_paren_indexing.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_indexing.stderr b/dfir_rs/tests/compile-fail/surface_syntax_paren_indexing.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_paren_indexing.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_paren_indexing.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_missingop.rs b/dfir_rs/tests/compile-fail/surface_syntax_paren_missingop.rs similarity index 80% rename from hydroflow/tests/compile-fail/surface_syntax_paren_missingop.rs rename to dfir_rs/tests/compile-fail/surface_syntax_paren_missingop.rs index ac81612bb4ad..1da0c2f0e515 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_paren_missingop.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_paren_missingop.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_missingop.stderr b/dfir_rs/tests/compile-fail/surface_syntax_paren_missingop.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_paren_missingop.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_paren_missingop.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_op.rs b/dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_op.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_op.rs rename to dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_op.rs index 09a6f7b63e7e..fff2a7a823b1 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_op.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_op.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_op.stderr b/dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_op.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_op.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_op.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_paren.rs b/dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_paren.rs similarity index 82% rename from hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_paren.rs rename to dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_paren.rs index beaea79f7615..2409cabb4500 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_paren.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_paren.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_paren.stderr b/dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_paren.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_paren_noarrow_paren.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_paren_noarrow_paren.stderr diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_semicolon.rs b/dfir_rs/tests/compile-fail/surface_syntax_paren_semicolon.rs similarity index 79% rename from hydroflow/tests/compile-fail/surface_syntax_paren_semicolon.rs rename to dfir_rs/tests/compile-fail/surface_syntax_paren_semicolon.rs index 722cdd5e31ea..d043129522b3 100644 --- a/hydroflow/tests/compile-fail/surface_syntax_paren_semicolon.rs +++ b/dfir_rs/tests/compile-fail/surface_syntax_paren_semicolon.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_syntax_paren_semicolon.stderr b/dfir_rs/tests/compile-fail/surface_syntax_paren_semicolon.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_syntax_paren_semicolon.stderr rename to dfir_rs/tests/compile-fail/surface_syntax_paren_semicolon.stderr diff --git a/hydroflow/tests/compile-fail/surface_unknown_operators.rs b/dfir_rs/tests/compile-fail/surface_unknown_operators.rs similarity index 81% rename from hydroflow/tests/compile-fail/surface_unknown_operators.rs rename to dfir_rs/tests/compile-fail/surface_unknown_operators.rs index caa48c71236a..269719096369 100644 --- a/hydroflow/tests/compile-fail/surface_unknown_operators.rs +++ b/dfir_rs/tests/compile-fail/surface_unknown_operators.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_unknown_operators.stderr b/dfir_rs/tests/compile-fail/surface_unknown_operators.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_unknown_operators.stderr rename to dfir_rs/tests/compile-fail/surface_unknown_operators.stderr diff --git a/hydroflow/tests/compile-fail/surface_use_bad1.rs b/dfir_rs/tests/compile-fail/surface_use_bad1.rs similarity index 84% rename from hydroflow/tests/compile-fail/surface_use_bad1.rs rename to dfir_rs/tests/compile-fail/surface_use_bad1.rs index 756926c119c1..d1214a9c767b 100644 --- a/hydroflow/tests/compile-fail/surface_use_bad1.rs +++ b/dfir_rs/tests/compile-fail/surface_use_bad1.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_use_bad1.stderr b/dfir_rs/tests/compile-fail/surface_use_bad1.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_use_bad1.stderr rename to dfir_rs/tests/compile-fail/surface_use_bad1.stderr diff --git a/hydroflow/tests/compile-fail/surface_use_bad2.rs b/dfir_rs/tests/compile-fail/surface_use_bad2.rs similarity index 84% rename from hydroflow/tests/compile-fail/surface_use_bad2.rs rename to dfir_rs/tests/compile-fail/surface_use_bad2.rs index 3d87686bd539..8203011e0264 100644 --- a/hydroflow/tests/compile-fail/surface_use_bad2.rs +++ b/dfir_rs/tests/compile-fail/surface_use_bad2.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_use_bad2.stderr b/dfir_rs/tests/compile-fail/surface_use_bad2.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_use_bad2.stderr rename to dfir_rs/tests/compile-fail/surface_use_bad2.stderr diff --git a/hydroflow/tests/compile-fail/surface_use_bad3.rs b/dfir_rs/tests/compile-fail/surface_use_bad3.rs similarity index 84% rename from hydroflow/tests/compile-fail/surface_use_bad3.rs rename to dfir_rs/tests/compile-fail/surface_use_bad3.rs index 3016af6d270e..763635811a20 100644 --- a/hydroflow/tests/compile-fail/surface_use_bad3.rs +++ b/dfir_rs/tests/compile-fail/surface_use_bad3.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_use_bad3.stderr b/dfir_rs/tests/compile-fail/surface_use_bad3.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_use_bad3.stderr rename to dfir_rs/tests/compile-fail/surface_use_bad3.stderr diff --git a/hydroflow/tests/compile-fail/surface_use_unknown.rs b/dfir_rs/tests/compile-fail/surface_use_unknown.rs similarity index 84% rename from hydroflow/tests/compile-fail/surface_use_unknown.rs rename to dfir_rs/tests/compile-fail/surface_use_unknown.rs index af11287fb2df..48b16e88a86e 100644 --- a/hydroflow/tests/compile-fail/surface_use_unknown.rs +++ b/dfir_rs/tests/compile-fail/surface_use_unknown.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_use_unknown.stderr b/dfir_rs/tests/compile-fail/surface_use_unknown.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_use_unknown.stderr rename to dfir_rs/tests/compile-fail/surface_use_unknown.stderr diff --git a/hydroflow/tests/compile-fail/surface_varname_undefined.rs b/dfir_rs/tests/compile-fail/surface_varname_undefined.rs similarity index 81% rename from hydroflow/tests/compile-fail/surface_varname_undefined.rs rename to dfir_rs/tests/compile-fail/surface_varname_undefined.rs index 670a1945cbd7..fa73ff35c617 100644 --- a/hydroflow/tests/compile-fail/surface_varname_undefined.rs +++ b/dfir_rs/tests/compile-fail/surface_varname_undefined.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; fn main() { let mut df = dfir_syntax! { diff --git a/hydroflow/tests/compile-fail/surface_varname_undefined.stderr b/dfir_rs/tests/compile-fail/surface_varname_undefined.stderr similarity index 100% rename from hydroflow/tests/compile-fail/surface_varname_undefined.stderr rename to dfir_rs/tests/compile-fail/surface_varname_undefined.stderr diff --git a/hydroflow/tests/datalog_compile_fail.rs b/dfir_rs/tests/datalog_compile_fail.rs similarity index 100% rename from hydroflow/tests/datalog_compile_fail.rs rename to dfir_rs/tests/datalog_compile_fail.rs diff --git a/hydroflow/tests/datalog_frontend.rs b/dfir_rs/tests/datalog_frontend.rs similarity index 76% rename from hydroflow/tests/datalog_frontend.rs rename to dfir_rs/tests/datalog_frontend.rs index 86bc845fe42e..80692420ac63 100644 --- a/hydroflow/tests/datalog_frontend.rs +++ b/dfir_rs/tests/datalog_frontend.rs @@ -1,12 +1,12 @@ -use hydroflow::datalog; -use hydroflow::util::collect_ready; -use hydroflow::util::multiset::HashMultiSet; +use dfir_rs::datalog; +use dfir_rs::util::collect_ready; +use dfir_rs::util::multiset::HashMultiSet; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_minimal() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 2)).unwrap(); @@ -26,7 +26,7 @@ pub fn test_minimal() { #[multiplatform_test] pub fn test_minimal_static() { - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -51,8 +51,8 @@ pub fn test_minimal_static() { #[multiplatform_test] pub fn test_duplicated_facts() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 2)).unwrap(); @@ -73,8 +73,8 @@ pub fn test_duplicated_facts() { #[multiplatform_test] pub fn test_join_with_self() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 2)).unwrap(); in_send.send((2, 1)).unwrap(); @@ -99,8 +99,8 @@ pub fn test_join_with_self() { #[multiplatform_test] pub fn test_wildcard_fields() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize,)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize,)>(); let mut flow = datalog!( r#" @@ -121,8 +121,8 @@ pub fn test_wildcard_fields() { #[multiplatform_test] pub fn test_multi_use_intermediate() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 2)).unwrap(); in_send.send((2, 1)).unwrap(); @@ -148,9 +148,9 @@ pub fn test_multi_use_intermediate() { #[multiplatform_test] pub fn test_join_with_other() { - let (in1_send, in1) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (in2_send, in2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in1_send, in1) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (in2_send, in2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -182,9 +182,9 @@ pub fn test_join_with_other() { #[multiplatform_test] pub fn test_multiple_contributors() { - let (in1_send, in1) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (in2_send, in2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in1_send, in1) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (in2_send, in2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in1_send.send((1, 2)).unwrap(); in2_send.send((3, 1)).unwrap(); @@ -210,9 +210,9 @@ pub fn test_multiple_contributors() { #[multiplatform_test] pub fn test_transitive_closure() { - let (edges_send, edges) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (seed_reachable_send, seed_reachable) = hydroflow::util::unbounded_channel::<(usize,)>(); - let (reachable, mut reachable_recv) = hydroflow::util::unbounded_channel::<(usize,)>(); + let (edges_send, edges) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (seed_reachable_send, seed_reachable) = dfir_rs::util::unbounded_channel::<(usize,)>(); + let (reachable, mut reachable_recv) = dfir_rs::util::unbounded_channel::<(usize,)>(); seed_reachable_send.send((1,)).unwrap(); edges_send.send((3, 4)).unwrap(); @@ -240,10 +240,10 @@ pub fn test_transitive_closure() { #[multiplatform_test] pub fn test_triple_relation_join() { - let (in1_send, in1) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (in2_send, in2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (in3_send, in3) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize, usize, usize)>(); + let (in1_send, in1) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (in2_send, in2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (in3_send, in3) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize, usize, usize)>(); in1_send.send((1, 2)).unwrap(); in2_send.send((2, 1)).unwrap(); @@ -273,8 +273,8 @@ pub fn test_triple_relation_join() { #[multiplatform_test] pub fn test_local_constraints() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 2)).unwrap(); in_send.send((1, 1)).unwrap(); @@ -295,8 +295,8 @@ pub fn test_local_constraints() { #[multiplatform_test] pub fn test_boolean_relation_eq() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 1)).unwrap(); in_send.send((1, 2)).unwrap(); @@ -318,8 +318,8 @@ pub fn test_boolean_relation_eq() { #[multiplatform_test] pub fn test_boolean_relation_lt() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 1)).unwrap(); in_send.send((1, 2)).unwrap(); @@ -341,8 +341,8 @@ pub fn test_boolean_relation_lt() { #[multiplatform_test] pub fn test_boolean_relation_le() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 1)).unwrap(); in_send.send((1, 2)).unwrap(); @@ -367,8 +367,8 @@ pub fn test_boolean_relation_le() { #[multiplatform_test] pub fn test_boolean_relation_gt() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 1)).unwrap(); in_send.send((1, 2)).unwrap(); @@ -390,8 +390,8 @@ pub fn test_boolean_relation_gt() { #[multiplatform_test] pub fn test_boolean_relation_ge() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 1)).unwrap(); in_send.send((1, 2)).unwrap(); @@ -416,10 +416,10 @@ pub fn test_boolean_relation_ge() { #[multiplatform_test] pub fn test_join_multiple_and_relation() { - let (in1_send, in1) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (in2_send, in2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (in3_send, in3) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize, usize, usize)>(); + let (in1_send, in1) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (in2_send, in2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (in3_send, in3) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize, usize, usize)>(); in1_send.send((1, 2)).unwrap(); @@ -452,10 +452,10 @@ pub fn test_join_multiple_and_relation() { pub fn test_join_multiple_then_relation() { // Same test as test_join_multiple_and_relation, except with a filter on top instead of a // filter in the join. - let (in1_send, in1) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (in2_send, in2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (in3_send, in3) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize, usize, usize)>(); + let (in1_send, in1) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (in2_send, in2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (in3_send, in3) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize, usize, usize)>(); in1_send.send((1, 2)).unwrap(); @@ -487,9 +487,9 @@ pub fn test_join_multiple_then_relation() { #[multiplatform_test] pub fn test_defer_tick() { - let (ints_1_send, ints_1) = hydroflow::util::unbounded_channel::<(usize,)>(); - let (ints_2_send, ints_2) = hydroflow::util::unbounded_channel::<(usize,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize,)>(); + let (ints_1_send, ints_1) = dfir_rs::util::unbounded_channel::<(usize,)>(); + let (ints_2_send, ints_2) = dfir_rs::util::unbounded_channel::<(usize,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize,)>(); ints_1_send.send((1,)).unwrap(); ints_1_send.send((2,)).unwrap(); @@ -524,10 +524,10 @@ pub fn test_defer_tick() { #[multiplatform_test] pub fn test_anti_join() { - let (ints_1_send, ints_1) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (ints_2_send, ints_2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (ints_3_send, ints_3) = hydroflow::util::unbounded_channel::<(usize,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (ints_1_send, ints_1) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (ints_2_send, ints_2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (ints_3_send, ints_3) = dfir_rs::util::unbounded_channel::<(usize,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -563,10 +563,10 @@ pub fn test_anti_join() { #[multiplatform_test] pub fn test_anti_join_defer_tick() { - let (ints_1_send, ints_1) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (ints_2_send, ints_2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (ints_3_send, ints_3) = hydroflow::util::unbounded_channel::<(usize,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (ints_1_send, ints_1) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (ints_2_send, ints_2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (ints_3_send, ints_3) = dfir_rs::util::unbounded_channel::<(usize,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -606,10 +606,10 @@ pub fn test_anti_join_defer_tick() { #[multiplatform_test] pub fn test_anti_join_defer_cycle() { - let (ints_1_send, ints_1) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (ints_2_send, ints_2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (ints_3_send, ints_3) = hydroflow::util::unbounded_channel::<(usize,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (ints_1_send, ints_1) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (ints_2_send, ints_2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (ints_3_send, ints_3) = dfir_rs::util::unbounded_channel::<(usize,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -648,8 +648,8 @@ pub fn test_anti_join_defer_cycle() { #[multiplatform_test] fn test_max() { - let (ints_send, ints) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (ints_send, ints) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -677,8 +677,8 @@ fn test_max() { #[multiplatform_test] fn test_max_all() { - let (ints_send, ints) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (ints_send, ints) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -700,8 +700,8 @@ fn test_max_all() { #[multiplatform_test] fn test_max_defer_tick() { - let (ints_send, ints) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (ints_send, ints) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -727,16 +727,16 @@ fn test_max_defer_tick() { #[multiplatform_test] fn test_send_to_node() { - let (ints_send_1, ints_1) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (_ints_send_2, ints_2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (ints_send_1, ints_1) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (_ints_send_2, ints_2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); - let (result_1, mut result_recv_1) = hydroflow::util::unbounded_channel::<(usize,)>(); - let (result_2, mut result_recv_2) = hydroflow::util::unbounded_channel::<(usize,)>(); + let (result_1, mut result_recv_1) = dfir_rs::util::unbounded_channel::<(usize,)>(); + let (result_2, mut result_recv_2) = dfir_rs::util::unbounded_channel::<(usize,)>(); let (_async_send_result_1, async_receive_result_1) = - hydroflow::util::unbounded_channel::<(usize,)>(); + dfir_rs::util::unbounded_channel::<(usize,)>(); let (async_send_result_2, async_receive_result_2) = - hydroflow::util::unbounded_channel::<(usize,)>(); + dfir_rs::util::unbounded_channel::<(usize,)>(); let mut flow_1 = { let ints = ints_1; @@ -790,9 +790,9 @@ fn test_send_to_node() { #[multiplatform_test] fn test_aggregations_and_comments() { - let (ints_send, ints) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (result2, mut result_recv2) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (ints_send, ints) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (result2, mut result_recv2) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -832,8 +832,8 @@ fn test_aggregations_and_comments() { #[multiplatform_test] fn test_aggregations_fold_keyed_expr() { - let (ints_send, ints) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (ints_send, ints) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut flow = datalog!( r#" @@ -857,8 +857,8 @@ fn test_aggregations_fold_keyed_expr() { #[multiplatform_test] fn test_choose_strings() { - let (strings_send, strings) = hydroflow::util::unbounded_channel::<(String,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(String,)>(); + let (strings_send, strings) = dfir_rs::util::unbounded_channel::<(String,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(String,)>(); let mut flow = datalog!( r#" @@ -881,8 +881,8 @@ fn test_choose_strings() { #[multiplatform_test] fn test_non_copy_but_clone() { - let (strings_send, strings) = hydroflow::util::unbounded_channel::<(String, String)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(String, String)>(); + let (strings_send, strings) = dfir_rs::util::unbounded_channel::<(String, String)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(String, String)>(); let mut flow = datalog!( r#" @@ -907,8 +907,8 @@ fn test_non_copy_but_clone() { #[multiplatform_test] fn test_expr_lhs() { - let (ints_send, ints) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64,)>(); + let (ints_send, ints) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64,)>(); let mut flow = datalog!( r#" @@ -936,8 +936,8 @@ fn test_expr_lhs() { #[multiplatform_test] fn test_less_than_relation() { - let (ints_send, ints) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64,)>(); + let (ints_send, ints) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64,)>(); let mut flow = datalog!( r#" @@ -960,8 +960,8 @@ fn test_less_than_relation() { #[multiplatform_test] fn test_expr_predicate() { - let (ints_send, ints) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64,)>(); + let (ints_send, ints) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64,)>(); let mut flow = datalog!( r#" @@ -987,13 +987,13 @@ fn test_expr_predicate() { #[multiplatform_test] fn test_persist() { - let (ints1_send, ints1) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (ints2_send, ints2) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (ints3_send, ints3) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64, i64, i64)>(); - let (result2, mut result2_recv) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (result3, mut result3_recv) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (result4, mut result4_recv) = hydroflow::util::unbounded_channel::<(i64,)>(); + let (ints1_send, ints1) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (ints2_send, ints2) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (ints3_send, ints3) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64, i64, i64)>(); + let (result2, mut result2_recv) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (result3, mut result3_recv) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (result4, mut result4_recv) = dfir_rs::util::unbounded_channel::<(i64,)>(); let mut flow = datalog!( r#" @@ -1059,8 +1059,8 @@ fn test_persist() { #[multiplatform_test] fn test_persist_uniqueness() { - let (ints2_send, ints2) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize,)>(); + let (ints2_send, ints2) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize,)>(); let mut flow = datalog!( r#" @@ -1097,10 +1097,10 @@ fn test_persist_uniqueness() { #[multiplatform_test] fn test_wildcard_join_count() { - let (ints1_send, ints1) = hydroflow::util::unbounded_channel::<(i64, i64)>(); - let (ints2_send, ints2) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(usize,)>(); - let (result2, mut result2_recv) = hydroflow::util::unbounded_channel::<(usize,)>(); + let (ints1_send, ints1) = dfir_rs::util::unbounded_channel::<(i64, i64)>(); + let (ints2_send, ints2) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize,)>(); + let (result2, mut result2_recv) = dfir_rs::util::unbounded_channel::<(usize,)>(); let mut flow = datalog!( r#" @@ -1127,9 +1127,9 @@ fn test_wildcard_join_count() { #[multiplatform_test] fn test_collect_vec() { - let (ints1_send, ints1) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (ints2_send, ints2) = hydroflow::util::unbounded_channel::<(i64,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(Vec<(i64, i64)>,)>(); + let (ints1_send, ints1) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (ints2_send, ints2) = dfir_rs::util::unbounded_channel::<(i64,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(Vec<(i64, i64)>,)>(); let mut flow = datalog!( r#" @@ -1163,8 +1163,8 @@ fn test_collect_vec() { #[multiplatform_test] fn test_flatten() { - let (ints1_send, ints1) = hydroflow::util::unbounded_channel::<(i64, Vec)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64, i64)>(); + let (ints1_send, ints1) = dfir_rs::util::unbounded_channel::<(i64, Vec)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64, i64)>(); let mut flow = datalog!( r#" @@ -1189,8 +1189,8 @@ fn test_flatten() { #[test] fn test_detuple() { - let (ints1_send, ints1) = hydroflow::util::unbounded_channel::<((i64, i64),)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64, i64)>(); + let (ints1_send, ints1) = dfir_rs::util::unbounded_channel::<((i64, i64),)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64, i64)>(); let mut flow = datalog!( r#" @@ -1215,8 +1215,8 @@ fn test_detuple() { #[test] fn test_multi_detuple() { - let (ints1_send, ints1) = hydroflow::util::unbounded_channel::<((i64, i64), (i64, i64))>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64, i64, i64, i64)>(); + let (ints1_send, ints1) = dfir_rs::util::unbounded_channel::<((i64, i64), (i64, i64))>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64, i64, i64, i64)>(); let mut flow = datalog!( r#" @@ -1241,8 +1241,8 @@ fn test_multi_detuple() { #[test] fn test_flat_then_detuple() { - let (ints1_send, ints1) = hydroflow::util::unbounded_channel::<(Vec<(i64, i64)>,)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64, i64)>(); + let (ints1_send, ints1) = dfir_rs::util::unbounded_channel::<(Vec<(i64, i64)>,)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64, i64)>(); let mut flow = datalog!( r#" @@ -1267,8 +1267,8 @@ fn test_flat_then_detuple() { #[test] fn test_detuple_then_flat() { - let (ints1_send, ints1) = hydroflow::util::unbounded_channel::<((Vec, Vec),)>(); - let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64, i64)>(); + let (ints1_send, ints1) = dfir_rs::util::unbounded_channel::<((Vec, Vec),)>(); + let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64, i64)>(); let mut flow = datalog!( r#" @@ -1294,13 +1294,13 @@ fn test_detuple_then_flat() { // #[ignore] // This test depends on the ordering of specific tuples which is undefined. // #[multiplatform_test] // fn test_index() { -// let (ints_send, ints) = hydroflow::util::unbounded_channel::<(i64, i64)>(); -// let (result, mut result_recv) = hydroflow::util::unbounded_channel::<(i64, i64, i32)>(); -// let (result2, mut result2_recv) = hydroflow::util::unbounded_channel::<(i64, usize, usize)>(); +// let (ints_send, ints) = dfir_rs::util::unbounded_channel::<(i64, i64)>(); +// let (result, mut result_recv) = dfir_rs::util::unbounded_channel::<(i64, i64, i32)>(); +// let (result2, mut result2_recv) = dfir_rs::util::unbounded_channel::<(i64, usize, usize)>(); -// let (result3, mut result3_recv) = hydroflow::util::unbounded_channel::<(i64, i64, usize)>(); -// let (result4, mut result4_recv) = hydroflow::util::unbounded_channel::<(i64, usize, usize)>(); -// let (result5, mut result5_recv) = hydroflow::util::unbounded_channel::<(i64, i64, usize)>(); +// let (result3, mut result3_recv) = dfir_rs::util::unbounded_channel::<(i64, i64, usize)>(); +// let (result4, mut result4_recv) = dfir_rs::util::unbounded_channel::<(i64, usize, usize)>(); +// let (result5, mut result5_recv) = dfir_rs::util::unbounded_channel::<(i64, i64, usize)>(); // let mut flow = datalog!( // r#" diff --git a/hydroflow/tests/datalog_minimal.rs b/dfir_rs/tests/datalog_minimal.rs similarity index 64% rename from hydroflow/tests/datalog_minimal.rs rename to dfir_rs/tests/datalog_minimal.rs index daf13b16cce2..ecd8ebb10d7d 100644 --- a/hydroflow/tests/datalog_minimal.rs +++ b/dfir_rs/tests/datalog_minimal.rs @@ -1,11 +1,11 @@ -use hydroflow::datalog; -use hydroflow::util::collect_ready; +use dfir_rs::datalog; +use dfir_rs::util::collect_ready; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_minimal() { - let (in_send, input) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (in_send, input) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); in_send.send((1, 2)).unwrap(); diff --git a/hydroflow/tests/groupby.rs b/dfir_rs/tests/groupby.rs similarity index 97% rename from hydroflow/tests/groupby.rs rename to dfir_rs/tests/groupby.rs index 0bed8bc1785e..21c907393847 100644 --- a/hydroflow/tests/groupby.rs +++ b/dfir_rs/tests/groupby.rs @@ -2,9 +2,9 @@ use std::cell::RefCell; use std::collections::HashMap; use std::rc::Rc; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::scheduled::graph_ext::GraphExt; -use hydroflow::scheduled::handoff::{Iter, VecHandoff}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::scheduled::graph_ext::GraphExt; +use dfir_rs::scheduled::handoff::{Iter, VecHandoff}; use multiplatform_test::multiplatform_test; #[derive(Clone, Copy, Debug)] @@ -147,7 +147,7 @@ fn fold_keyed_monotonic_core() { // #[test] // #[multiplatform_test] // fn fold_keyed_monotonic_surface() { -// use hydroflow::builder::prelude::*; +// use dfir_rs::builder::prelude::*; // let mut hf_builder = HydroflowBuilder::new(); // let (input, source_recv) = hf_builder.add_channel_input::<_, _, VecHandoff>("source"); @@ -200,7 +200,7 @@ fn fold_keyed_monotonic_core() { // #[test] // #[multiplatform_test] // fn fold_keyed_nonmon_surface() { -// use hydroflow::builder::prelude::*; +// use dfir_rs::builder::prelude::*; // let mut hf_builder = HydroflowBuilder::new(); // let (input, source_recv) = hf_builder.add_channel_input::<_, _, VecHandoff>("source"); diff --git a/hydroflow/tests/scheduled_teeing_handoff.rs b/dfir_rs/tests/scheduled_teeing_handoff.rs similarity index 98% rename from hydroflow/tests/scheduled_teeing_handoff.rs rename to dfir_rs/tests/scheduled_teeing_handoff.rs index a4b86b8d1d16..b465889818ed 100644 --- a/hydroflow/tests/scheduled_teeing_handoff.rs +++ b/dfir_rs/tests/scheduled_teeing_handoff.rs @@ -1,9 +1,9 @@ use std::cell::RefCell; use std::rc::Rc; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::scheduled::graph_ext::GraphExt; -use hydroflow::scheduled::handoff::TeeingHandoff; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::scheduled::graph_ext::GraphExt; +use dfir_rs::scheduled::handoff::TeeingHandoff; use multiplatform_test::multiplatform_test; #[multiplatform_test] diff --git a/hydroflow/tests/scheduled_test.rs b/dfir_rs/tests/scheduled_test.rs similarity index 94% rename from hydroflow/tests/scheduled_test.rs rename to dfir_rs/tests/scheduled_test.rs index 36e90d52232e..24252e594f2a 100644 --- a/hydroflow/tests/scheduled_test.rs +++ b/dfir_rs/tests/scheduled_test.rs @@ -3,16 +3,16 @@ use std::collections::{HashMap, HashSet}; use std::rc::Rc; use std::sync::mpsc; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::scheduled::graph_ext::GraphExt; -use hydroflow::scheduled::handoff::VecHandoff; -use hydroflow::scheduled::port::{RecvCtx, SendCtx}; -use hydroflow::{var_args, var_expr}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::scheduled::graph_ext::GraphExt; +use dfir_rs::scheduled::handoff::VecHandoff; +use dfir_rs::scheduled::port::{RecvCtx, SendCtx}; +use dfir_rs::{var_args, var_expr}; use multiplatform_test::multiplatform_test; #[multiplatform_test] fn map_filter() { - use hydroflow::scheduled::handoff::VecHandoff; + use dfir_rs::scheduled::handoff::VecHandoff; // A simple dataflow with one source feeding into one sink with some processing in the middle. let mut df = Hydroflow::new(); @@ -243,8 +243,8 @@ fn test_cycle() { fn test_input_handle() { use std::cell::RefCell; - use hydroflow::scheduled::graph_ext::GraphExt; - use hydroflow::scheduled::handoff::VecHandoff; + use dfir_rs::scheduled::graph_ext::GraphExt; + use dfir_rs::scheduled::handoff::VecHandoff; let mut df = Hydroflow::new(); @@ -283,8 +283,8 @@ fn test_input_handle() { fn test_input_handle_thread() { use std::cell::RefCell; - use hydroflow::scheduled::graph_ext::GraphExt; - use hydroflow::scheduled::handoff::VecHandoff; + use dfir_rs::scheduled::graph_ext::GraphExt; + use dfir_rs::scheduled::handoff::VecHandoff; let mut df = Hydroflow::new(); @@ -324,9 +324,9 @@ fn test_input_channel() { use std::cell::Cell; + use dfir_rs::scheduled::graph_ext::GraphExt; + use dfir_rs::scheduled::handoff::VecHandoff; use futures::channel::mpsc::channel; - use hydroflow::scheduled::graph_ext::GraphExt; - use hydroflow::scheduled::handoff::VecHandoff; let (s1, r1) = channel(8000); let (s2, r2) = channel(8000); diff --git a/hydroflow/tests/snapshots/surface_async__echo@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_async__echo@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_async__echo@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_async__echo@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_async__echo@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_async__echo@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_async__echo@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_async__echo@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_batch__basic_2@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_batch__basic_2@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_batch__basic_2@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_batch__basic_2@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_batch__basic_2@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_batch__basic_2@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_batch__basic_2@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_batch__basic_2@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_book__surface_flows_1@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_book__surface_flows_1@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_book__surface_flows_1@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_book__surface_flows_1@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_book__surface_flows_1@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_book__surface_flows_1@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_book__surface_flows_1@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_book__surface_flows_1@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__basic_2@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_codegen__basic_2@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__basic_2@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_codegen__basic_2@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__basic_2@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_codegen__basic_2@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__basic_2@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_codegen__basic_2@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__basic_3@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_codegen__basic_3@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__basic_3@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_codegen__basic_3@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__basic_3@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_codegen__basic_3@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__basic_3@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_codegen__basic_3@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__basic_union@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_codegen__basic_union@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__basic_union@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_codegen__basic_union@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__basic_union@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_codegen__basic_union@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__basic_union@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_codegen__basic_union@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__covid_tracing@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_codegen__covid_tracing@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__covid_tracing@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_codegen__covid_tracing@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__covid_tracing@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_codegen__covid_tracing@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__covid_tracing@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_codegen__covid_tracing@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__recv_expr@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_codegen__recv_expr@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__recv_expr@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_codegen__recv_expr@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__recv_expr@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_codegen__recv_expr@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__recv_expr@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_codegen__recv_expr@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__sort@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_codegen__sort@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__sort@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_codegen__sort@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__sort@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_codegen__sort@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__sort@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_codegen__sort@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__sort_by_key@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_codegen__sort_by_key@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__sort_by_key@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_codegen__sort_by_key@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__sort_by_key@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_codegen__sort_by_key@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__sort_by_key@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_codegen__sort_by_key@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__transitive_closure@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_codegen__transitive_closure@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__transitive_closure@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_codegen__transitive_closure@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_codegen__transitive_closure@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_codegen__transitive_closure@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_codegen__transitive_closure@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_codegen__transitive_closure@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_context__context_current_tick_start@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_context__context_current_tick_start@graphvis_dot.snap similarity index 81% rename from hydroflow/tests/snapshots/surface_context__context_current_tick_start@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_context__context_current_tick_start@graphvis_dot.snap index 95e059373182..a8c5c11f1ef5 100644 --- a/hydroflow/tests/snapshots/surface_context__context_current_tick_start@graphvis_dot.snap +++ b/dfir_rs/tests/snapshots/surface_context__context_current_tick_start@graphvis_dot.snap @@ -8,8 +8,8 @@ digraph { n1v1 [label="(n1v1) source_iter([()])", shape=invhouse, fillcolor="#88aaff"] n2v1 [label="(n2v1) map(|_| context.current_tick_start())", shape=invhouse, fillcolor="#88aaff"] n3v1 [label="(n3v1) defer_tick()", shape=invhouse, fillcolor="#88aaff"] - n4v1 [label="(n4v1) assert(|t: &hydroflow::web_time::SystemTime| t.elapsed().unwrap().as_nanos() > 0)", shape=invhouse, fillcolor="#88aaff"] - n5v1 [label="(n5v1) for_each(|t: hydroflow::web_time::SystemTime| {\l println!(\"Time between ticks: {:?}\", t.elapsed())\l})\l", shape=house, fillcolor="#ffff88"] + n4v1 [label="(n4v1) assert(|t: &dfir_rs::web_time::SystemTime| t.elapsed().unwrap().as_nanos() > 0)", shape=invhouse, fillcolor="#88aaff"] + n5v1 [label="(n5v1) for_each(|t: dfir_rs::web_time::SystemTime| {\l println!(\"Time between ticks: {:?}\", t.elapsed())\l})\l", shape=house, fillcolor="#ffff88"] n6v1 [label="(n6v1) handoff", shape=parallelogram, fillcolor="#ddddff"] n7v1 [label="(n7v1) identity()", shape=invhouse, fillcolor="#88aaff"] n8v1 [label="(n8v1) handoff", shape=parallelogram, fillcolor="#ddddff"] diff --git a/hydroflow/tests/snapshots/surface_context__context_current_tick_start@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_context__context_current_tick_start@graphvis_mermaid.snap similarity index 81% rename from hydroflow/tests/snapshots/surface_context__context_current_tick_start@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_context__context_current_tick_start@graphvis_mermaid.snap index ef98ed8cea68..1270d4f3b754 100644 --- a/hydroflow/tests/snapshots/surface_context__context_current_tick_start@graphvis_mermaid.snap +++ b/dfir_rs/tests/snapshots/surface_context__context_current_tick_start@graphvis_mermaid.snap @@ -11,8 +11,8 @@ linkStyle default stroke:#aaa 1v1[\"(1v1) source_iter([()])"/]:::pullClass 2v1[\"(2v1) map(|_| context.current_tick_start())"/]:::pullClass 3v1[\"(3v1) defer_tick()"/]:::pullClass -4v1[\"(4v1) assert(|t: &hydroflow::web_time::SystemTime| t.elapsed().unwrap().as_nanos() > 0)"/]:::pullClass -5v1[/"
(5v1)
for_each(|t: hydroflow::web_time::SystemTime| {
println!("Time between ticks: {:?}", t.elapsed())
})"\]:::pushClass +4v1[\"(4v1) assert(|t: &dfir_rs::web_time::SystemTime| t.elapsed().unwrap().as_nanos() > 0)"/]:::pullClass +5v1[/"
(5v1)
for_each(|t: dfir_rs::web_time::SystemTime| {
println!("Time between ticks: {:?}", t.elapsed())
})"\]:::pushClass 6v1["(6v1) handoff"]:::otherClass 7v1[\"(7v1) identity()"/]:::pullClass 8v1["(8v1) handoff"]:::otherClass diff --git a/hydroflow/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_context__context_current_tick_start_does_not_count_time_between_ticks_async@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_context__context_mut@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_context__context_mut@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_context__context_mut@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_context__context_mut@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_context__context_mut@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_context__context_mut@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_context__context_mut@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_context__context_mut@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_context__context_ref@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_context__context_ref@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_context__context_ref@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_context__context_ref@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_context__context_ref@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_context__context_ref@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_context__context_ref@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_context__context_ref@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_cross_singleton__basic@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_cross_singleton__basic@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_cross_singleton__basic@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_cross_singleton__basic@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_cross_singleton__basic@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_cross_singleton__basic@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_cross_singleton__basic@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_cross_singleton__basic@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_cross_singleton__union_defer_tick@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_multiset_static@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_difference__diff_multiset_static@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_multiset_static@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_multiset_static@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_multiset_static@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_difference__diff_multiset_static@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_multiset_static@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_multiset_static@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_multiset_static_tick@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_multiset_tick_static@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_multiset_timing@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_static@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_difference__diff_static@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_static@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_static@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_static@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_difference__diff_static@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_static@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_static@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_timing@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_difference__diff_timing@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_timing@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_timing@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_difference__diff_timing@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_difference__diff_timing@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_difference__diff_timing@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_difference__diff_timing@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_1_simplest.snap b/dfir_rs/tests/snapshots/surface_examples__example_1_simplest.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_1_simplest.snap rename to dfir_rs/tests/snapshots/surface_examples__example_1_simplest.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_2_simple_1.snap b/dfir_rs/tests/snapshots/surface_examples__example_2_simple_1.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_2_simple_1.snap rename to dfir_rs/tests/snapshots/surface_examples__example_2_simple_1.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_2_simple_2.snap b/dfir_rs/tests/snapshots/surface_examples__example_2_simple_2.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_2_simple_2.snap rename to dfir_rs/tests/snapshots/surface_examples__example_2_simple_2.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_3_stream.snap b/dfir_rs/tests/snapshots/surface_examples__example_3_stream.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_3_stream.snap rename to dfir_rs/tests/snapshots/surface_examples__example_3_stream.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_4_neighbors.snap b/dfir_rs/tests/snapshots/surface_examples__example_4_neighbors.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_4_neighbors.snap rename to dfir_rs/tests/snapshots/surface_examples__example_4_neighbors.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_5_reachability.snap b/dfir_rs/tests/snapshots/surface_examples__example_5_reachability.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_5_reachability.snap rename to dfir_rs/tests/snapshots/surface_examples__example_5_reachability.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_6_unreachability.snap b/dfir_rs/tests/snapshots/surface_examples__example_6_unreachability.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_6_unreachability.snap rename to dfir_rs/tests/snapshots/surface_examples__example_6_unreachability.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_naturals.snap b/dfir_rs/tests/snapshots/surface_examples__example_naturals.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_naturals.snap rename to dfir_rs/tests/snapshots/surface_examples__example_naturals.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_surface_flows_1_basic.snap b/dfir_rs/tests/snapshots/surface_examples__example_surface_flows_1_basic.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_surface_flows_1_basic.snap rename to dfir_rs/tests/snapshots/surface_examples__example_surface_flows_1_basic.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_surface_flows_2_varname.snap b/dfir_rs/tests/snapshots/surface_examples__example_surface_flows_2_varname.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_surface_flows_2_varname.snap rename to dfir_rs/tests/snapshots/surface_examples__example_surface_flows_2_varname.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_surface_flows_3_ports.snap b/dfir_rs/tests/snapshots/surface_examples__example_surface_flows_3_ports.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_surface_flows_3_ports.snap rename to dfir_rs/tests/snapshots/surface_examples__example_surface_flows_3_ports.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_surface_flows_4_context.snap b/dfir_rs/tests/snapshots/surface_examples__example_surface_flows_4_context.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_surface_flows_4_context.snap rename to dfir_rs/tests/snapshots/surface_examples__example_surface_flows_4_context.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_syntax_empty.snap b/dfir_rs/tests/snapshots/surface_examples__example_syntax_empty.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_syntax_empty.snap rename to dfir_rs/tests/snapshots/surface_examples__example_syntax_empty.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_syntax_hello_world.snap b/dfir_rs/tests/snapshots/surface_examples__example_syntax_hello_world.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_syntax_hello_world.snap rename to dfir_rs/tests/snapshots/surface_examples__example_syntax_hello_world.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_syntax_input.snap b/dfir_rs/tests/snapshots/surface_examples__example_syntax_input.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_syntax_input.snap rename to dfir_rs/tests/snapshots/surface_examples__example_syntax_input.snap diff --git a/hydroflow/tests/snapshots/surface_examples__example_syntax_output.snap b/dfir_rs/tests/snapshots/surface_examples__example_syntax_output.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_examples__example_syntax_output.snap rename to dfir_rs/tests/snapshots/surface_examples__example_syntax_output.snap diff --git a/hydroflow/tests/snapshots/surface_flow_props__basic@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_flow_props__basic@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_flow_props__basic@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_flow_props__basic@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_flow_props__basic@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_flow_props__basic@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_flow_props__basic@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_flow_props__basic@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_flow_props__union_warning@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_flow_props__union_warning@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_flow_props__union_warning@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_flow_props__union_warning@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_flow_props__union_warning@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_flow_props__union_warning@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_flow_props__union_warning@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_flow_props__union_warning@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_fold__fold_sort@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_fold__fold_sort@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold__fold_sort@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_fold__fold_sort@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_fold__fold_sort@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_fold__fold_sort@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold__fold_sort@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_fold__fold_sort@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_fold__fold_static@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_fold__fold_static@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold__fold_static@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_fold__fold_static@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_fold__fold_static@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_fold__fold_static@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold__fold_static@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_fold__fold_static@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_fold__fold_static_join@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_fold__fold_static_join@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold__fold_static_join@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_fold__fold_static_join@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_fold__fold_static_join@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_fold__fold_static_join@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold__fold_static_join@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_fold__fold_static_join@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_fold__fold_tick@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_fold__fold_tick@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold__fold_tick@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_fold__fold_tick@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_fold__fold_tick@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_fold__fold_tick@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold__fold_tick@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_fold__fold_tick@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_infer_basic@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_static@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_fold_keyed__fold_keyed_tick@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_backward@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_forward@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_forwardref__forwardref_basic_middle@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join__static_static@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join__static_static@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join__static_static@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join__static_static@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join__static_static@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join__static_static@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join__static_static@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join__static_static@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join__static_tick@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join__static_tick@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join__static_tick@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join__static_tick@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join__static_tick@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join__static_tick@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join__static_tick@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join__static_tick@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join__tick_static@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join__tick_static@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join__tick_static@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join__tick_static@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join__tick_static@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join__tick_static@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join__tick_static@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join__tick_static@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join__tick_tick@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join__tick_tick@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join__tick_tick@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join__tick_tick@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join__tick_tick@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join__tick_tick@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join__tick_tick@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join__tick_tick@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join_fused__static_static_lhs_blocking_rhs_streaming@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join_fused__static_static_lhs_streaming_rhs_blocking@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join_fused__static_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join_fused__static_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_blocking_rhs_streaming@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_fold_rhs_reduce@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_join_fused__tick_tick_lhs_streaming_rhs_blocking@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product_1401@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism__cartesian_product_tick_state@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism__join@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism__join@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism__join@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism__join@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism__join@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism__join@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism__join@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism__join@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_identity@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_lattice_bimorphism_persist_insertion__cartesian_product_multi_tick_tee@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_loop__flo_nested@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_loop__flo_nested@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_loop__flo_nested@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_loop__flo_nested@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_loop__flo_nested@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_loop__flo_nested@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_loop__flo_nested@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_loop__flo_nested@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_loop__flo_syntax@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_loop__flo_syntax@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_loop__flo_syntax@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_loop__flo_syntax@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_loop__flo_syntax@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_loop__flo_syntax@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_loop__flo_syntax@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_loop__flo_syntax@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_multiset_delta__multiset_delta@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_persist__persist@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_persist__persist@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_persist__persist@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_persist__persist@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_basic@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_persist__persist_basic@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_basic@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_basic@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_basic@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_persist__persist_basic@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_basic@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_basic@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_mut@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_persist__persist_mut@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_mut@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_mut@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_mut@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_persist__persist_mut@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_mut@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_mut@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_mut_keyed@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_pull@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_persist__persist_pull@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_pull@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_pull@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_pull@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_persist__persist_pull@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_pull@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_pull@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_push@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_persist__persist_push@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_push@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_push@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_push@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_persist__persist_push@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_push@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_push@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_replay_join@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_persist__persist_replay_join@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_replay_join@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_replay_join@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_persist__persist_replay_join@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_persist__persist_replay_join@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_persist__persist_replay_join@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_persist__persist_replay_join@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_python__python_basic@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_python__python_basic@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_python__python_basic@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_python__python_basic@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_python__python_basic@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_python__python_basic@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_python__python_basic@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_python__python_basic@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_python__python_too_many_args@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_python__python_too_many_args@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_python__python_too_many_args@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_python__python_too_many_args@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_python__python_too_many_args@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_python__python_too_many_args@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_python__python_too_many_args@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_python__python_too_many_args@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_python__python_two_args@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_python__python_two_args@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_python__python_two_args@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_python__python_two_args@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_python__python_two_args@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_python__python_two_args@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_python__python_two_args@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_python__python_two_args@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_reduce__reduce@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_reduce__reduce@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_reduce__reduce@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_reduce__reduce@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_reduce__reduce@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_reduce__reduce@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_reduce__reduce@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_reduce__reduce@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_reduce__reduce_static@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_reduce__reduce_static@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_reduce__reduce_static@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_reduce__reduce_static@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_reduce__reduce_static@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_reduce__reduce_static@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_reduce__reduce_static@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_reduce__reduce_static@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_reduce__reduce_sum@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_reduce__reduce_sum@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_reduce__reduce_sum@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_reduce__reduce_sum@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_reduce__reduce_sum@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_reduce__reduce_sum@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_reduce__reduce_sum@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_reduce__reduce_sum@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_reduce__reduce_tick@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_reduce__reduce_tick@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_reduce__reduce_tick@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_reduce__reduce_tick@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_reduce__reduce_tick@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_reduce__reduce_tick@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_reduce__reduce_tick@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_reduce__reduce_tick@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_fold_keyed@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_persist@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_scheduling__issue_800_1050_reduce_keyed@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_scheduling__nospin_issue_961@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_scheduling__nospin_issue_961_complicated@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_scheduling__persist_stratum_run_async@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_scheduling__persist_stratum_run_available@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__stratum_loop@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_scheduling__stratum_loop@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__stratum_loop@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_scheduling__stratum_loop@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__stratum_loop@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_scheduling__stratum_loop@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__stratum_loop@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_scheduling__stratum_loop@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__tick_loop@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_scheduling__tick_loop@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__tick_loop@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_scheduling__tick_loop@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_scheduling__tick_loop@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_scheduling__tick_loop@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_scheduling__tick_loop@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_scheduling__tick_loop@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__fold_cross@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_singleton__fold_cross@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__fold_cross@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_singleton__fold_cross@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__fold_cross@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_singleton__fold_cross@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__fold_cross@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_singleton__fold_cross@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__fold_singleton@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_singleton__fold_singleton@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__fold_singleton@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_singleton__fold_singleton@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__fold_singleton@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_singleton__fold_singleton@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__fold_singleton@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_singleton__fold_singleton@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_singleton__fold_singleton_push@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__multi_tick@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_singleton__multi_tick@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__multi_tick@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_singleton__multi_tick@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__multi_tick@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_singleton__multi_tick@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__multi_tick@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_singleton__multi_tick@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__reduce_singleton@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_singleton__reduce_singleton@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__reduce_singleton@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_singleton__reduce_singleton@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__reduce_singleton@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_singleton__reduce_singleton@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__reduce_singleton@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_singleton__reduce_singleton@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_singleton__reduce_singleton_push@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__state@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_singleton__state@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__state@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_singleton__state@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__state@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_singleton__state@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__state@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_singleton__state@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__state_unused@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_singleton__state_unused@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__state_unused@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_singleton__state_unused@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_singleton__state_unused@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_singleton__state_unused@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_singleton__state_unused@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_singleton__state_unused@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__defer_lazy@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_stratum__defer_lazy@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__defer_lazy@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_stratum__defer_lazy@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__defer_lazy@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_stratum__defer_lazy@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__defer_lazy@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_stratum__defer_lazy@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__difference_a@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_stratum__difference_a@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__difference_a@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_stratum__difference_a@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__difference_a@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_stratum__difference_a@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__difference_a@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_stratum__difference_a@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__difference_b@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_stratum__difference_b@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__difference_b@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_stratum__difference_b@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__difference_b@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_stratum__difference_b@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__difference_b@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_stratum__difference_b@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_stratum__subgraph_stratum_consolidation@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_stratum__surface_syntax_graph_unreachability@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__tick_loop_1@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_stratum__tick_loop_1@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__tick_loop_1@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_stratum__tick_loop_1@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__tick_loop_1@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_stratum__tick_loop_1@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__tick_loop_1@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_stratum__tick_loop_1@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__tick_loop_2@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_stratum__tick_loop_2@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__tick_loop_2@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_stratum__tick_loop_2@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__tick_loop_2@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_stratum__tick_loop_2@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__tick_loop_2@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_stratum__tick_loop_2@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__tick_loop_3@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_stratum__tick_loop_3@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__tick_loop_3@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_stratum__tick_loop_3@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_stratum__tick_loop_3@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_stratum__tick_loop_3@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_stratum__tick_loop_3@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_stratum__tick_loop_3@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_unique__unique@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_unique__unique@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_unique__unique@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_unique__unique@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique_static_pull@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_unique__unique_static_pull@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique_static_pull@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_unique__unique_static_pull@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique_static_pull@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_unique__unique_static_pull@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique_static_pull@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_unique__unique_static_pull@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique_static_push@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_unique__unique_static_push@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique_static_push@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_unique__unique_static_push@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique_static_push@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_unique__unique_static_push@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique_static_push@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_unique__unique_static_push@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique_tick_pull@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_unique__unique_tick_pull@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique_tick_pull@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_unique__unique_tick_pull@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique_tick_pull@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_unique__unique_tick_pull@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique_tick_pull@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_unique__unique_tick_pull@graphvis_mermaid.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique_tick_push@graphvis_dot.snap b/dfir_rs/tests/snapshots/surface_unique__unique_tick_push@graphvis_dot.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique_tick_push@graphvis_dot.snap rename to dfir_rs/tests/snapshots/surface_unique__unique_tick_push@graphvis_dot.snap diff --git a/hydroflow/tests/snapshots/surface_unique__unique_tick_push@graphvis_mermaid.snap b/dfir_rs/tests/snapshots/surface_unique__unique_tick_push@graphvis_mermaid.snap similarity index 100% rename from hydroflow/tests/snapshots/surface_unique__unique_tick_push@graphvis_mermaid.snap rename to dfir_rs/tests/snapshots/surface_unique__unique_tick_push@graphvis_mermaid.snap diff --git a/hydroflow/tests/surface_async.rs b/dfir_rs/tests/surface_async.rs similarity index 84% rename from hydroflow/tests/surface_async.rs rename to dfir_rs/tests/surface_async.rs index 08ed6b5af042..ef2d17e71b46 100644 --- a/hydroflow/tests/surface_async.rs +++ b/dfir_rs/tests/surface_async.rs @@ -8,16 +8,16 @@ use std::net::{Ipv4Addr, SocketAddr}; use std::time::Duration; use bytes::Bytes; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{collect_ready_async, ready_iter, tcp_lines}; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax, rassert, rassert_eq}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{collect_ready_async, ready_iter, tcp_lines}; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax, rassert, rassert_eq}; use multiplatform_test::multiplatform_test; use tokio::net::{TcpListener, TcpStream, UdpSocket}; use tokio::task::LocalSet; use tokio_util::codec::{BytesCodec, FramedWrite, LinesCodec}; use tracing::Instrument; -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] pub async fn test_echo_udp() -> Result<(), Box> { let local = LocalSet::new(); @@ -28,10 +28,10 @@ pub async fn test_echo_udp() -> Result<(), Box> { // Server: let serv = local.spawn_local(async { let socket = server_socket; - let (udp_send, udp_recv, _) = hydroflow::util::udp_lines(socket); + let (udp_send, udp_recv, _) = dfir_rs::util::udp_lines(socket); println!("Server live!"); - let (seen_send, seen_recv) = hydroflow::util::unbounded_channel(); + let (seen_send, seen_recv) = dfir_rs::util::unbounded_channel(); let mut df: Hydroflow = dfir_syntax! { recv = source_stream(udp_recv) @@ -63,9 +63,9 @@ pub async fn test_echo_udp() -> Result<(), Box> { let socket = UdpSocket::bind((Ipv4Addr::UNSPECIFIED, 0)) .await .unwrap(); - let (send_udp, recv_udp, _) = hydroflow::util::udp_lines(socket); + let (send_udp, recv_udp, _) = dfir_rs::util::udp_lines(socket); - let (seen_send, seen_recv) = hydroflow::util::unbounded_channel(); + let (seen_send, seen_recv) = dfir_rs::util::unbounded_channel(); let mut df = dfir_syntax! { recv = source_stream(recv_udp) @@ -94,9 +94,9 @@ pub async fn test_echo_udp() -> Result<(), Box> { let socket = UdpSocket::bind((Ipv4Addr::UNSPECIFIED, 0)) .await .unwrap(); - let (send_udp, recv_udp, _) = hydroflow::util::udp_lines(socket); + let (send_udp, recv_udp, _) = dfir_rs::util::udp_lines(socket); - let (seen_send, seen_recv) = hydroflow::util::unbounded_channel(); + let (seen_send, seen_recv) = dfir_rs::util::unbounded_channel(); let mut df = dfir_syntax! { recv = source_stream(recv_udp) @@ -128,7 +128,7 @@ pub async fn test_echo_udp() -> Result<(), Box> { Ok(()) } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] pub async fn test_echo_tcp() -> Result<(), Box> { let local = LocalSet::new(); @@ -143,7 +143,7 @@ pub async fn test_echo_tcp() -> Result<(), Box> { println!("Server accepted connection!"); - let (seen_send, seen_recv) = hydroflow::util::unbounded_channel(); + let (seen_send, seen_recv) = dfir_rs::util::unbounded_channel(); let mut df: Hydroflow = dfir_syntax! { rev = source_stream(server_recv) @@ -170,7 +170,7 @@ pub async fn test_echo_tcp() -> Result<(), Box> { println!("Client connected!"); - let (seen_send, seen_recv) = hydroflow::util::unbounded_channel(); + let (seen_send, seen_recv) = dfir_rs::util::unbounded_channel(); let mut df = dfir_syntax! { recv = source_stream(client_recv) @@ -205,10 +205,10 @@ pub async fn test_echo_tcp() -> Result<(), Box> { Ok(()) } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] pub async fn test_echo() { // An edge in the input data = a pair of `usize` vertex IDs. - let (lines_send, lines_recv) = hydroflow::util::unbounded_channel::(); + let (lines_send, lines_recv) = dfir_rs::util::unbounded_channel::(); // LinesCodec separates each line from `lines_recv` with `\n`. let stdout_lines = FramedWrite::new(tokio::io::stdout(), LinesCodec::new()); @@ -231,14 +231,14 @@ pub async fn test_echo() { tokio::time::sleep(Duration::from_secs(1)).await; } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] pub async fn test_futures_stream_sink() { const MAX: usize = 20; let (mut send, recv) = futures::channel::mpsc::channel::(5); send.try_send(0).unwrap(); - let (seen_send, seen_recv) = hydroflow::util::unbounded_channel(); + let (seen_send, seen_recv) = dfir_rs::util::unbounded_channel(); let mut df = dfir_syntax! { recv = source_stream(recv) -> tee(); @@ -256,10 +256,10 @@ pub async fn test_futures_stream_sink() { assert_eq!(&std::array::from_fn::<_, MAX, _>(|i| i), &*seen); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn asynctest_dest_sink_bounded_channel() { // In this example we use a _bounded_ channel for our `Sink`. This is for demonstration only, - // instead you should use [`hydroflow::util::unbounded_channel`]. A bounded channel results in + // instead you should use [`dfir_rs::util::unbounded_channel`]. A bounded channel results in // `Hydroflow` buffering items internally instead of within the channel. let (send, recv) = tokio::sync::mpsc::channel::(5); let send = tokio_util::sync::PollSender::new(send); @@ -282,7 +282,7 @@ async fn asynctest_dest_sink_bounded_channel() { assert_eq!(&[5, 6, 7, 8, 9], &*out); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn asynctest_dest_sink_duplex() { use bytes::Bytes; use tokio::io::AsyncReadExt; @@ -312,7 +312,7 @@ async fn asynctest_dest_sink_duplex() { assert_eq!(b"\x05hello\x05world", &*buf); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn asynctest_dest_asyncwrite_duplex() { use tokio::io::AsyncReadExt; @@ -337,11 +337,11 @@ async fn asynctest_dest_asyncwrite_duplex() { assert_eq!(b"helloworld", &*buf); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn asynctest_source_stream() { - let (a_send, a_recv) = hydroflow::util::unbounded_channel::(); - let (b_send, b_recv) = hydroflow::util::unbounded_channel::(); - let (c_send, c_recv) = hydroflow::util::unbounded_channel::(); + let (a_send, a_recv) = dfir_rs::util::unbounded_channel::(); + let (b_send, b_recv) = dfir_rs::util::unbounded_channel::(); + let (c_send, c_recv) = dfir_rs::util::unbounded_channel::(); let task_a = tokio::task::spawn_local(async move { let mut flow = dfir_syntax! { @@ -378,10 +378,10 @@ async fn asynctest_source_stream() { /// /// This test is a little bit race-ey... if for some insane reason a tick (task_b) runs longer than /// the send loop delay (task_a). -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn asynctest_check_state_yielding() { - let (a_send, a_recv) = hydroflow::util::unbounded_channel::(); - let (b_send, mut b_recv) = hydroflow::util::unbounded_channel::(); + let (a_send, a_recv) = dfir_rs::util::unbounded_channel::(); + let (b_send, mut b_recv) = dfir_rs::util::unbounded_channel::(); let task_a = tokio::task::spawn_local( async move { @@ -423,9 +423,9 @@ async fn asynctest_check_state_yielding() { task_b.await.unwrap(); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn asynctest_repeat_iter() { - let (b_send, b_recv) = hydroflow::util::unbounded_channel::(); + let (b_send, b_recv) = dfir_rs::util::unbounded_channel::(); let mut hf = dfir_syntax! { source_iter(0..3) -> persist::<'static>() @@ -437,10 +437,10 @@ async fn asynctest_repeat_iter() { assert_eq!(&[0, 1, 2], &*seen); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn asynctest_event_repeat_iter() { - let (a_send, a_recv) = hydroflow::util::unbounded_channel::(); - let (b_send, b_recv) = hydroflow::util::unbounded_channel::(); + let (a_send, a_recv) = dfir_rs::util::unbounded_channel::(); + let (b_send, b_recv) = dfir_rs::util::unbounded_channel::(); let mut hf = dfir_syntax! { source_iter(0..3) -> persist::<'static>() -> my_union; @@ -469,19 +469,18 @@ async fn asynctest_event_repeat_iter() { assert_eq!(&[0, 1, 2, 0, 1, 2, 10], &*seen); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn asynctest_tcp() { - let (tx_out, rx_out) = hydroflow::util::unbounded_channel::(); + let (tx_out, rx_out) = dfir_rs::util::unbounded_channel::(); - let (tx, rx, server_addr) = - hydroflow::util::bind_tcp_lines("127.0.0.1:0".parse().unwrap()).await; + let (tx, rx, server_addr) = dfir_rs::util::bind_tcp_lines("127.0.0.1:0".parse().unwrap()).await; let mut echo_server = dfir_syntax! { source_stream(rx) -> filter_map(Result::ok) -> dest_sink(tx); }; - let (tx, rx) = hydroflow::util::connect_tcp_lines(); + let (tx, rx) = dfir_rs::util::connect_tcp_lines(); let mut echo_client = dfir_syntax! { source_iter([("Hello".to_owned(), server_addr)]) -> dest_sink(tx); @@ -503,19 +502,18 @@ async fn asynctest_tcp() { assert_eq!(&["Hello".to_owned()], &*seen); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn asynctest_udp() { - let (tx_out, rx_out) = hydroflow::util::unbounded_channel::(); + let (tx_out, rx_out) = dfir_rs::util::unbounded_channel::(); - let (tx, rx, server_addr) = - hydroflow::util::bind_udp_lines("127.0.0.1:0".parse().unwrap()).await; + let (tx, rx, server_addr) = dfir_rs::util::bind_udp_lines("127.0.0.1:0".parse().unwrap()).await; let mut echo_server = dfir_syntax! { source_stream(rx) -> filter_map(Result::ok) -> dest_sink(tx); }; - let (tx, rx, _) = hydroflow::util::bind_udp_lines("127.0.0.1:0".parse().unwrap()).await; + let (tx, rx, _) = dfir_rs::util::bind_udp_lines("127.0.0.1:0".parse().unwrap()).await; let mut echo_client = dfir_syntax! { source_iter([("Hello".to_owned(), server_addr)]) -> dest_sink(tx); diff --git a/hydroflow/tests/surface_batch.rs b/dfir_rs/tests/surface_batch.rs similarity index 71% rename from hydroflow/tests/surface_batch.rs rename to dfir_rs/tests/surface_batch.rs index da8820ac2eac..f4329bf28920 100644 --- a/hydroflow/tests/surface_batch.rs +++ b/dfir_rs/tests/surface_batch.rs @@ -1,11 +1,11 @@ -use hydroflow::util::collect_ready; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::util::collect_ready; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_basic_2() { - let (signal_tx, signal_rx) = hydroflow::util::unbounded_channel::<()>(); - let (egress_tx, mut egress_rx) = hydroflow::util::unbounded_channel(); + let (signal_tx, signal_rx) = dfir_rs::util::unbounded_channel::<()>(); + let (egress_tx, mut egress_rx) = dfir_rs::util::unbounded_channel(); let mut df = dfir_syntax! { gate = defer_signal(); diff --git a/hydroflow/tests/surface_book.rs b/dfir_rs/tests/surface_book.rs similarity index 86% rename from hydroflow/tests/surface_book.rs rename to dfir_rs/tests/surface_book.rs index e32f25e4ab1a..289d60155754 100644 --- a/hydroflow/tests/surface_book.rs +++ b/dfir_rs/tests/surface_book.rs @@ -1,10 +1,10 @@ -use hydroflow::assert_graphvis_snapshots; +use dfir_rs::assert_graphvis_snapshots; use multiplatform_test::multiplatform_test; use tokio::time::Instant; #[multiplatform_test] fn test_surface_flows_1() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { my_tee = source_iter(vec!["Hello", "world"]) -> tee(); my_tee[0] -> map(|x| x.to_uppercase()) -> [0]my_union; my_tee[1] -> map(|x| x.to_lowercase()) -> [1]my_union; @@ -14,11 +14,11 @@ fn test_surface_flows_1() { df.run_available(); } -#[hydroflow::test] +#[dfir_rs::test] async fn test_source_interval() { use std::time::Duration; - use hydroflow::dfir_syntax; + use dfir_rs::dfir_syntax; let mut hf = dfir_syntax! { source_interval(Duration::from_secs(1)) diff --git a/hydroflow/tests/surface_codegen.rs b/dfir_rs/tests/surface_codegen.rs similarity index 85% rename from hydroflow/tests/surface_codegen.rs rename to dfir_rs/tests/surface_codegen.rs index de95b0dfb1dd..9314e988da19 100644 --- a/hydroflow/tests/surface_codegen.rs +++ b/dfir_rs/tests/surface_codegen.rs @@ -1,10 +1,10 @@ use std::collections::HashSet; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::util::collect_ready; -use hydroflow::util::multiset::HashMultiSet; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::util::collect_ready; +use dfir_rs::util::multiset::HashMultiSet; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; // TODO(mingwei): custom operators? How to handle in syntax? How to handle state? @@ -26,7 +26,7 @@ use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_basic_2() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter([1]) -> for_each(|v| out_send.send(v).unwrap()); @@ -39,7 +39,7 @@ pub fn test_basic_2() { #[multiplatform_test] pub fn test_basic_3() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter([1]) -> map(|v| v + 1) -> for_each(|v| out_send.send(v).unwrap()); @@ -52,7 +52,7 @@ pub fn test_basic_3() { #[multiplatform_test] pub fn test_basic_union() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { m = union() -> for_each(|v| out_send.send(v).unwrap()); @@ -67,7 +67,7 @@ pub fn test_basic_union() { #[multiplatform_test] pub fn test_basic_tee() { - let (out_send_a, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send_a, mut out_recv) = dfir_rs::util::unbounded_channel::(); let out_send_b = out_send_a.clone(); let mut df = dfir_syntax! { @@ -131,7 +131,7 @@ pub fn test_large_diamond() { /// Test that source_stream can handle "complex" expressions. #[multiplatform_test] pub fn test_recv_expr() { - let send_recv = hydroflow::util::unbounded_channel::(); + let send_recv = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_stream(send_recv.1) @@ -165,9 +165,9 @@ pub fn test_join_order() { pub fn test_multiset_join() { // HalfJoinStateSetUnion { - use hydroflow::compiled::pull::HalfSetJoinState; + use dfir_rs::compiled::pull::HalfSetJoinState; - let (out_tx, mut out_rx) = hydroflow::util::unbounded_channel::<(usize, (usize, usize))>(); + let (out_tx, mut out_rx) = dfir_rs::util::unbounded_channel::<(usize, (usize, usize))>(); let mut df = dfir_syntax! { my_join = join::() -> for_each(|m| out_tx.send(m).unwrap()); @@ -183,8 +183,8 @@ pub fn test_multiset_join() { // HalfMultisetJoinState lhs biased { - use hydroflow::compiled::pull::HalfMultisetJoinState; - let (out_tx, mut out_rx) = hydroflow::util::unbounded_channel::<(usize, (usize, usize))>(); + use dfir_rs::compiled::pull::HalfMultisetJoinState; + let (out_tx, mut out_rx) = dfir_rs::util::unbounded_channel::<(usize, (usize, usize))>(); let mut df = dfir_syntax! { my_join = join::() -> for_each(|m| out_tx.send(m).unwrap()); @@ -200,8 +200,8 @@ pub fn test_multiset_join() { // HalfMultisetJoinState rhs biased { - use hydroflow::compiled::pull::HalfMultisetJoinState; - let (out_tx, mut out_rx) = hydroflow::util::unbounded_channel::<(usize, (usize, usize))>(); + use dfir_rs::compiled::pull::HalfMultisetJoinState; + let (out_tx, mut out_rx) = dfir_rs::util::unbounded_channel::<(usize, (usize, usize))>(); let mut df = dfir_syntax! { my_join = join::() -> for_each(|m| out_tx.send(m).unwrap()); @@ -218,7 +218,7 @@ pub fn test_multiset_join() { #[multiplatform_test] pub fn test_cross_join() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, &str)>(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, &str)>(); let mut df = dfir_syntax! { cj = cross_join() -> for_each(|v| out_send.send(v).unwrap()); @@ -247,7 +247,7 @@ pub fn test_cross_join() { #[multiplatform_test] pub fn test_cross_join_multiset() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, &str)>(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, &str)>(); let mut df = dfir_syntax! { cj = cross_join_multiset() -> for_each(|v| out_send.send(v).unwrap()); @@ -283,9 +283,9 @@ pub fn test_cross_join_multiset() { #[multiplatform_test] pub fn test_defer_tick() { - let (inp_send, inp_recv) = hydroflow::util::unbounded_channel::(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); - let mut flow = hydroflow::dfir_syntax! { + let (inp_send, inp_recv) = dfir_rs::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); + let mut flow = dfir_rs::dfir_syntax! { inp = source_stream(inp_recv) -> tee(); diff = difference() -> for_each(|x| out_send.send(x).unwrap()); inp -> [pos]diff; @@ -311,9 +311,9 @@ pub fn test_defer_tick() { #[multiplatform_test] pub fn test_anti_join() { - let (inp_send, inp_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let mut flow = hydroflow::dfir_syntax! { + let (inp_send, inp_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let mut flow = dfir_rs::dfir_syntax! { inp = source_stream(inp_recv) -> tee(); diff = anti_join() -> sort() -> for_each(|x| out_send.send(x).unwrap()); inp -> [pos]diff; @@ -340,10 +340,10 @@ pub fn test_anti_join() { #[multiplatform_test] pub fn test_anti_join_static() { - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let mut flow = hydroflow::dfir_syntax! { + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let mut flow = dfir_rs::dfir_syntax! { pos = source_stream(pos_recv); neg = source_stream(neg_recv); pos -> [pos]diff_static; @@ -370,10 +370,10 @@ pub fn test_anti_join_static() { #[multiplatform_test] pub fn test_anti_join_tick_static() { - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let mut flow = hydroflow::dfir_syntax! { + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let mut flow = dfir_rs::dfir_syntax! { pos = source_stream(pos_recv); neg = source_stream(neg_recv); pos -> [pos]diff_static; @@ -402,10 +402,10 @@ pub fn test_anti_join_tick_static() { #[multiplatform_test] pub fn test_anti_join_multiset_tick_static() { - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let mut flow = hydroflow::dfir_syntax! { + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let mut flow = dfir_rs::dfir_syntax! { pos = source_stream(pos_recv); neg = source_stream(neg_recv); pos -> [pos]diff_static; @@ -434,10 +434,10 @@ pub fn test_anti_join_multiset_tick_static() { #[multiplatform_test] pub fn test_anti_join_multiset_static() { - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let mut flow = hydroflow::dfir_syntax! { + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let mut flow = dfir_rs::dfir_syntax! { pos = source_stream(pos_recv); neg = source_stream(neg_recv); pos -> [pos]diff_static; @@ -464,9 +464,9 @@ pub fn test_anti_join_multiset_static() { #[multiplatform_test] pub fn test_anti_join_multiset() { - let (inp_send, inp_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let mut flow = hydroflow::dfir_syntax! { + let (inp_send, inp_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let mut flow = dfir_rs::dfir_syntax! { inp = source_stream(inp_recv) -> tee(); diff = anti_join_multiset() -> sort() -> for_each(|x| out_send.send(x).unwrap()); inp -> [pos]diff; @@ -493,7 +493,7 @@ pub fn test_anti_join_multiset() { #[multiplatform_test] pub fn test_sort() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_stream(items_recv) @@ -542,7 +542,7 @@ fn test_sort_by_owned() { y: i8, } - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let dummies: Vec = vec![ Dummy { @@ -569,9 +569,9 @@ fn test_sort_by_owned() { #[multiplatform_test] pub fn test_channel_minimal() { - let (send, recv) = hydroflow::util::unbounded_channel::(); + let (send, recv) = dfir_rs::util::unbounded_channel::(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df1 = dfir_syntax! { source_iter([1, 2, 3]) -> for_each(|x| { send.send(x).unwrap(); }); @@ -597,9 +597,9 @@ pub fn test_channel_minimal() { #[multiplatform_test] pub fn test_surface_syntax_reachability_generated() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pairs_send, pairs_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (pairs_send, pairs_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df: Hydroflow = dfir_syntax! { reached_vertices = union() -> map(|v| (v, ())); @@ -651,9 +651,9 @@ pub fn test_surface_syntax_reachability_generated() { #[multiplatform_test] pub fn test_transitive_closure() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pairs_send, pairs_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (pairs_send, pairs_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut df = dfir_syntax! { // edge(x,y) :- link(x,y) @@ -704,7 +704,7 @@ pub fn test_transitive_closure() { #[multiplatform_test] pub fn test_covid_tracing() { - use hydroflow::util::unbounded_channel; + use dfir_rs::util::unbounded_channel; const TRANSMISSIBLE_DURATION: usize = 14; // Days. @@ -854,7 +854,7 @@ pub fn test_assert_failures() { pub fn test_iter_stream_batches() { const ITEMS: usize = 100; const BATCH: usize = 5; - let stream = hydroflow::util::iter_batches_stream(0..ITEMS, BATCH); + let stream = dfir_rs::util::iter_batches_stream(0..ITEMS, BATCH); // expect 5 items per tick. let expected: Vec<_> = (0..ITEMS) diff --git a/hydroflow/tests/surface_compile_fail.rs b/dfir_rs/tests/surface_compile_fail.rs similarity index 100% rename from hydroflow/tests/surface_compile_fail.rs rename to dfir_rs/tests/surface_compile_fail.rs diff --git a/hydroflow/tests/surface_context.rs b/dfir_rs/tests/surface_context.rs similarity index 96% rename from hydroflow/tests/surface_context.rs rename to dfir_rs/tests/surface_context.rs index 9126fc5afacf..0358529da6a4 100644 --- a/hydroflow/tests/surface_context.rs +++ b/dfir_rs/tests/surface_context.rs @@ -2,7 +2,7 @@ use std::cell::Cell; use std::rc::Rc; use dfir_macro::dfir_test; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; use web_time::Duration; @@ -30,7 +30,7 @@ pub fn test_context_mut() { df.run_available(); } -#[multiplatform_test(hydroflow)] +#[multiplatform_test(dfir)] pub async fn test_context_current_tick_start_does_not_count_time_between_ticks_async() { let time = Rc::new(Cell::new(None)); diff --git a/hydroflow/tests/surface_cross_singleton.rs b/dfir_rs/tests/surface_cross_singleton.rs similarity index 82% rename from hydroflow/tests/surface_cross_singleton.rs rename to dfir_rs/tests/surface_cross_singleton.rs index b6c107fb2cc8..3fa12975ab82 100644 --- a/hydroflow/tests/surface_cross_singleton.rs +++ b/dfir_rs/tests/surface_cross_singleton.rs @@ -1,11 +1,11 @@ -use hydroflow::util::collect_ready; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::util::collect_ready; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; #[multiplatform_test(test, wasm, env_tracing)] pub fn test_basic() { - let (single_tx, single_rx) = hydroflow::util::unbounded_channel::<()>(); - let (egress_tx, mut egress_rx) = hydroflow::util::unbounded_channel(); + let (single_tx, single_rx) = dfir_rs::util::unbounded_channel::<()>(); + let (egress_tx, mut egress_rx) = dfir_rs::util::unbounded_channel(); let mut df = dfir_syntax! { join = cross_singleton(); @@ -29,8 +29,8 @@ pub fn test_basic() { #[multiplatform_test(test, wasm, env_tracing)] pub fn test_union_defer_tick() { - let (cross_tx, cross_rx) = hydroflow::util::unbounded_channel::(); - let (egress_tx, mut egress_rx) = hydroflow::util::unbounded_channel(); + let (cross_tx, cross_rx) = dfir_rs::util::unbounded_channel::(); + let (egress_tx, mut egress_rx) = dfir_rs::util::unbounded_channel(); let mut df = dfir_syntax! { teed_in = source_stream(cross_rx) -> sort() -> tee(); diff --git a/hydroflow/tests/surface_demux_enum.rs b/dfir_rs/tests/surface_demux_enum.rs similarity index 96% rename from hydroflow/tests/surface_demux_enum.rs rename to dfir_rs/tests/surface_demux_enum.rs index 71a893511042..b39188818f35 100644 --- a/hydroflow/tests/surface_demux_enum.rs +++ b/dfir_rs/tests/surface_demux_enum.rs @@ -1,5 +1,5 @@ -use hydroflow::dfir_syntax; -use hydroflow::util::demux_enum::{DemuxEnum, DemuxEnumBase}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::demux_enum::{DemuxEnum, DemuxEnumBase}; use multiplatform_test::multiplatform_test; use pusherator::for_each::ForEach; @@ -128,7 +128,7 @@ pub fn test_demux_enum_generic() { fn test_zero_variants() { #[derive(DemuxEnum)] enum Never {} - let (_tx, rx) = hydroflow::util::unbounded_channel::(); + let (_tx, rx) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_stream(rx) diff --git a/hydroflow/tests/surface_demux_partition.rs b/dfir_rs/tests/surface_demux_partition.rs similarity index 96% rename from hydroflow/tests/surface_demux_partition.rs rename to dfir_rs/tests/surface_demux_partition.rs index ddc3d8510df0..3e46f56a5ce3 100644 --- a/hydroflow/tests/surface_demux_partition.rs +++ b/dfir_rs/tests/surface_demux_partition.rs @@ -1,5 +1,5 @@ -use hydroflow::dfir_syntax; -use hydroflow::util::collect_ready; +use dfir_rs::dfir_syntax; +use dfir_rs::util::collect_ready; use multiplatform_test::multiplatform_test; #[multiplatform_test] @@ -10,7 +10,7 @@ pub fn test_demux_1() { Square(f64), } - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { my_demux = source_iter([ diff --git a/hydroflow/tests/surface_difference.rs b/dfir_rs/tests/surface_difference.rs similarity index 79% rename from hydroflow/tests/surface_difference.rs rename to dfir_rs/tests/surface_difference.rs index 6b52949fb90a..7594b14e3718 100644 --- a/hydroflow/tests/surface_difference.rs +++ b/dfir_rs/tests/surface_difference.rs @@ -1,14 +1,14 @@ -use hydroflow::assert_graphvis_snapshots; -use hydroflow::util::collect_ready; +use dfir_rs::assert_graphvis_snapshots; +use dfir_rs::util::collect_ready; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_diff_timing() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { diff = difference() -> for_each(|x| println!("diff: {:?}", x)); poss = source_stream(pos_recv); //-> tee(); @@ -45,12 +45,12 @@ pub fn test_diff_timing() { #[multiplatform_test] pub fn test_diff_static() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); - let (output_send, mut output_recv) = hydroflow::util::unbounded_channel::(); + let (output_send, mut output_recv) = dfir_rs::util::unbounded_channel::(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { diff = difference::<'tick, 'static>() -> sort() -> for_each(|v| output_send.send(v).unwrap()); poss = source_stream(pos_recv); //-> tee(); @@ -88,10 +88,10 @@ pub fn test_diff_static() { #[multiplatform_test] pub fn test_diff_multiset_timing() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { diff = difference_multiset() -> for_each(|x| println!("diff: {:?}", x)); poss = source_stream(pos_recv); //-> tee(); @@ -128,12 +128,12 @@ pub fn test_diff_multiset_timing() { #[multiplatform_test] pub fn test_diff_multiset_static() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); - let (output_send, mut output_recv) = hydroflow::util::unbounded_channel::(); + let (output_send, mut output_recv) = dfir_rs::util::unbounded_channel::(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { diff = difference_multiset::<'static>() -> sort() -> for_each(|v| output_send.send(v).unwrap()); poss = source_stream(pos_recv); //-> tee(); @@ -174,12 +174,12 @@ pub fn test_diff_multiset_static() { #[multiplatform_test] pub fn test_diff_multiset_tick_static() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); - let (output_send, mut output_recv) = hydroflow::util::unbounded_channel::(); + let (output_send, mut output_recv) = dfir_rs::util::unbounded_channel::(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { diff = difference_multiset::<'tick, 'static>() -> sort() -> for_each(|v| output_send.send(v).unwrap()); poss = source_stream(pos_recv); //-> tee(); @@ -217,12 +217,12 @@ pub fn test_diff_multiset_tick_static() { #[multiplatform_test] pub fn test_diff_multiset_static_tick() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pos_send, pos_recv) = hydroflow::util::unbounded_channel::(); - let (neg_send, neg_recv) = hydroflow::util::unbounded_channel::(); + let (pos_send, pos_recv) = dfir_rs::util::unbounded_channel::(); + let (neg_send, neg_recv) = dfir_rs::util::unbounded_channel::(); - let (output_send, mut output_recv) = hydroflow::util::unbounded_channel::(); + let (output_send, mut output_recv) = dfir_rs::util::unbounded_channel::(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { diff = difference_multiset::<'static, 'tick>() -> sort() -> for_each(|v| output_send.send(v).unwrap()); poss = source_stream(pos_recv); //-> tee(); diff --git a/hydroflow/tests/surface_examples.rs b/dfir_rs/tests/surface_examples.rs similarity index 94% rename from hydroflow/tests/surface_examples.rs rename to dfir_rs/tests/surface_examples.rs index 2543ae76ae47..a88fbe6d9ae5 100644 --- a/hydroflow/tests/surface_examples.rs +++ b/dfir_rs/tests/surface_examples.rs @@ -25,7 +25,7 @@ fn test_all() { let name = example_file.strip_suffix(".rs").unwrap(); let output = Command::new("cargo") - .args(["run", "-p", "hydroflow", "--example"]) + .args(["run", "-p", "dfir_rs", "--example"]) .arg(name) .output() .expect("Failed to run example."); diff --git a/hydroflow/tests/surface_fold.rs b/dfir_rs/tests/surface_fold.rs similarity index 84% rename from hydroflow/tests/surface_fold.rs rename to dfir_rs/tests/surface_fold.rs index 4d6f052734dc..97355ecc6a5a 100644 --- a/hydroflow/tests/surface_fold.rs +++ b/dfir_rs/tests/surface_fold.rs @@ -1,16 +1,16 @@ use std::collections::{HashMap, HashSet}; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::util::collect_ready; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::util::collect_ready; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_fold_tick() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::>(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::>(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::>(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_stream(items_recv) -> fold::<'tick>(Vec::new, |old: &mut Vec, mut x: Vec| { old.append(&mut x); }) -> for_each(|v| result_send.send(v).unwrap()); @@ -53,10 +53,10 @@ pub fn test_fold_tick() { #[multiplatform_test] pub fn test_fold_static() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::>(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::>(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::>(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_stream(items_recv) -> fold::<'static>(Vec::new, |old: &mut Vec, mut x: Vec| { old.append(&mut x); }) -> for_each(|v| result_send.send(v).unwrap()); @@ -99,10 +99,10 @@ pub fn test_fold_static() { #[multiplatform_test] pub fn test_fold_static_join() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { teed_fold = source_iter(Vec::::new()) -> fold::<'tick>(|| 0, |old: &mut usize, _: usize| { *old += 1; }) -> tee(); @@ -143,7 +143,7 @@ pub fn test_fold_static_join() { #[multiplatform_test] pub fn test_fold_flatten() { // test pull - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(u8, u8)>(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(u8, u8)>(); let mut df_pull = dfir_syntax! { source_iter([(1,1), (1,2), (2,3), (2,4)]) -> fold::<'tick>(HashMap::::new, |ht: &mut HashMap, t: (u8,u8)| { @@ -170,7 +170,7 @@ pub fn test_fold_flatten() { } // test push - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(u8, u8)>(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(u8, u8)>(); let mut df_push = dfir_syntax! { datagen = source_iter([(1,2), (1,2), (2,4), (2,4)]) -> tee(); datagen[0] -> fold::<'tick>(HashMap::::new, |ht: &mut HashMap, t:(u8,u8)| { @@ -202,7 +202,7 @@ pub fn test_fold_flatten() { #[multiplatform_test] pub fn test_fold_sort() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_stream(items_recv) @@ -252,9 +252,9 @@ pub fn test_fold_sort() { #[multiplatform_test] pub fn test_fold_inference() { - let (_items_send, items_recv) = hydroflow::util::unbounded_channel::(); + let (_items_send, items_recv) = dfir_rs::util::unbounded_channel::(); - let _ = hydroflow::dfir_syntax! { + let _ = dfir_rs::dfir_syntax! { source_stream(items_recv) -> fold::<'tick>(|| 0, |old, s| { *old += s.len() }) -> for_each(|_| {}); diff --git a/hydroflow/tests/surface_fold_keyed.rs b/dfir_rs/tests/surface_fold_keyed.rs similarity index 79% rename from hydroflow/tests/surface_fold_keyed.rs rename to dfir_rs/tests/surface_fold_keyed.rs index ff7e1c69c635..9001a4088884 100644 --- a/hydroflow/tests/surface_fold_keyed.rs +++ b/dfir_rs/tests/surface_fold_keyed.rs @@ -1,7 +1,7 @@ use std::collections::BTreeSet; -use hydroflow::assert_graphvis_snapshots; -use hydroflow::scheduled::ticks::TickInstant; +use dfir_rs::assert_graphvis_snapshots; +use dfir_rs::scheduled::ticks::TickInstant; use multiplatform_test::multiplatform_test; #[multiplatform_test] @@ -10,10 +10,9 @@ pub fn test_fold_keyed_infer_basic() { pub xid: &'static str, pub mtype: u32, } - let (result_send, mut result_recv) = - hydroflow::util::unbounded_channel::<(&'static str, u32)>(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::<(&'static str, u32)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_iter([ SubordResponse { xid: "123", mtype: 33 }, SubordResponse { xid: "123", mtype: 52 }, @@ -40,16 +39,16 @@ pub fn test_fold_keyed_infer_basic() { assert_eq!( &[("123", 318), ("123", 318)], - &*hydroflow::util::collect_ready::, _>(&mut result_recv) + &*dfir_rs::util::collect_ready::, _>(&mut result_recv) ); } #[multiplatform_test] pub fn test_fold_keyed_tick() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::<(u32, Vec)>(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::<(u32, Vec)>(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::<(u32, Vec)>(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::<(u32, Vec)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_stream(items_recv) -> fold_keyed::<'tick>(Vec::new, |old: &mut Vec, mut x: Vec| old.append(&mut x)) -> for_each(|v| result_send.send(v).unwrap()); @@ -79,7 +78,7 @@ pub fn test_fold_keyed_tick() { [(0, vec![1, 2, 3, 4]), (1, vec![1, 1, 2])] .into_iter() .collect::>(), - hydroflow::util::collect_ready::, _>(&mut result_recv) + dfir_rs::util::collect_ready::, _>(&mut result_recv) ); items_send.send((0, vec![5, 6])).unwrap(); @@ -96,7 +95,7 @@ pub fn test_fold_keyed_tick() { [(0, vec![5, 6, 7, 8]), (1, vec![10, 11, 12])] .into_iter() .collect::>(), - hydroflow::util::collect_ready::, _>(&mut result_recv) + dfir_rs::util::collect_ready::, _>(&mut result_recv) ); df.run_available(); // Should return quickly and not hang @@ -104,10 +103,10 @@ pub fn test_fold_keyed_tick() { #[multiplatform_test] pub fn test_fold_keyed_static() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::<(u32, Vec)>(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::<(u32, Vec)>(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::<(u32, Vec)>(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::<(u32, Vec)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_stream(items_recv) -> fold_keyed::<'static>(Vec::new, |old: &mut Vec, mut x: Vec| old.append(&mut x)) -> for_each(|v| result_send.send(v).unwrap()); @@ -137,7 +136,7 @@ pub fn test_fold_keyed_static() { [(0, vec![1, 2, 3, 4]), (1, vec![1, 1, 2])] .into_iter() .collect::>(), - hydroflow::util::collect_ready::, _>(&mut result_recv) + dfir_rs::util::collect_ready::, _>(&mut result_recv) ); items_send.send((0, vec![5, 6])).unwrap(); @@ -157,7 +156,7 @@ pub fn test_fold_keyed_static() { ] .into_iter() .collect::>(), - hydroflow::util::collect_ready::, _>(&mut result_recv) + dfir_rs::util::collect_ready::, _>(&mut result_recv) ); df.run_available(); // Should return quickly and not hang diff --git a/hydroflow/tests/surface_forwardref.rs b/dfir_rs/tests/surface_forwardref.rs similarity index 78% rename from hydroflow/tests/surface_forwardref.rs rename to dfir_rs/tests/surface_forwardref.rs index bcfe077b6ae0..146e425d2210 100644 --- a/hydroflow/tests/surface_forwardref.rs +++ b/dfir_rs/tests/surface_forwardref.rs @@ -1,10 +1,10 @@ -use hydroflow::util::collect_ready; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::util::collect_ready; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_forwardref_basic_forward() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter(0..10) -> forward_ref; @@ -21,7 +21,7 @@ pub fn test_forwardref_basic_forward() { #[multiplatform_test] pub fn test_forwardref_basic_backward() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { forward_ref -> for_each(|v| out_send.send(v).unwrap()); @@ -38,7 +38,7 @@ pub fn test_forwardref_basic_backward() { #[multiplatform_test] pub fn test_forwardref_basic_middle() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter(0..10) -> forward_ref; diff --git a/hydroflow/tests/surface_join.rs b/dfir_rs/tests/surface_join.rs similarity index 98% rename from hydroflow/tests/surface_join.rs rename to dfir_rs/tests/surface_join.rs index f6dc2ec6eca6..303e95ed1d63 100644 --- a/hydroflow/tests/surface_join.rs +++ b/dfir_rs/tests/surface_join.rs @@ -2,8 +2,8 @@ use std::cell::RefCell; use std::collections::HashMap; use std::rc::Rc; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; macro_rules! assert_contains_each_by_tick { diff --git a/hydroflow/tests/surface_join_fused.rs b/dfir_rs/tests/surface_join_fused.rs similarity index 98% rename from hydroflow/tests/surface_join_fused.rs rename to dfir_rs/tests/surface_join_fused.rs index 1724e06e5075..2903508c8504 100644 --- a/hydroflow/tests/surface_join_fused.rs +++ b/dfir_rs/tests/surface_join_fused.rs @@ -2,9 +2,9 @@ use std::cell::RefCell; use std::collections::HashMap; use std::rc::Rc; -use hydroflow::lattices::set_union::SetUnionSingletonSet; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::lattices::set_union::SetUnionSingletonSet; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use lattices::set_union::SetUnionHashSet; use lattices::Merge; use multiplatform_test::multiplatform_test; diff --git a/hydroflow/tests/surface_lattice_batch.rs b/dfir_rs/tests/surface_lattice_batch.rs similarity index 97% rename from hydroflow/tests/surface_lattice_batch.rs rename to dfir_rs/tests/surface_lattice_batch.rs index 0e5a893ad564..90795d041c7e 100644 --- a/hydroflow/tests/surface_lattice_batch.rs +++ b/dfir_rs/tests/surface_lattice_batch.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; use multiplatform_test::multiplatform_test; #[multiplatform_test] diff --git a/hydroflow/tests/surface_lattice_bimorphism.rs b/dfir_rs/tests/surface_lattice_bimorphism.rs similarity index 92% rename from hydroflow/tests/surface_lattice_bimorphism.rs rename to dfir_rs/tests/surface_lattice_bimorphism.rs index 3a998c4ad877..7d33cea65f47 100644 --- a/hydroflow/tests/surface_lattice_bimorphism.rs +++ b/dfir_rs/tests/surface_lattice_bimorphism.rs @@ -1,7 +1,7 @@ use std::collections::{HashMap, HashSet}; -use hydroflow::util::collect_ready; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::util::collect_ready; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use lattices::ght::lattice::{DeepJoinLatticeBimorphism, GhtBimorphism}; use lattices::ght::GeneralizedHashTrieNode; use lattices::map_union::{KeyedBimorphism, MapUnionHashMap, MapUnionSingletonMap}; @@ -13,7 +13,7 @@ use variadics::CloneVariadic; #[multiplatform_test] pub fn test_cartesian_product() { - let (out_send, out_recv) = hydroflow::util::unbounded_channel::<_>(); + let (out_send, out_recv) = dfir_rs::util::unbounded_channel::<_>(); let mut df = dfir_syntax! { lhs = source_iter(0..3) @@ -48,7 +48,7 @@ pub fn test_cartesian_product() { #[multiplatform_test(test, wasm, env_tracing)] pub fn test_cartesian_product_1401() { - let (out_send, out_recv) = hydroflow::util::unbounded_channel::<_>(); + let (out_send, out_recv) = dfir_rs::util::unbounded_channel::<_>(); let mut df = dfir_syntax! { lhs = source_iter(0..1) @@ -75,7 +75,7 @@ pub fn test_cartesian_product_1401() { #[multiplatform_test] pub fn test_join() { - let (out_send, out_recv) = hydroflow::util::unbounded_channel::<_>(); + let (out_send, out_recv) = dfir_rs::util::unbounded_channel::<_>(); let mut df = dfir_syntax! { lhs = source_iter([(7, 1), (7, 2)]) @@ -114,9 +114,9 @@ pub fn test_join() { /// Test for https://github.com/hydro-project/hydroflow/issues/1298 #[multiplatform_test] pub fn test_cartesian_product_tick_state() { - let (lhs_send, lhs_recv) = hydroflow::util::unbounded_channel::(); - let (rhs_send, rhs_recv) = hydroflow::util::unbounded_channel::(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<_>(); + let (lhs_send, lhs_recv) = dfir_rs::util::unbounded_channel::(); + let (rhs_send, rhs_recv) = dfir_rs::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<_>(); let mut df = dfir_syntax! { lhs = source_stream(lhs_recv) diff --git a/hydroflow/tests/surface_lattice_bimorphism_persist_insertion.rs b/dfir_rs/tests/surface_lattice_bimorphism_persist_insertion.rs similarity index 81% rename from hydroflow/tests/surface_lattice_bimorphism_persist_insertion.rs rename to dfir_rs/tests/surface_lattice_bimorphism_persist_insertion.rs index ffbabac408a2..2489e6270d14 100644 --- a/hydroflow/tests/surface_lattice_bimorphism_persist_insertion.rs +++ b/dfir_rs/tests/surface_lattice_bimorphism_persist_insertion.rs @@ -1,8 +1,8 @@ use std::collections::HashSet; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::collect_ready; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::collect_ready; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use lattices::set_union::{CartesianProductBimorphism, SetUnionHashSet, SetUnionSingletonSet}; use multiplatform_test::multiplatform_test; use tokio::sync::mpsc::UnboundedSender; @@ -43,9 +43,9 @@ fn check_cartesian_product_multi_tick( #[multiplatform_test] pub fn test_cartesian_product_multi_tick() { - let (lhs_send, lhs_recv) = hydroflow::util::unbounded_channel::<_>(); - let (rhs_send, rhs_recv) = hydroflow::util::unbounded_channel::<_>(); - let (out_send, out_recv) = hydroflow::util::unbounded_channel::<_>(); + let (lhs_send, lhs_recv) = dfir_rs::util::unbounded_channel::<_>(); + let (rhs_send, rhs_recv) = dfir_rs::util::unbounded_channel::<_>(); + let (out_send, out_recv) = dfir_rs::util::unbounded_channel::<_>(); let df = dfir_syntax! { lhs = source_stream(lhs_recv) @@ -69,9 +69,9 @@ pub fn test_cartesian_product_multi_tick() { #[multiplatform_test] pub fn test_cartesian_product_multi_tick_tee() { - let (lhs_send, lhs_recv) = hydroflow::util::unbounded_channel::<_>(); - let (rhs_send, rhs_recv) = hydroflow::util::unbounded_channel::<_>(); - let (out_send, out_recv) = hydroflow::util::unbounded_channel::<_>(); + let (lhs_send, lhs_recv) = dfir_rs::util::unbounded_channel::<_>(); + let (rhs_send, rhs_recv) = dfir_rs::util::unbounded_channel::<_>(); + let (out_send, out_recv) = dfir_rs::util::unbounded_channel::<_>(); let df = dfir_syntax! { lhs = source_stream(lhs_recv) @@ -97,9 +97,9 @@ pub fn test_cartesian_product_multi_tick_tee() { #[multiplatform_test] pub fn test_cartesian_product_multi_tick_identity() { - let (lhs_send, lhs_recv) = hydroflow::util::unbounded_channel::<_>(); - let (rhs_send, rhs_recv) = hydroflow::util::unbounded_channel::<_>(); - let (out_send, out_recv) = hydroflow::util::unbounded_channel::<_>(); + let (lhs_send, lhs_recv) = dfir_rs::util::unbounded_channel::<_>(); + let (rhs_send, rhs_recv) = dfir_rs::util::unbounded_channel::<_>(); + let (out_send, out_recv) = dfir_rs::util::unbounded_channel::<_>(); let df = dfir_syntax! { lhs = source_stream(lhs_recv) diff --git a/hydroflow/tests/surface_lattice_fold.rs b/dfir_rs/tests/surface_lattice_fold.rs similarity index 85% rename from hydroflow/tests/surface_lattice_fold.rs rename to dfir_rs/tests/surface_lattice_fold.rs index 821a18dd1409..de2750dd60e7 100644 --- a/hydroflow/tests/surface_lattice_fold.rs +++ b/dfir_rs/tests/surface_lattice_fold.rs @@ -1,6 +1,6 @@ -use hydroflow::dfir_syntax; -use hydroflow::lattices::{IsTop, Max, Merge}; -use hydroflow::util::collect_ready; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::{IsTop, Max, Merge}; +use dfir_rs::util::collect_ready; #[test] fn test_basic() { @@ -15,7 +15,7 @@ fn test_basic() { #[test] fn test_fold_loop() { - let (output_send, output_recv) = hydroflow::util::unbounded_channel::(); + let (output_send, output_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { start = source_iter([1]) -> map(Max::new) @@ -35,7 +35,7 @@ fn test_fold_loop() { #[test] fn test_lattice_fold_loop() { - let (output_send, output_recv) = hydroflow::util::unbounded_channel::(); + let (output_send, output_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { start = source_iter([1]) -> map(Max::::new) diff --git a/hydroflow/tests/surface_lattice_generalized_hash_trie.rs b/dfir_rs/tests/surface_lattice_generalized_hash_trie.rs similarity index 84% rename from hydroflow/tests/surface_lattice_generalized_hash_trie.rs rename to dfir_rs/tests/surface_lattice_generalized_hash_trie.rs index 480243dd44aa..5fe6a119a02c 100644 --- a/hydroflow/tests/surface_lattice_generalized_hash_trie.rs +++ b/dfir_rs/tests/surface_lattice_generalized_hash_trie.rs @@ -1,9 +1,9 @@ -use hydroflow::dfir_syntax; -use hydroflow::lattices::ght::lattice::{DeepJoinLatticeBimorphism, GhtBimorphism}; -use hydroflow::lattices::ght::GeneralizedHashTrieNode; -use hydroflow::lattices::GhtType; -use hydroflow::util::collect_ready; -use hydroflow::variadics::{var_expr, var_type}; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::ght::lattice::{DeepJoinLatticeBimorphism, GhtBimorphism}; +use dfir_rs::lattices::ght::GeneralizedHashTrieNode; +use dfir_rs::lattices::GhtType; +use dfir_rs::util::collect_ready; +use dfir_rs::variadics::{var_expr, var_type}; use variadics::variadic_collections::VariadicHashSet; // Import the Insert trait #[test] @@ -36,7 +36,7 @@ fn test_basic() { fn test_join() { type MyGht = GhtType!(u8 => u16: VariadicHashSet); type ResultGht = GhtType!(u8 => u16, u16: VariadicHashSet); - let (out_send, out_recv) = hydroflow::util::unbounded_channel::<_>(); + let (out_send, out_recv) = dfir_rs::util::unbounded_channel::<_>(); let r = vec![ var_expr!(1, 10), diff --git a/hydroflow/tests/surface_lattice_join.rs b/dfir_rs/tests/surface_lattice_join.rs similarity index 88% rename from hydroflow/tests/surface_lattice_join.rs rename to dfir_rs/tests/surface_lattice_join.rs index 19b797e95306..cac1082547f9 100644 --- a/hydroflow/tests/surface_lattice_join.rs +++ b/dfir_rs/tests/surface_lattice_join.rs @@ -1,7 +1,7 @@ use std::collections::HashSet; use dfir_macro::dfir_syntax; -use hydroflow::util::collect_ready; +use dfir_rs::util::collect_ready; use lattices::collections::SingletonMap; use lattices::DeepReveal; use multiplatform_test::multiplatform_test; @@ -49,7 +49,7 @@ pub fn test_lattice_join_fused_join_map_union() { let mut df = dfir_syntax! { use lattices::map_union::MapUnionSingletonMap; use lattices::map_union::MapUnionHashMap; - use hydroflow::lattices::Min; + use dfir_rs::lattices::Min; source_iter([(7, MapUnionHashMap::new_from([(3, Min::new(4))])), (7, MapUnionHashMap::new_from([(3, Min::new(5))]))]) -> [0]my_join; source_iter([(7, MapUnionSingletonMap::new_from((3, Min::new(5)))), (7, MapUnionSingletonMap::new_from((3, Min::new(4))))]) -> [1]my_join; @@ -72,14 +72,14 @@ pub fn test_lattice_join_fused_join_map_union() { #[multiplatform_test] pub fn test_lattice_join_fused_join() { - use hydroflow::lattices::Max; + use dfir_rs::lattices::Max; // 'static, 'tick. { let (out_tx, mut out_rx) = - hydroflow::util::unbounded_channel::>(); - let (lhs_tx, lhs_rx) = hydroflow::util::unbounded_channel::<(usize, Max)>(); - let (rhs_tx, rhs_rx) = hydroflow::util::unbounded_channel::<(usize, Max)>(); + dfir_rs::util::unbounded_channel::>(); + let (lhs_tx, lhs_rx) = dfir_rs::util::unbounded_channel::<(usize, Max)>(); + let (rhs_tx, rhs_rx) = dfir_rs::util::unbounded_channel::<(usize, Max)>(); let mut df = dfir_syntax! { my_join = _lattice_join_fused_join::<'static, 'tick, Max, Max>(); @@ -116,9 +116,9 @@ pub fn test_lattice_join_fused_join() { // 'static, 'static. { let (out_tx, mut out_rx) = - hydroflow::util::unbounded_channel::>(); - let (lhs_tx, lhs_rx) = hydroflow::util::unbounded_channel::<(usize, Max)>(); - let (rhs_tx, rhs_rx) = hydroflow::util::unbounded_channel::<(usize, Max)>(); + dfir_rs::util::unbounded_channel::>(); + let (lhs_tx, lhs_rx) = dfir_rs::util::unbounded_channel::<(usize, Max)>(); + let (rhs_tx, rhs_rx) = dfir_rs::util::unbounded_channel::<(usize, Max)>(); let mut df = dfir_syntax! { my_join = _lattice_join_fused_join::<'static, 'static, Max, Max>(); diff --git a/hydroflow/tests/surface_lattice_reduce.rs b/dfir_rs/tests/surface_lattice_reduce.rs similarity index 82% rename from hydroflow/tests/surface_lattice_reduce.rs rename to dfir_rs/tests/surface_lattice_reduce.rs index 5824f0f86613..30ec54472b8b 100644 --- a/hydroflow/tests/surface_lattice_reduce.rs +++ b/dfir_rs/tests/surface_lattice_reduce.rs @@ -1,5 +1,5 @@ -use hydroflow::dfir_syntax; -use hydroflow::lattices::Max; +use dfir_rs::dfir_syntax; +use dfir_rs::lattices::Max; #[test] fn test_basic() { diff --git a/hydroflow/tests/surface_loop.rs b/dfir_rs/tests/surface_loop.rs similarity index 93% rename from hydroflow/tests/surface_loop.rs rename to dfir_rs/tests/surface_loop.rs index 3bbf27ad8046..74b1758d55f1 100644 --- a/hydroflow/tests/surface_loop.rs +++ b/dfir_rs/tests/surface_loop.rs @@ -1,5 +1,5 @@ -use hydroflow::util::iter_batches_stream; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::util::iter_batches_stream; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; #[multiplatform_test] diff --git a/hydroflow/tests/surface_multiset_delta.rs b/dfir_rs/tests/surface_multiset_delta.rs similarity index 82% rename from hydroflow/tests/surface_multiset_delta.rs rename to dfir_rs/tests/surface_multiset_delta.rs index 00b63326bb0a..5f20bb43720a 100644 --- a/hydroflow/tests/surface_multiset_delta.rs +++ b/dfir_rs/tests/surface_multiset_delta.rs @@ -1,11 +1,11 @@ -use hydroflow::util::collect_ready; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::util::collect_ready; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_multiset_delta() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::(); + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::(); let mut flow = dfir_syntax! { source_stream(input_recv) @@ -31,9 +31,9 @@ pub fn test_multiset_delta() { #[multiplatform_test] pub fn test_persist_multiset_delta() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); - let (output_send, mut output_recv) = hydroflow::util::unbounded_channel::(); - let mut flow = hydroflow::dfir_syntax! { + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); + let (output_send, mut output_recv) = dfir_rs::util::unbounded_channel::(); + let mut flow = dfir_rs::dfir_syntax! { source_stream(input_recv) -> persist::<'static>() -> multiset_delta() @@ -53,8 +53,8 @@ pub fn test_persist_multiset_delta() { #[multiplatform_test] pub fn test_multiset_delta_2() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::(); + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::(); let mut flow = dfir_syntax! { source_stream(input_recv) @@ -79,9 +79,9 @@ pub fn test_multiset_delta_2() { #[multiplatform_test] fn test_chat_app_replay() { - let (users_send, users) = hydroflow::util::unbounded_channel::(); - let (messages_send, messages) = hydroflow::util::unbounded_channel::(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel::<(u32, String)>(); + let (users_send, users) = dfir_rs::util::unbounded_channel::(); + let (messages_send, messages) = dfir_rs::util::unbounded_channel::(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel::<(u32, String)>(); let mut chat_server = dfir_syntax! { users = source_stream(users) -> persist::<'static>(); @@ -135,8 +135,8 @@ fn test_chat_app_replay() { #[multiplatform_test] fn test_chat_app_replay_manual() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::<(u32, String)>(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::<(u32, String)>(); + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<(u32, String)>(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::<(u32, String)>(); let mut flow = dfir_syntax! { source_stream(input_recv) diff --git a/hydroflow/tests/surface_parser.rs b/dfir_rs/tests/surface_parser.rs similarity index 99% rename from hydroflow/tests/surface_parser.rs rename to dfir_rs/tests/surface_parser.rs index ea1b7d8579ea..0bc341dd7b5e 100644 --- a/hydroflow/tests/surface_parser.rs +++ b/dfir_rs/tests/surface_parser.rs @@ -1,4 +1,4 @@ -use hydroflow::dfir_parser; +use dfir_rs::dfir_parser; use multiplatform_test::multiplatform_test; #[multiplatform_test] diff --git a/hydroflow/tests/surface_persist.rs b/dfir_rs/tests/surface_persist.rs similarity index 79% rename from hydroflow/tests/surface_persist.rs rename to dfir_rs/tests/surface_persist.rs index 16158786da21..1edb528dc61a 100644 --- a/hydroflow/tests/surface_persist.rs +++ b/dfir_rs/tests/surface_persist.rs @@ -1,14 +1,14 @@ use std::collections::HashSet; -use hydroflow::compiled::pull::HalfMultisetJoinState; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::util::collect_ready; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::compiled::pull::HalfMultisetJoinState; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::util::collect_ready; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_persist_basic() { - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::(); let mut hf = dfir_syntax! { source_iter([1]) @@ -31,7 +31,7 @@ pub fn test_persist_basic() { #[multiplatform_test] pub fn test_persist_pull() { - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::(); let mut hf = dfir_syntax! { // Structured to ensure `persist::<'static>()` is pull-based. @@ -57,7 +57,7 @@ pub fn test_persist_pull() { #[multiplatform_test] pub fn test_persist_push() { - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::(); let mut hf = dfir_syntax! { t0 = source_iter([1]) -> persist::<'static>() -> tee(); @@ -80,8 +80,8 @@ pub fn test_persist_push() { #[multiplatform_test] pub fn test_persist_join() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::<(&str, &str)>(); - let mut flow = hydroflow::dfir_syntax! { + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<(&str, &str)>(); + let mut flow = dfir_rs::dfir_syntax! { source_iter([("hello", "world")]) -> persist::<'static>() -> [0]my_join; source_stream(input_recv) -> persist::<'static>() -> [1]my_join; my_join = join::<'tick>() -> for_each(|(k, (v1, v2))| println!("({}, ({}, {}))", k, v1, v2)); @@ -94,9 +94,9 @@ pub fn test_persist_join() { #[multiplatform_test] pub fn test_persist_replay_join() { - let (persist_input_send, persist_input) = hydroflow::util::unbounded_channel::(); - let (other_input_send, other_input) = hydroflow::util::unbounded_channel::(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::<(u32, u32)>(); + let (persist_input_send, persist_input) = dfir_rs::util::unbounded_channel::(); + let (other_input_send, other_input) = dfir_rs::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::<(u32, u32)>(); let mut hf = dfir_syntax! { source_stream(persist_input) @@ -128,10 +128,10 @@ pub fn test_persist_replay_join() { #[multiplatform_test] pub fn test_persist_double_handoff() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); - let (input_2_send, input_2_recv) = hydroflow::util::unbounded_channel::(); - let (output_send, mut output_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let mut flow = hydroflow::dfir_syntax! { + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); + let (input_2_send, input_2_recv) = dfir_rs::util::unbounded_channel::(); + let (output_send, mut output_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let mut flow = dfir_rs::dfir_syntax! { teed_first_sg = source_stream(input_2_recv) -> tee(); teed_first_sg -> [0] joined_second_sg; teed_first_sg -> [1] joined_second_sg; @@ -157,10 +157,10 @@ pub fn test_persist_double_handoff() { #[multiplatform_test] pub fn test_persist_single_handoff() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); - let (input_2_send, input_2_recv) = hydroflow::util::unbounded_channel::(); - let (output_send, mut output_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let mut flow = hydroflow::dfir_syntax! { + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); + let (input_2_send, input_2_recv) = dfir_rs::util::unbounded_channel::(); + let (output_send, mut output_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let mut flow = dfir_rs::dfir_syntax! { teed_first_sg = source_stream(input_2_recv) -> tee(); teed_first_sg [0] -> null(); teed_first_sg [1] -> joined_second_sg; @@ -187,10 +187,10 @@ pub fn test_persist_single_handoff() { #[multiplatform_test] pub fn test_persist_single_subgraph() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); - let (input_2_send, input_2_recv) = hydroflow::util::unbounded_channel::(); - let (output_send, mut output_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); - let mut flow = hydroflow::dfir_syntax! { + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); + let (input_2_send, input_2_recv) = dfir_rs::util::unbounded_channel::(); + let (output_send, mut output_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); + let mut flow = dfir_rs::dfir_syntax! { source_stream(input_2_recv) -> joined_second_sg; source_stream(input_recv) -> persist::<'static>() @@ -213,8 +213,8 @@ pub fn test_persist_single_subgraph() { #[multiplatform_test] pub fn test_persist() { - let (pull_tx, mut pull_rx) = hydroflow::util::unbounded_channel::(); - let (push_tx, mut push_rx) = hydroflow::util::unbounded_channel::(); + let (pull_tx, mut pull_rx) = dfir_rs::util::unbounded_channel::(); + let (push_tx, mut push_rx) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { @@ -238,10 +238,10 @@ pub fn test_persist() { #[multiplatform_test] pub fn test_persist_mut() { - use hydroflow::util::Persistence::*; + use dfir_rs::util::Persistence::*; - let (pull_tx, mut pull_rx) = hydroflow::util::unbounded_channel::(); - let (push_tx, mut push_rx) = hydroflow::util::unbounded_channel::(); + let (pull_tx, mut pull_rx) = dfir_rs::util::unbounded_channel::(); + let (push_tx, mut push_rx) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { @@ -266,10 +266,10 @@ pub fn test_persist_mut() { #[multiplatform_test] pub fn test_persist_mut_keyed() { - use hydroflow::util::PersistenceKeyed::*; + use dfir_rs::util::PersistenceKeyed::*; - let (pull_tx, mut pull_rx) = hydroflow::util::unbounded_channel::(); - let (push_tx, mut push_rx) = hydroflow::util::unbounded_channel::(); + let (pull_tx, mut pull_rx) = dfir_rs::util::unbounded_channel::(); + let (push_tx, mut push_rx) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { diff --git a/hydroflow/tests/surface_python.rs b/dfir_rs/tests/surface_python.rs similarity index 96% rename from hydroflow/tests/surface_python.rs rename to dfir_rs/tests/surface_python.rs index da533c765be7..d5d435ecb02f 100644 --- a/hydroflow/tests/surface_python.rs +++ b/dfir_rs/tests/surface_python.rs @@ -1,6 +1,6 @@ #![cfg(feature = "python")] -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; use pyo3::prelude::*; diff --git a/hydroflow/tests/surface_reduce.rs b/dfir_rs/tests/surface_reduce.rs similarity index 81% rename from hydroflow/tests/surface_reduce.rs rename to dfir_rs/tests/surface_reduce.rs index bd4316018b7b..bf36be7abe89 100644 --- a/hydroflow/tests/surface_reduce.rs +++ b/dfir_rs/tests/surface_reduce.rs @@ -1,13 +1,13 @@ -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_reduce_tick() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_stream(items_recv) -> reduce::<'tick>(|acc: &mut u32, next: u32| *acc += next) -> for_each(|v| result_send.send(v).unwrap()); @@ -28,7 +28,7 @@ pub fn test_reduce_tick() { ); assert_eq!( &[3], - &*hydroflow::util::collect_ready::, _>(&mut result_recv) + &*dfir_rs::util::collect_ready::, _>(&mut result_recv) ); items_send.send(3).unwrap(); @@ -41,16 +41,16 @@ pub fn test_reduce_tick() { ); assert_eq!( &[7], - &*hydroflow::util::collect_ready::, _>(&mut result_recv) + &*dfir_rs::util::collect_ready::, _>(&mut result_recv) ); } #[multiplatform_test] pub fn test_reduce_static() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::(); - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { source_stream(items_recv) -> reduce::<'static>(|acc: &mut u32, next: u32| *acc += next) -> for_each(|v| result_send.send(v).unwrap()); @@ -71,7 +71,7 @@ pub fn test_reduce_static() { ); assert_eq!( &[3], - &*hydroflow::util::collect_ready::, _>(&mut result_recv) + &*dfir_rs::util::collect_ready::, _>(&mut result_recv) ); items_send.send(3).unwrap(); @@ -84,13 +84,13 @@ pub fn test_reduce_static() { ); assert_eq!( &[10], - &*hydroflow::util::collect_ready::, _>(&mut result_recv) + &*dfir_rs::util::collect_ready::, _>(&mut result_recv) ); } #[multiplatform_test] pub fn test_reduce_sum() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_stream(items_recv) @@ -140,7 +140,7 @@ pub fn test_reduce_sum() { #[multiplatform_test] pub fn test_reduce() { // An edge in the input data = a pair of `usize` vertex IDs. - let (pairs_send, pairs_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (pairs_send, pairs_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); let mut df = dfir_syntax! { reached_vertices = union() -> map(|v| (v, ())); diff --git a/hydroflow/tests/surface_scheduling.rs b/dfir_rs/tests/surface_scheduling.rs similarity index 85% rename from hydroflow/tests/surface_scheduling.rs rename to dfir_rs/tests/surface_scheduling.rs index bf2e8ea234aa..566d9dfe75fa 100644 --- a/hydroflow/tests/surface_scheduling.rs +++ b/dfir_rs/tests/surface_scheduling.rs @@ -1,14 +1,14 @@ use std::error::Error; use std::time::Duration; -use hydroflow::scheduled::ticks::{TickDuration, TickInstant}; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax, rassert_eq}; +use dfir_rs::scheduled::ticks::{TickDuration, TickInstant}; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax, rassert_eq}; use multiplatform_test::multiplatform_test; use tokio::time::timeout; #[multiplatform_test(test, wasm, env_tracing)] pub fn test_stratum_loop() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter([TickInstant::new(0)]) -> union_tee; @@ -32,7 +32,7 @@ pub fn test_stratum_loop() { TickInstant::new(8), TickInstant::new(9) ], - &*hydroflow::util::collect_ready::, _>(&mut out_recv) + &*dfir_rs::util::collect_ready::, _>(&mut out_recv) ); assert_eq!( (TickInstant::new(10), 0), @@ -42,7 +42,7 @@ pub fn test_stratum_loop() { #[multiplatform_test(test, wasm, env_tracing)] pub fn test_tick_loop() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter([TickInstant::new(0)]) -> union_tee; @@ -66,7 +66,7 @@ pub fn test_tick_loop() { TickInstant::new(8), TickInstant::new(9) ], - &*hydroflow::util::collect_ready::, _>(&mut out_recv) + &*dfir_rs::util::collect_ready::, _>(&mut out_recv) ); assert_eq!( (TickInstant::new(10), 0), @@ -74,9 +74,9 @@ pub fn test_tick_loop() { ); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn test_persist_stratum_run_available() -> Result<(), Box> { - let (out_send, out_recv) = hydroflow::util::unbounded_channel(); + let (out_send, out_recv) = dfir_rs::util::unbounded_channel(); let mut df = dfir_syntax! { a = source_iter([0]) @@ -87,7 +87,7 @@ async fn test_persist_stratum_run_available() -> Result<(), Box> { assert_graphvis_snapshots!(df); df.run_available(); - let seen: Vec<_> = hydroflow::util::collect_ready_async(out_recv).await; + let seen: Vec<_> = dfir_rs::util::collect_ready_async(out_recv).await; rassert_eq!( &[0], &*seen, @@ -98,9 +98,9 @@ async fn test_persist_stratum_run_available() -> Result<(), Box> { Ok(()) } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn test_persist_stratum_run_async() -> Result<(), Box> { - let (out_send, out_recv) = hydroflow::util::unbounded_channel(); + let (out_send, out_recv) = dfir_rs::util::unbounded_channel(); let mut df = dfir_syntax! { source_iter([0]) @@ -114,7 +114,7 @@ async fn test_persist_stratum_run_async() -> Result<(), Box> { .await .expect_err("Expected time out"); - let seen: Vec<_> = hydroflow::util::collect_ready_async(out_recv).await; + let seen: Vec<_> = dfir_rs::util::collect_ready_async(out_recv).await; rassert_eq!( &[0], &*seen, @@ -167,7 +167,7 @@ pub fn test_issue_800_1050_reduce_keyed() { df.run_available(); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn test_nospin_issue_961() { let mut df = dfir_syntax! { source_iter([1]) @@ -183,7 +183,7 @@ async fn test_nospin_issue_961() { .expect("Should not spin."); } -#[multiplatform_test(hydroflow, env_tracing)] +#[multiplatform_test(dfir, env_tracing)] async fn test_nospin_issue_961_complicated() { let mut df = dfir_syntax! { source_iter([1]) -> items; diff --git a/hydroflow/tests/surface_singleton.rs b/dfir_rs/tests/surface_singleton.rs similarity index 83% rename from hydroflow/tests/surface_singleton.rs rename to dfir_rs/tests/surface_singleton.rs index 1f368e0e56de..962dba7f0a61 100644 --- a/hydroflow/tests/surface_singleton.rs +++ b/dfir_rs/tests/surface_singleton.rs @@ -1,16 +1,15 @@ -use hydroflow::assert_graphvis_snapshots; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::util::collect_ready; +use dfir_rs::assert_graphvis_snapshots; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::util::collect_ready; use lattices::Max; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_state() { - let (filter_send, mut filter_recv) = - hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); - let (max_send, mut max_recv) = hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); + let (filter_send, mut filter_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); + let (max_send, mut max_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { stream1 = source_iter(1..=10); stream2 = source_iter(3..=5) -> map(Max::new); max_of_stream2 = stream2 -> state::<'static, Max<_>>(); @@ -71,7 +70,7 @@ pub fn test_state() { /// Just tests that the codegen is valid. #[multiplatform_test] pub fn test_state_unused() { - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { stream2 = source_iter(15..=25) -> map(Max::new); max_of_stream2 = stream2 -> state::<'static, Max<_>>(); }; @@ -84,9 +83,9 @@ pub fn test_state_unused() { /// Just tests that the codegen is valid. #[multiplatform_test] pub fn test_state_tick() { - let (input_send, input_recv) = hydroflow::util::unbounded_channel::(); - let (max_send, mut max_recv) = hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::(); + let (max_send, mut max_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); + let mut df = dfir_rs::dfir_syntax! { stream2 = source_stream(input_recv) -> map(Max::new); max_of_stream2 = stream2 -> state::<'tick, Max<_>>(); @@ -117,11 +116,10 @@ pub fn test_state_tick() { #[multiplatform_test] pub fn test_fold_cross() { - let (filter_send, mut filter_recv) = - hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); - let (max_send, mut max_recv) = hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); + let (filter_send, mut filter_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); + let (max_send, mut max_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { stream1 = source_iter(1..=10); stream2 = source_iter(3..=5) -> map(Max::new); max_of_stream2 = stream2 -> lattice_reduce() -> tee(); @@ -166,11 +164,10 @@ pub fn test_fold_cross() { #[multiplatform_test] pub fn test_fold_singleton() { - let (filter_send, mut filter_recv) = - hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); - let (max_send, mut max_recv) = hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); + let (filter_send, mut filter_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); + let (max_send, mut max_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { stream1 = source_iter(1..=10); stream2 = source_iter(3..=5); max_of_stream2 = stream2 -> fold(|| 0, |a, b| *a = std::cmp::max(*a, b)); @@ -210,10 +207,9 @@ pub fn test_fold_singleton() { #[multiplatform_test] pub fn test_fold_singleton_push() { - let (filter_send, mut filter_recv) = - hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); + let (filter_send, mut filter_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { stream1 = source_iter(1..=10); stream2 = source_iter(3..=5); max_of_stream2 = stream2 -> fold(|| 0, |a, b| *a = std::cmp::max(*a, b)); @@ -246,11 +242,10 @@ pub fn test_fold_singleton_push() { #[multiplatform_test] pub fn test_reduce_singleton() { - let (filter_send, mut filter_recv) = - hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); - let (max_send, mut max_recv) = hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); + let (filter_send, mut filter_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); + let (max_send, mut max_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { stream1 = source_iter(1..=10); stream2 = source_iter(3..=5); max_of_stream2 = stream2 -> reduce(|a, b| *a = std::cmp::max(*a, b)); @@ -291,10 +286,9 @@ pub fn test_reduce_singleton() { #[multiplatform_test] pub fn test_reduce_singleton_push() { - let (filter_send, mut filter_recv) = - hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); + let (filter_send, mut filter_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { stream1 = source_iter(1..=10); stream2 = source_iter(3..=5); max_of_stream2 = stream2 -> reduce(|a, b| *a = std::cmp::max(*a, b)); @@ -327,10 +321,10 @@ pub fn test_reduce_singleton_push() { #[multiplatform_test] pub fn test_scheduling() { - let (inn_send, inn_recv) = hydroflow::util::unbounded_channel::(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); + let (inn_send, inn_recv) = dfir_rs::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { stream1 = source_iter(1..=10); stream2 = source_stream(inn_recv); max_of_stream2 = stream2 -> fold(|| 0, |a, b| *a = std::cmp::max(*a, b)); @@ -372,11 +366,10 @@ pub fn test_scheduling() { #[multiplatform_test] pub fn test_multi_tick() { - let (filter_send, mut filter_recv) = - hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); - let (max_send, mut max_recv) = hydroflow::util::unbounded_channel::<(TickInstant, usize)>(); + let (filter_send, mut filter_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); + let (max_send, mut max_recv) = dfir_rs::util::unbounded_channel::<(TickInstant, usize)>(); - let mut df = hydroflow::dfir_syntax! { + let mut df = dfir_rs::dfir_syntax! { stream1 = source_iter(1..=10); stream2 = source_iter(3..=5) -> map(Max::new); max_of_stream2 = stream2 -> state::<'static, Max<_>>(); diff --git a/hydroflow/tests/surface_state_scheduling.rs b/dfir_rs/tests/surface_state_scheduling.rs similarity index 90% rename from hydroflow/tests/surface_state_scheduling.rs rename to dfir_rs/tests/surface_state_scheduling.rs index 3c67fcd6b807..d68a0c76d9d2 100644 --- a/hydroflow/tests/surface_state_scheduling.rs +++ b/dfir_rs/tests/surface_state_scheduling.rs @@ -1,11 +1,11 @@ -use hydroflow::dfir_syntax; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::util::collect_ready; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::util::collect_ready; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_repeat_iter() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter([1]) -> persist::<'static>() -> for_each(|v| out_send.send(v).unwrap()); @@ -37,7 +37,7 @@ pub fn test_repeat_iter() { #[multiplatform_test] pub fn test_fold_tick() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter([1]) -> fold::<'tick>(|| 0, |accum: &mut _, elem| *accum += elem) -> for_each(|v| out_send.send(v).unwrap()); @@ -69,7 +69,7 @@ pub fn test_fold_tick() { #[multiplatform_test] pub fn test_fold_static() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter([1]) -> fold::<'static>(|| 0, |accum: &mut _, elem| *accum += elem) -> for_each(|v| out_send.send(v).unwrap()); @@ -101,7 +101,7 @@ pub fn test_fold_static() { #[multiplatform_test] pub fn test_reduce_tick() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter([1]) -> reduce::<'tick>(|a: &mut _, b| *a += b) -> for_each(|v| out_send.send(v).unwrap()); @@ -133,7 +133,7 @@ pub fn test_reduce_tick() { #[multiplatform_test] pub fn test_reduce_static() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter([1]) -> reduce::<'static>(|a: &mut _, b| *a += b) -> for_each(|v| out_send.send(v).unwrap()); @@ -165,7 +165,7 @@ pub fn test_reduce_static() { #[multiplatform_test] pub fn test_fold_keyed_tick() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(char, usize)>(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(char, usize)>(); let mut df = dfir_syntax! { source_iter([('a', 1), ('a', 2)]) -> fold_keyed::<'tick>(|| 0, |acc: &mut usize, item| { *acc += item; }) -> for_each(|v| out_send.send(v).unwrap()); @@ -197,7 +197,7 @@ pub fn test_fold_keyed_tick() { #[multiplatform_test] pub fn test_fold_keyed_static() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::<(char, usize)>(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::<(char, usize)>(); let mut df = dfir_syntax! { source_iter([('a', 1), ('a', 2)]) -> fold_keyed::<'static>(|| 0, |acc: &mut usize, item| { *acc += item; }) -> for_each(|v| out_send.send(v).unwrap()); @@ -234,8 +234,8 @@ pub fn test_fold_keyed_static() { /// but will resume when external events come in. #[multiplatform_test(test, wasm, env_tracing)] pub fn test_resume_external_event() { - let (in_send, in_recv) = hydroflow::util::unbounded_channel::(); - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (in_send, in_recv) = dfir_rs::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_stream(in_recv) -> fold::<'static>(|| 0, |a: &mut _, b| *a += b) -> for_each(|v| out_send.send(v).unwrap()); diff --git a/hydroflow/tests/surface_stratum.rs b/dfir_rs/tests/surface_stratum.rs similarity index 95% rename from hydroflow/tests/surface_stratum.rs rename to dfir_rs/tests/surface_stratum.rs index 79a9678484d2..ca1a2114a291 100644 --- a/hydroflow/tests/surface_stratum.rs +++ b/dfir_rs/tests/surface_stratum.rs @@ -1,9 +1,9 @@ use std::cell::RefCell; use std::rc::Rc; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::multiset::HashMultiSet; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::multiset::HashMultiSet; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; use tokio::sync::mpsc::error::SendError; @@ -39,7 +39,7 @@ pub fn test_difference_a() { /// Take the difference of each tick of items and subtract the previous tick's items. #[multiplatform_test] pub fn test_difference_b() -> Result<(), SendError<&'static str>> { - let (inp_send, inp_recv) = hydroflow::util::unbounded_channel::<&'static str>(); + let (inp_send, inp_recv) = dfir_rs::util::unbounded_channel::<&'static str>(); let output = >>>::default(); let output_inner = Rc::clone(&output); @@ -165,7 +165,7 @@ pub fn test_surface_syntax_graph_unreachability() { // TODO(mingwei): may need persistence if we want this to make easier to eyeball. // An edge in the input data = a pair of `usize` vertex IDs. - let (pairs_send, pairs_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (pairs_send, pairs_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); #[expect(clippy::map_identity, reason = "stratification topology testing")] let mut df = dfir_syntax! { diff --git a/hydroflow/tests/surface_unique.rs b/dfir_rs/tests/surface_unique.rs similarity index 87% rename from hydroflow/tests/surface_unique.rs rename to dfir_rs/tests/surface_unique.rs index d2a4553f9045..1e73053fafb4 100644 --- a/hydroflow/tests/surface_unique.rs +++ b/dfir_rs/tests/surface_unique.rs @@ -1,10 +1,10 @@ -use hydroflow::util::collect_ready; -use hydroflow::{assert_graphvis_snapshots, dfir_syntax}; +use dfir_rs::util::collect_ready; +use dfir_rs::{assert_graphvis_snapshots, dfir_syntax}; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_unique() { - let (items_send, items_recv) = hydroflow::util::unbounded_channel::(); + let (items_send, items_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_stream(items_recv) @@ -35,7 +35,7 @@ pub fn test_unique() { #[multiplatform_test] pub fn test_unique_tick_pull() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter(0..10) -> persist::<'static>() -> m1; @@ -58,7 +58,7 @@ pub fn test_unique_tick_pull() { #[multiplatform_test] pub fn test_unique_static_pull() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter(0..10) -> persist::<'static>() -> m1; @@ -81,7 +81,7 @@ pub fn test_unique_static_pull() { #[multiplatform_test] pub fn test_unique_tick_push() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter(0..10) -> persist::<'static>() -> pivot; @@ -104,7 +104,7 @@ pub fn test_unique_tick_push() { #[multiplatform_test] pub fn test_unique_static_push() { - let (out_send, mut out_recv) = hydroflow::util::unbounded_channel::(); + let (out_send, mut out_recv) = dfir_rs::util::unbounded_channel::(); let mut df = dfir_syntax! { source_iter(0..10) -> persist::<'static>() -> pivot; diff --git a/hydroflow/tests/surface_warnings.rs b/dfir_rs/tests/surface_warnings.rs similarity index 91% rename from hydroflow/tests/surface_warnings.rs rename to dfir_rs/tests/surface_warnings.rs index 0b73113b2717..b6e4b4b37511 100644 --- a/hydroflow/tests/surface_warnings.rs +++ b/dfir_rs/tests/surface_warnings.rs @@ -1,13 +1,13 @@ use std::cell::RefCell; use std::rc::Rc; -use hydroflow::hydroflow_expect_warnings; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::collect_ready; +use dfir_rs::hydroflow_expect_warnings; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::collect_ready; #[test] fn test_degenerate_union() { - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::(); let mut df = hydroflow_expect_warnings! { { @@ -33,7 +33,7 @@ fn test_empty_union() { #[test] fn test_degenerate_tee() { - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::(); let mut df = hydroflow_expect_warnings! { { diff --git a/hydroflow/tests/surface_zip_unzip.rs b/dfir_rs/tests/surface_zip_unzip.rs similarity index 81% rename from hydroflow/tests/surface_zip_unzip.rs rename to dfir_rs/tests/surface_zip_unzip.rs index 5a2190c3969a..3043ee481887 100644 --- a/hydroflow/tests/surface_zip_unzip.rs +++ b/dfir_rs/tests/surface_zip_unzip.rs @@ -1,11 +1,11 @@ -use hydroflow::dfir_syntax; -use hydroflow::util::collect_ready; +use dfir_rs::dfir_syntax; +use dfir_rs::util::collect_ready; use multiplatform_test::multiplatform_test; #[multiplatform_test] pub fn test_zip_basic() { let (result_send, mut result_recv) = - hydroflow::util::unbounded_channel::<(usize, &'static str)>(); + dfir_rs::util::unbounded_channel::<(usize, &'static str)>(); let mut df = dfir_syntax! { source_iter(0..5) -> [0]my_zip; @@ -20,7 +20,7 @@ pub fn test_zip_basic() { #[multiplatform_test] pub fn test_zip_loop() { - let (result_send, mut result_recv) = hydroflow::util::unbounded_channel::<(char, usize)>(); + let (result_send, mut result_recv) = dfir_rs::util::unbounded_channel::<(char, usize)>(); let mut df = dfir_syntax! { source_iter("Hello World".chars()) -> [0]my_zip; @@ -55,10 +55,10 @@ pub fn test_zip_loop() { #[multiplatform_test] pub fn test_zip_longest_basic() { - use hydroflow::itertools::EitherOrBoth::{self, *}; + use dfir_rs::itertools::EitherOrBoth::{self, *}; let (result_send, mut result_recv) = - hydroflow::util::unbounded_channel::>(); + dfir_rs::util::unbounded_channel::>(); let mut df = dfir_syntax! { source_iter(0..5) -> [0]my_zip_longest; @@ -82,8 +82,8 @@ pub fn test_zip_longest_basic() { #[multiplatform_test] pub fn test_unzip_basic() { - let (send0, mut recv0) = hydroflow::util::unbounded_channel::<&'static str>(); - let (send1, mut recv1) = hydroflow::util::unbounded_channel::<&'static str>(); + let (send0, mut recv0) = dfir_rs::util::unbounded_channel::<&'static str>(); + let (send1, mut recv1) = dfir_rs::util::unbounded_channel::<&'static str>(); let mut df = dfir_syntax! { my_unzip = source_iter(vec![("Hello", "Foo"), ("World", "Bar")]) -> unzip(); my_unzip[0] -> for_each(|v| send0.send(v).unwrap()); diff --git a/hydroflow/wasm.md b/dfir_rs/wasm.md similarity index 100% rename from hydroflow/wasm.md rename to dfir_rs/wasm.md diff --git a/docs/docs/deploy/your-first-deploy.md b/docs/docs/deploy/your-first-deploy.md index 50af5e059726..8372d262e17a 100644 --- a/docs/docs/deploy/your-first-deploy.md +++ b/docs/docs/deploy/your-first-deploy.md @@ -37,9 +37,9 @@ hydroflow_deploy_integration = "0.1.1" Let's open up `src/main.rs` in the generated project and write a new `main` function that initializes Hydro Deploy: ```rust -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init().await; + let ports = dfir_rs::util::deploy::init().await; } ``` @@ -78,11 +78,11 @@ Returning briefly to our Hydroflow code, we can then load these ports and use th ```rust use hydroflow_deploy_integration::ConnectedDirect; -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init().await; + let ports = dfir_rs::util::deploy::init().await; let input_recv = ports .port("input") @@ -97,7 +97,7 @@ async fn main() { .await .into_sink(); - hydroflow::util::deploy::launch_flow(dfir_syntax! { + dfir_rs::util::deploy::launch_flow(dfir_syntax! { source_iter(["hello".to_string()]) -> dest_sink(output_send); input = source_stream(input_recv) -> tee(); input -> dest_sink(output_send); diff --git a/docs/docs/hydroflow/architecture/index.mdx b/docs/docs/hydroflow/architecture/index.mdx index cbd4461d79fb..65c2b447c593 100644 --- a/docs/docs/hydroflow/architecture/index.mdx +++ b/docs/docs/hydroflow/architecture/index.mdx @@ -84,8 +84,8 @@ Alternatively, the _Core API_ allows you to interact with handoffs directly at a level. It doesn't provide any notion of chainable operators. You can use Rust `Iterator`s or any other arbitrary Rust code to implement the operators. -The Core API lives in [`hydroflow::scheduled`](https://hydro-project.github.io/hydroflow/doc/hydroflow/scheduled/index.html), -mainly in methods on the [`Hydroflow` struct](https://hydro-project.github.io/hydroflow/doc/hydroflow/scheduled/graph/struct.Hydroflow.html). Compiled push-based iterators live in [`hydroflow::compiled`](https://hydro-project.github.io/hydroflow/doc/hydroflow/compiled/index.html). We intend users to use the Surface Syntax as it is much more friendly, but as +The Core API lives in [`dfir_rs::scheduled`](https://hydro-project.github.io/hydroflow/doc/hydroflow/scheduled/index.html), +mainly in methods on the [`Hydroflow` struct](https://hydro-project.github.io/hydroflow/doc/hydroflow/scheduled/graph/struct.Hydroflow.html). Compiled push-based iterators live in [`dfir_rs::compiled`](https://hydro-project.github.io/hydroflow/doc/hydroflow/compiled/index.html). We intend users to use the Surface Syntax as it is much more friendly, but as Hydroflow is in active development some operators might not be available in the Surface Syntax, in which case the Core API can be used instead. If you find yourself in this sitation be sure to [submit an issue](https://github.com/hydro-project/hydroflow/issues/new)! diff --git a/docs/docs/hydroflow/quickstart/example_3_stream.mdx b/docs/docs/hydroflow/quickstart/example_3_stream.mdx index 77ea925cb993..cb4799430cb5 100644 --- a/docs/docs/hydroflow/quickstart/example_3_stream.mdx +++ b/docs/docs/hydroflow/quickstart/example_3_stream.mdx @@ -17,7 +17,7 @@ In our previous examples, data came from within the Hydroflow spec, via Rust ite For discussion, we start with a skeleton much like before: ```rust showLineNumbers -use hydroflow::dfir_syntax; +use dfir_rs::dfir_syntax; pub fn main() { let mut hydroflow = dfir_syntax! { @@ -31,7 +31,7 @@ pub fn main() { **TODO:** Make the following less intimidating to users who are not Tokio experts. To add a new external input -channel, we can use the `hydroflow::util::unbounded_channel()` function in Rust before we declare the Hydroflow spec: +channel, we can use the `dfir_rs::util::unbounded_channel()` function in Rust before we declare the Hydroflow spec: {getLines(exampleCode, 4, 5)} diff --git a/docs/docs/hydroflow/syntax/surface_data.mdx b/docs/docs/hydroflow/syntax/surface_data.mdx index db75e77d692a..44bd9a964707 100644 --- a/docs/docs/hydroflow/syntax/surface_data.mdx +++ b/docs/docs/hydroflow/syntax/surface_data.mdx @@ -30,7 +30,7 @@ More commonly, a flow should handle external data coming in asynchronously from One way to do this is with _channels_ that allow Rust code to send data into Hydroflow via the [`source_stream()`](./surface_ops_gen.md#source_stream) operator. The code below creates a channel for data of (Rust) type `(usize, usize)`: ```rust,ignore - let (input_send, input_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>(); + let (input_send, input_recv) = dfir_rs::util::unbounded_channel::<(usize, usize)>(); ``` Under the hood this uses [Tokio unbounded channels](https://docs.rs/tokio/latest/tokio/sync/mpsc/fn.unbounded_channel.html). Now in Rust we can now push data into the channel. E.g. for testing we can do diff --git a/docs/src/pages/playground.js b/docs/src/pages/playground.js index fdff5ddcd479..c5f9d92c13ab 100644 --- a/docs/src/pages/playground.js +++ b/docs/src/pages/playground.js @@ -216,7 +216,7 @@ export function EditorDemo({ compileFn, examples, mermaidId }) { useEffect(() => { if (editorAndMonaco) { const { editor, monaco } = editorAndMonaco; - monaco.editor.setModelMarkers(editor.getModel(), "hydroflow", diagnostics.map(d => { + monaco.editor.setModelMarkers(editor.getModel(), "dfir_rs", diagnostics.map(d => { return { startLineNumber: d.span.start.line, startColumn: d.span.start.column + 1, diff --git a/docs/src/pages/research.js b/docs/src/pages/research.js index 5270d26891d3..b944bcae6911 100644 --- a/docs/src/pages/research.js +++ b/docs/src/pages/research.js @@ -135,7 +135,7 @@ const papers = [ }, { title: "Hydroflow: A Model and Runtime for Distributed Systems Programming", - pdf: "pathname:///papers/hydroflow-thesis.pdf", + pdf: "pathname:///papers/dfir_rs-thesis.pdf", thumb: require("./img/papers/hydroflow-thesis.png"), authors: <>Mingwei Samuel, Alvin Cheung, Joseph M. Hellerstein, description: [ diff --git a/hydro_deploy/hydro_cli_examples/Cargo.toml b/hydro_deploy/hydro_cli_examples/Cargo.toml index 92e24329d2ca..447ab4af719a 100644 --- a/hydro_deploy/hydro_cli_examples/Cargo.toml +++ b/hydro_deploy/hydro_cli_examples/Cargo.toml @@ -38,7 +38,7 @@ name = "dedalus_2pc_participant" name = "ws_chat_server" [dev-dependencies] -hydroflow = { path = "../../hydroflow", features = [ "deploy_integration" ] } +dfir_rs = { path = "../../dfir_rs", features = [ "deploy_integration" ] } dfir_datalog = { path = "../../dfir_datalog" } tokio = { version = "1.29.0", features = [ "full" ] } diff --git a/hydro_deploy/hydro_cli_examples/examples/dedalus_2pc_coordinator/main.rs b/hydro_deploy/hydro_cli_examples/examples/dedalus_2pc_coordinator/main.rs index 5dcec88150ce..444ddd657229 100644 --- a/hydro_deploy/hydro_cli_examples/examples/dedalus_2pc_coordinator/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/dedalus_2pc_coordinator/main.rs @@ -1,10 +1,10 @@ use dfir_datalog::datalog; -use hydroflow::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource}; -use hydroflow::util::{deserialize_from_bytes, serialize_to_bytes}; +use dfir_rs::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource}; +use dfir_rs::util::{deserialize_from_bytes, serialize_to_bytes}; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let vote_to_participant_port = ports .port("vote_to_participant") .connect::>() diff --git a/hydro_deploy/hydro_cli_examples/examples/dedalus_2pc_participant/main.rs b/hydro_deploy/hydro_cli_examples/examples/dedalus_2pc_participant/main.rs index c662b881bf21..1b8609093934 100644 --- a/hydro_deploy/hydro_cli_examples/examples/dedalus_2pc_participant/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/dedalus_2pc_participant/main.rs @@ -1,10 +1,10 @@ use dfir_datalog::datalog; -use hydroflow::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource}; -use hydroflow::util::{deserialize_from_bytes, serialize_to_bytes}; +use dfir_rs::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource}; +use dfir_rs::util::{deserialize_from_bytes, serialize_to_bytes}; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let vote_to_participant_source = ports .port("vote_to_participant") .connect::() diff --git a/hydro_deploy/hydro_cli_examples/examples/dedalus_receiver/main.rs b/hydro_deploy/hydro_cli_examples/examples/dedalus_receiver/main.rs index 15b2e82ffb98..84161a757cbb 100644 --- a/hydro_deploy/hydro_cli_examples/examples/dedalus_receiver/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/dedalus_receiver/main.rs @@ -1,10 +1,10 @@ use dfir_datalog::datalog; -use hydroflow::util::deploy::{ConnectedDirect, ConnectedSource}; -use hydroflow::util::deserialize_from_bytes; +use dfir_rs::util::deploy::{ConnectedDirect, ConnectedSource}; +use dfir_rs::util::deserialize_from_bytes; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let broadcast_recv = ports .port("broadcast") .connect::() @@ -20,5 +20,5 @@ async fn main() { "# ); - hydroflow::util::deploy::launch_flow(df).await; + dfir_rs::util::deploy::launch_flow(df).await; } diff --git a/hydro_deploy/hydro_cli_examples/examples/dedalus_sender/main.rs b/hydro_deploy/hydro_cli_examples/examples/dedalus_sender/main.rs index ab6db5232500..360673e692ce 100644 --- a/hydro_deploy/hydro_cli_examples/examples/dedalus_sender/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/dedalus_sender/main.rs @@ -1,11 +1,11 @@ use dfir_datalog::datalog; -use hydroflow::tokio_stream::wrappers::IntervalStream; -use hydroflow::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink}; -use hydroflow::util::serialize_to_bytes; +use dfir_rs::tokio_stream::wrappers::IntervalStream; +use dfir_rs::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink}; +use dfir_rs::util::serialize_to_bytes; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let broadcast_port = ports .port("broadcast") .connect::>() @@ -32,5 +32,5 @@ async fn main() { "# ); - hydroflow::util::deploy::launch_flow(df).await; + dfir_rs::util::deploy::launch_flow(df).await; } diff --git a/hydro_deploy/hydro_cli_examples/examples/dedalus_vote_leader/main.rs b/hydro_deploy/hydro_cli_examples/examples/dedalus_vote_leader/main.rs index 5bbdc2bc4147..539a8ff067d3 100644 --- a/hydro_deploy/hydro_cli_examples/examples/dedalus_vote_leader/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/dedalus_vote_leader/main.rs @@ -1,10 +1,10 @@ use dfir_datalog::datalog; -use hydroflow::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource}; -use hydroflow::util::{deserialize_from_bytes, serialize_to_bytes}; +use dfir_rs::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource}; +use dfir_rs::util::{deserialize_from_bytes, serialize_to_bytes}; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let to_replica_port = ports .port("to_replica") .connect::>() diff --git a/hydro_deploy/hydro_cli_examples/examples/dedalus_vote_participant/main.rs b/hydro_deploy/hydro_cli_examples/examples/dedalus_vote_participant/main.rs index 51c614d98783..efad12d566c3 100644 --- a/hydro_deploy/hydro_cli_examples/examples/dedalus_vote_participant/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/dedalus_vote_participant/main.rs @@ -1,10 +1,10 @@ use dfir_datalog::datalog; -use hydroflow::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource}; -use hydroflow::util::{deserialize_from_bytes, serialize_to_bytes}; +use dfir_rs::util::deploy::{ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource}; +use dfir_rs::util::{deserialize_from_bytes, serialize_to_bytes}; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let to_replica_source = ports .port("to_replica") .connect::() diff --git a/hydro_deploy/hydro_cli_examples/examples/empty_program/main.rs b/hydro_deploy/hydro_cli_examples/examples/empty_program/main.rs index 19f3e1f285af..e1723d71937b 100644 --- a/hydro_deploy/hydro_cli_examples/examples/empty_program/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/empty_program/main.rs @@ -1,6 +1,6 @@ -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let _ = hydroflow::util::deploy::init::<()>().await; + let _ = dfir_rs::util::deploy::init::<()>().await; loop { tokio::time::sleep(std::time::Duration::from_secs(1)).await; } diff --git a/hydro_deploy/hydro_cli_examples/examples/panic_program/main.rs b/hydro_deploy/hydro_cli_examples/examples/panic_program/main.rs index 3b57b0680932..f99267ccfecf 100644 --- a/hydro_deploy/hydro_cli_examples/examples/panic_program/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/panic_program/main.rs @@ -1,8 +1,8 @@ use std::io::Write; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let _ = hydroflow::util::deploy::init::<()>().await; + let _ = dfir_rs::util::deploy::init::<()>().await; println!("hello!"); std::io::stdout().flush().unwrap(); diff --git a/hydro_deploy/hydro_cli_examples/examples/stdout_receiver/main.rs b/hydro_deploy/hydro_cli_examples/examples/stdout_receiver/main.rs index d5123a7b7f8d..1bf0abc7427d 100644 --- a/hydro_deploy/hydro_cli_examples/examples/stdout_receiver/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/stdout_receiver/main.rs @@ -1,9 +1,9 @@ -use hydroflow::dfir_syntax; -use hydroflow::util::deploy::{ConnectedDirect, ConnectedSource}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::deploy::{ConnectedDirect, ConnectedSource}; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let echo_recv = ports .port("echo") .connect::() @@ -16,5 +16,5 @@ async fn main() { for_each(|x| println!("echo {:?}", x)); }; - hydroflow::util::deploy::launch_flow(df).await; + dfir_rs::util::deploy::launch_flow(df).await; } diff --git a/hydro_deploy/hydro_cli_examples/examples/tagged_stdout_receiver/main.rs b/hydro_deploy/hydro_cli_examples/examples/tagged_stdout_receiver/main.rs index 4fd01223ce5a..89c1706707d4 100644 --- a/hydro_deploy/hydro_cli_examples/examples/tagged_stdout_receiver/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/tagged_stdout_receiver/main.rs @@ -1,9 +1,9 @@ -use hydroflow::dfir_syntax; -use hydroflow::util::deploy::{ConnectedDirect, ConnectedSource, ConnectedTagged}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::deploy::{ConnectedDirect, ConnectedSource, ConnectedTagged}; -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let echo_recv = ports .port("echo") .connect::>() @@ -19,5 +19,5 @@ async fn main() { for_each(|x| println!("echo {:?}", x)); }; - hydroflow::util::deploy::launch_flow(df).await; + dfir_rs::util::deploy::launch_flow(df).await; } diff --git a/hydro_deploy/hydro_cli_examples/examples/ws_chat_server/main.rs b/hydro_deploy/hydro_cli_examples/examples/ws_chat_server/main.rs index b99e3124851f..9cb84bc72054 100644 --- a/hydro_deploy/hydro_cli_examples/examples/ws_chat_server/main.rs +++ b/hydro_deploy/hydro_cli_examples/examples/ws_chat_server/main.rs @@ -1,7 +1,7 @@ -use hydroflow::compiled::pull::HalfMultisetJoinState; -use hydroflow::dfir_syntax; -use hydroflow::util::deploy::{ConnectedSink, ConnectedSource}; -use hydroflow::util::{deserialize_from_bytes, serialize_to_bytes}; +use dfir_rs::compiled::pull::HalfMultisetJoinState; +use dfir_rs::dfir_syntax; +use dfir_rs::util::deploy::{ConnectedSink, ConnectedSource}; +use dfir_rs::util::{deserialize_from_bytes, serialize_to_bytes}; use serde::{Deserialize, Serialize}; use tokio::net::TcpListener; @@ -27,19 +27,19 @@ struct ChatMessage { text: String, } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let from_peer = ports .port("from_peer") - .connect::() + .connect::() .await .into_source(); let to_peer = ports .port("to_peer") - .connect::>() + .connect::>() .await .into_sink(); @@ -116,5 +116,5 @@ async fn main() { all_messages -> [1]broadcast_clients; }; - hydroflow::util::deploy::launch_flow(df).await; + dfir_rs::util::deploy::launch_flow(df).await; } diff --git a/hydro_deploy/hydro_cli_examples/examples/ws_chat_server/util.rs b/hydro_deploy/hydro_cli_examples/examples/ws_chat_server/util.rs index db577c59dada..09c3294f9d66 100644 --- a/hydro_deploy/hydro_cli_examples/examples/ws_chat_server/util.rs +++ b/hydro_deploy/hydro_cli_examples/examples/ws_chat_server/util.rs @@ -1,10 +1,10 @@ use std::collections::HashMap; use std::sync::Arc; +use dfir_rs::tokio_stream::wrappers::UnboundedReceiverStream; use futures::channel::mpsc::UnboundedSender; use futures::stream::SplitSink; use futures::{SinkExt, StreamExt}; -use hydroflow::tokio_stream::wrappers::UnboundedReceiverStream; use tokio::net::TcpListener; use tokio_tungstenite::tungstenite::Message; @@ -16,11 +16,11 @@ pub(crate) async fn ws_server( UnboundedReceiverStream<(usize, String)>, UnboundedSender<(usize, String)>, ) { - let (clients_send, clients_connect) = hydroflow::util::unbounded_channel(); - let (client_disconnect_send, clients_disconnect) = hydroflow::util::unbounded_channel(); + let (clients_send, clients_connect) = dfir_rs::util::unbounded_channel(); + let (client_disconnect_send, clients_disconnect) = dfir_rs::util::unbounded_channel(); let (received_messages_send, from_client) = - hydroflow::util::unbounded_channel::<(usize, String)>(); + dfir_rs::util::unbounded_channel::<(usize, String)>(); let recipients = Arc::new(tokio::sync::Mutex::new(HashMap::< usize, SplitSink<_, Message>, diff --git a/hydro_lang/Cargo.toml b/hydro_lang/Cargo.toml index 2621fc3c3261..760109ff526a 100644 --- a/hydro_lang/Cargo.toml +++ b/hydro_lang/Cargo.toml @@ -22,7 +22,7 @@ build = [ "dep:dfir_lang" ] [dependencies] bincode = "1.3.1" hydro_deploy = { path = "../hydro_deploy/core", version = "^0.10.0", optional = true } -hydroflow = { path = "../hydroflow", version = "^0.10.0", default-features = false, features = ["deploy_integration"] } +dfir_rs = { path = "../dfir_rs", version = "^0.10.0", default-features = false, features = ["deploy_integration"] } dfir_lang = { path = "../dfir_lang", version = "^0.10.0", optional = true } match_box = "0.0.2" nameof = { version = "1.0.0", optional = true } diff --git a/hydro_lang/src/builder/compiled.rs b/hydro_lang/src/builder/compiled.rs index ab8dadb29983..56ff2e731459 100644 --- a/hydro_lang/src/builder/compiled.rs +++ b/hydro_lang/src/builder/compiled.rs @@ -2,7 +2,7 @@ use std::collections::BTreeMap; use std::marker::PhantomData; use dfir_lang::graph::{partition_graph, HydroflowGraph}; -use hydroflow::scheduled::graph::Hydroflow; +use dfir_rs::scheduled::graph::Hydroflow; use proc_macro2::TokenStream; use quote::quote; use stageleft::runtime_support::FreeVariableWithContext; @@ -34,10 +34,10 @@ impl<'a> CompiledFlow<'a, usize> { let hydroflow_crate = proc_macro_crate::crate_name("hydro_lang") .expect("hydro_lang should be present in `Cargo.toml`"); let root = match hydroflow_crate { - proc_macro_crate::FoundCrate::Itself => quote! { hydro_lang::hydroflow }, + proc_macro_crate::FoundCrate::Itself => quote! { hydro_lang::dfir_rs }, proc_macro_crate::FoundCrate::Name(name) => { let ident = syn::Ident::new(&name, proc_macro2::Span::call_site()); - quote! { #ident::hydroflow } + quote! { #ident::dfir_rs } } }; @@ -94,10 +94,10 @@ impl<'a, Ctx> FreeVariableWithContext for CompiledFlow<'a, ()> { let hydroflow_crate = proc_macro_crate::crate_name("hydro_lang") .expect("hydro_lang should be present in `Cargo.toml`"); let root = match hydroflow_crate { - proc_macro_crate::FoundCrate::Itself => quote! { hydro_lang::hydroflow }, + proc_macro_crate::FoundCrate::Itself => quote! { hydro_lang::dfir_rs }, proc_macro_crate::FoundCrate::Name(name) => { let ident = syn::Ident::new(&name, proc_macro2::Span::call_site()); - quote! { #ident::hydroflow } + quote! { #ident::dfir_rs } } }; diff --git a/hydro_lang/src/builder/deploy.rs b/hydro_lang/src/builder/deploy.rs index db11d7bcdd90..448c739ccf32 100644 --- a/hydro_lang/src/builder/deploy.rs +++ b/hydro_lang/src/builder/deploy.rs @@ -3,8 +3,8 @@ use std::io::Error; use std::marker::PhantomData; use std::pin::Pin; -use hydroflow::bytes::Bytes; -use hydroflow::futures::{Sink, Stream}; +use dfir_rs::bytes::Bytes; +use dfir_rs::futures::{Sink, Stream}; use proc_macro2::Span; use serde::de::DeserializeOwned; use serde::Serialize; diff --git a/hydro_lang/src/deploy/deploy_graph.rs b/hydro_lang/src/deploy/deploy_graph.rs index 7dc9a4ee3027..1cc09e340ba1 100644 --- a/hydro_lang/src/deploy/deploy_graph.rs +++ b/hydro_lang/src/deploy/deploy_graph.rs @@ -7,6 +7,9 @@ use std::rc::Rc; use std::sync::Arc; use dfir_lang::graph::HydroflowGraph; +use dfir_rs::bytes::Bytes; +use dfir_rs::futures::{Sink, SinkExt, Stream, StreamExt}; +use dfir_rs::util::deploy::{ConnectedSink, ConnectedSource}; use hydro_deploy::custom_service::CustomClientPort; use hydro_deploy::hydroflow_crate::ports::{ DemuxSink, HydroflowSink, HydroflowSource, TaggedSource, @@ -14,9 +17,6 @@ use hydro_deploy::hydroflow_crate::ports::{ use hydro_deploy::hydroflow_crate::tracing_options::TracingOptions; use hydro_deploy::hydroflow_crate::HydroflowCrateService; use hydro_deploy::{CustomService, Deployment, Host, HydroflowCrate}; -use hydroflow::bytes::Bytes; -use hydroflow::futures::{Sink, SinkExt, Stream, StreamExt}; -use hydroflow::util::deploy::{ConnectedSink, ConnectedSource}; use nameof::name_of; use serde::de::DeserializeOwned; use serde::Serialize; diff --git a/hydro_lang/src/deploy/macro_runtime.rs b/hydro_lang/src/deploy/macro_runtime.rs index 475c037a425e..1fcae1b00eda 100644 --- a/hydro_lang/src/deploy/macro_runtime.rs +++ b/hydro_lang/src/deploy/macro_runtime.rs @@ -4,9 +4,9 @@ use std::pin::Pin; use std::rc::Rc; use dfir_lang::graph::HydroflowGraph; -use hydroflow::bytes::Bytes; -use hydroflow::futures::{Sink, Stream}; -use hydroflow::util::deploy::DeployPorts; +use dfir_rs::bytes::Bytes; +use dfir_rs::futures::{Sink, Stream}; +use dfir_rs::util::deploy::DeployPorts; use stageleft::{QuotedWithContext, RuntimeData}; use crate::deploy::{ClusterSpec, Deploy, ExternalSpec, Node, ProcessSpec, RegisterPort}; diff --git a/hydro_lang/src/deploy/mod.rs b/hydro_lang/src/deploy/mod.rs index 3ceb87aa6f77..127db8588044 100644 --- a/hydro_lang/src/deploy/mod.rs +++ b/hydro_lang/src/deploy/mod.rs @@ -3,8 +3,8 @@ use std::io::Error; use std::pin::Pin; use dfir_lang::graph::HydroflowGraph; -use hydroflow::bytes::Bytes; -use hydroflow::futures::{Sink, Stream}; +use dfir_rs::bytes::Bytes; +use dfir_rs::futures::{Sink, Stream}; use serde::de::DeserializeOwned; use serde::Serialize; use stageleft::QuotedWithContext; diff --git a/hydro_lang/src/deploy/trybuild.rs b/hydro_lang/src/deploy/trybuild.rs index 68e1670299b2..cdceebf93c03 100644 --- a/hydro_lang/src/deploy/trybuild.rs +++ b/hydro_lang/src/deploy/trybuild.rs @@ -93,7 +93,7 @@ pub fn compile_graph_trybuild(graph: HydroflowGraph, extra_stmts: Vec let mut diagnostics = Vec::new(); let tokens = partitioned_graph.as_code( - "e! { hydro_lang::hydroflow }, + "e! { hydro_lang::dfir_rs }, true, quote!(), &mut diagnostics, @@ -104,17 +104,17 @@ pub fn compile_graph_trybuild(graph: HydroflowGraph, extra_stmts: Vec use hydro_lang::*; #[allow(unused)] - fn __hydro_runtime<'a>(__hydro_lang_trybuild_cli: &'a hydro_lang::hydroflow::util::deploy::DeployPorts) -> hydro_lang::hydroflow::scheduled::graph::Hydroflow<'a> { + fn __hydro_runtime<'a>(__hydro_lang_trybuild_cli: &'a hydro_lang::dfir_rs::util::deploy::DeployPorts) -> hydro_lang::dfir_rs::scheduled::graph::Hydroflow<'a> { #(#extra_stmts)* #tokens } #[tokio::main] async fn main() { - let ports = hydro_lang::hydroflow::util::deploy::init_no_ack_start().await; + let ports = hydro_lang::dfir_rs::util::deploy::init_no_ack_start().await; let flow = __hydro_runtime(&ports); println!("ack start"); - hydro_lang::hydroflow::util::deploy::launch_flow(flow).await; + hydro_lang::dfir_rs::util::deploy::launch_flow(flow).await; } }; source_ast diff --git a/hydro_lang/src/deploy_runtime.rs b/hydro_lang/src/deploy_runtime.rs index 14b383c42d03..ce5b08eb95a5 100644 --- a/hydro_lang/src/deploy_runtime.rs +++ b/hydro_lang/src/deploy_runtime.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use hydroflow::util::deploy::{ +use dfir_rs::util::deploy::{ ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource, ConnectedTagged, DeployPorts, }; use serde::{Deserialize, Serialize}; diff --git a/hydro_lang/src/lib.rs b/hydro_lang/src/lib.rs index 9512e4389cf8..67ad1133827b 100644 --- a/hydro_lang/src/lib.rs +++ b/hydro_lang/src/lib.rs @@ -1,6 +1,6 @@ stageleft::stageleft_no_entry_crate!(); -pub use hydroflow; +pub use dfir_rs; pub use stageleft::q; #[doc(hidden)] diff --git a/hydro_lang/src/location/external_process.rs b/hydro_lang/src/location/external_process.rs index 4cc5db7b5bab..926e38de670e 100644 --- a/hydro_lang/src/location/external_process.rs +++ b/hydro_lang/src/location/external_process.rs @@ -1,6 +1,6 @@ use std::marker::PhantomData; -use hydroflow::bytes::Bytes; +use dfir_rs::bytes::Bytes; use serde::de::DeserializeOwned; use serde::Serialize; diff --git a/hydro_lang/src/location/mod.rs b/hydro_lang/src/location/mod.rs index 7745b20fca2f..8b91d1d81e17 100644 --- a/hydro_lang/src/location/mod.rs +++ b/hydro_lang/src/location/mod.rs @@ -2,8 +2,8 @@ use std::fmt::Debug; use std::marker::PhantomData; use std::time::Duration; -use hydroflow::futures::stream::Stream as FuturesStream; -use hydroflow::{tokio, tokio_stream}; +use dfir_rs::futures::stream::Stream as FuturesStream; +use dfir_rs::{tokio, tokio_stream}; use proc_macro2::Span; use stageleft::{q, QuotedWithContext}; diff --git a/hydro_lang/src/rewrites/profiler.rs b/hydro_lang/src/rewrites/profiler.rs index e25b815b4a59..8e2b01a0839c 100644 --- a/hydro_lang/src/rewrites/profiler.rs +++ b/hydro_lang/src/rewrites/profiler.rs @@ -1,6 +1,6 @@ use std::cell::RefCell; -use hydroflow::futures::channel::mpsc::UnboundedSender; +use dfir_rs::futures::channel::mpsc::UnboundedSender; use stageleft::*; use super::profiler as myself; // TODO(shadaj): stageleft does not support `self::...` diff --git a/hydro_lang/src/runtime_context.rs b/hydro_lang/src/runtime_context.rs index 8fe289c252ea..836cc76ed4a8 100644 --- a/hydro_lang/src/runtime_context.rs +++ b/hydro_lang/src/runtime_context.rs @@ -1,4 +1,4 @@ -use hydroflow::scheduled::context::Context; +use dfir_rs::scheduled::context::Context; use proc_macro2::TokenStream; use quote::quote; use stageleft::runtime_support::FreeVariableWithContext; @@ -22,8 +22,8 @@ impl<'a, L: Location<'a>> FreeVariableWithContext for RuntimeContext<'a> { #[cfg(test)] mod tests { + use dfir_rs::futures::StreamExt; use hydro_deploy::Deployment; - use hydroflow::futures::StreamExt; use crate::*; diff --git a/hydro_lang/src/stream.rs b/hydro_lang/src/stream.rs index 8d8e7b04bb17..6a29fec9405a 100644 --- a/hydro_lang/src/stream.rs +++ b/hydro_lang/src/stream.rs @@ -4,8 +4,8 @@ use std::marker::PhantomData; use std::ops::Deref; use std::rc::Rc; -use hydroflow::bytes::Bytes; -use hydroflow::futures; +use dfir_rs::bytes::Bytes; +use dfir_rs::futures; use serde::de::DeserializeOwned; use serde::Serialize; use stageleft::{q, IntoQuotedMut, QuotedWithContext}; @@ -1328,8 +1328,8 @@ impl<'a, T, L: Location<'a> + NoTick, B> Stream { #[cfg(test)] mod tests { + use dfir_rs::futures::StreamExt; use hydro_deploy::Deployment; - use hydroflow::futures::StreamExt; use serde::{Deserialize, Serialize}; use stageleft::q; diff --git a/hydro_test_local/Cargo.toml b/hydro_test_local/Cargo.toml index a305cbf8bd0d..f9dee0d8bdbc 100644 --- a/hydro_test_local/Cargo.toml +++ b/hydro_test_local/Cargo.toml @@ -11,7 +11,7 @@ workspace = true stageleft_devel = [] [dependencies] -hydroflow = { path = "../hydroflow", version = "^0.10.0", default-features = false } # , features = ["debugging"] } +dfir_rs = { path = "../dfir_rs", version = "^0.10.0", default-features = false } # , features = ["debugging"] } hydro_lang = { path = "../hydro_lang", version = "^0.10.0", features = ["build"] } stageleft = { path = "../stageleft", version = "^0.5.0" } rand = "0.8.0" diff --git a/hydro_test_local/src/local/chat_app.rs b/hydro_test_local/src/local/chat_app.rs index f81d92e6ba89..fdea81039c15 100644 --- a/hydro_test_local/src/local/chat_app.rs +++ b/hydro_test_local/src/local/chat_app.rs @@ -1,8 +1,8 @@ +use dfir_rs::tokio::sync::mpsc::UnboundedSender; +use dfir_rs::tokio_stream::wrappers::UnboundedReceiverStream; use hydro_lang::deploy::SingleProcessGraph; -use hydro_lang::hydroflow::scheduled::graph::Hydroflow; +use hydro_lang::dfir_rs::scheduled::graph::Hydroflow; use hydro_lang::*; -use hydroflow::tokio::sync::mpsc::UnboundedSender; -use hydroflow::tokio_stream::wrappers::UnboundedReceiverStream; use stageleft::{Quoted, RuntimeData}; #[stageleft::entry] @@ -57,14 +57,14 @@ pub fn chat_app<'a>( #[stageleft::runtime] #[cfg(test)] mod tests { - use hydroflow::assert_graphvis_snapshots; - use hydroflow::util::collect_ready; + use dfir_rs::assert_graphvis_snapshots; + use dfir_rs::util::collect_ready; #[test] fn test_chat_app_no_replay() { - let (users_send, users) = hydroflow::util::unbounded_channel(); - let (messages_send, messages) = hydroflow::util::unbounded_channel(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (users_send, users) = dfir_rs::util::unbounded_channel(); + let (messages_send, messages) = dfir_rs::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut chat_server = super::chat_app!(users, messages, &out, false); assert_graphvis_snapshots!(chat_server); @@ -105,9 +105,9 @@ mod tests { #[test] fn test_chat_app_replay() { - let (users_send, users) = hydroflow::util::unbounded_channel(); - let (messages_send, messages) = hydroflow::util::unbounded_channel(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (users_send, users) = dfir_rs::util::unbounded_channel(); + let (messages_send, messages) = dfir_rs::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut chat_server = super::chat_app!(users, messages, &out, true); assert_graphvis_snapshots!(chat_server); diff --git a/hydro_test_local/src/local/compute_pi.rs b/hydro_test_local/src/local/compute_pi.rs index 3cffccc9506c..8c4a853b6ce5 100644 --- a/hydro_test_local/src/local/compute_pi.rs +++ b/hydro_test_local/src/local/compute_pi.rs @@ -1,7 +1,7 @@ use std::time::Duration; use hydro_lang::deploy::SingleProcessGraph; -use hydro_lang::hydroflow::scheduled::graph::Hydroflow; +use hydro_lang::dfir_rs::scheduled::graph::Hydroflow; use hydro_lang::*; use stageleft::{Quoted, RuntimeData}; diff --git a/hydro_test_local/src/local/count_elems.rs b/hydro_test_local/src/local/count_elems.rs index f97bb3abdb09..71f8c82ae793 100644 --- a/hydro_test_local/src/local/count_elems.rs +++ b/hydro_test_local/src/local/count_elems.rs @@ -1,8 +1,8 @@ +use dfir_rs::tokio::sync::mpsc::UnboundedSender; +use dfir_rs::tokio_stream::wrappers::UnboundedReceiverStream; use hydro_lang::deploy::SingleProcessGraph; -use hydro_lang::hydroflow::scheduled::graph::Hydroflow; +use hydro_lang::dfir_rs::scheduled::graph::Hydroflow; use hydro_lang::*; -use hydroflow::tokio::sync::mpsc::UnboundedSender; -use hydroflow::tokio_stream::wrappers::UnboundedReceiverStream; use stageleft::{Quoted, RuntimeData}; pub fn count_elems_generic<'a, T: 'a>( @@ -40,13 +40,13 @@ pub fn count_elems<'a>( #[stageleft::runtime] #[cfg(test)] mod tests { - use hydroflow::assert_graphvis_snapshots; - use hydroflow::util::collect_ready; + use dfir_rs::assert_graphvis_snapshots; + use dfir_rs::util::collect_ready; #[test] pub fn test_count() { - let (in_send, input) = hydroflow::util::unbounded_channel(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (in_send, input) = dfir_rs::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut count = super::count_elems!(input, &out); assert_graphvis_snapshots!(count); diff --git a/hydro_test_local/src/local/first_ten.rs b/hydro_test_local/src/local/first_ten.rs index ff8ea851a4a0..4e641ea7ca18 100644 --- a/hydro_test_local/src/local/first_ten.rs +++ b/hydro_test_local/src/local/first_ten.rs @@ -1,5 +1,5 @@ use hydro_lang::deploy::SingleProcessGraph; -use hydro_lang::hydroflow::scheduled::graph::Hydroflow; +use hydro_lang::dfir_rs::scheduled::graph::Hydroflow; use hydro_lang::*; use stageleft::Quoted; diff --git a/hydro_test_local/src/local/graph_reachability.rs b/hydro_test_local/src/local/graph_reachability.rs index f715664b6efe..f9bdea894f65 100644 --- a/hydro_test_local/src/local/graph_reachability.rs +++ b/hydro_test_local/src/local/graph_reachability.rs @@ -1,8 +1,8 @@ +use dfir_rs::tokio::sync::mpsc::UnboundedSender; +use dfir_rs::tokio_stream::wrappers::UnboundedReceiverStream; use hydro_lang::deploy::SingleProcessGraph; -use hydro_lang::hydroflow::scheduled::graph::Hydroflow; +use hydro_lang::dfir_rs::scheduled::graph::Hydroflow; use hydro_lang::*; -use hydroflow::tokio::sync::mpsc::UnboundedSender; -use hydroflow::tokio_stream::wrappers::UnboundedReceiverStream; use stageleft::{Quoted, RuntimeData}; #[stageleft::entry] @@ -47,14 +47,14 @@ pub fn graph_reachability<'a>( #[stageleft::runtime] #[cfg(test)] mod tests { - use hydroflow::assert_graphvis_snapshots; - use hydroflow::util::collect_ready; + use dfir_rs::assert_graphvis_snapshots; + use dfir_rs::util::collect_ready; #[test] pub fn test_reachability() { - let (roots_send, roots) = hydroflow::util::unbounded_channel(); - let (edges_send, edges) = hydroflow::util::unbounded_channel(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (roots_send, roots) = dfir_rs::util::unbounded_channel(); + let (edges_send, edges) = dfir_rs::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut reachability = super::graph_reachability!(roots, edges, &out); assert_graphvis_snapshots!(reachability); diff --git a/hydro_test_local/src/local/negation.rs b/hydro_test_local/src/local/negation.rs index cc48d9e454c9..c9d9b2b3860f 100644 --- a/hydro_test_local/src/local/negation.rs +++ b/hydro_test_local/src/local/negation.rs @@ -1,7 +1,7 @@ +use dfir_rs::tokio::sync::mpsc::UnboundedSender; use hydro_lang::deploy::SingleProcessGraph; -use hydro_lang::hydroflow::scheduled::graph::Hydroflow; +use hydro_lang::dfir_rs::scheduled::graph::Hydroflow; use hydro_lang::*; -use hydroflow::tokio::sync::mpsc::UnboundedSender; use stageleft::{Quoted, RuntimeData}; #[stageleft::entry] @@ -86,12 +86,12 @@ pub fn test_anti_join<'a>( #[stageleft::runtime] #[cfg(test)] mod tests { - use hydroflow::assert_graphvis_snapshots; - use hydroflow::util::collect_ready; + use dfir_rs::assert_graphvis_snapshots; + use dfir_rs::util::collect_ready; #[test] fn test_difference_tick_tick() { - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut flow = super::test_difference!(&out, false, false); assert_graphvis_snapshots!(flow); @@ -107,7 +107,7 @@ mod tests { #[test] fn test_difference_tick_static() { - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut flow = super::test_difference!(&out, false, true); assert_graphvis_snapshots!(flow); @@ -123,7 +123,7 @@ mod tests { #[test] fn test_difference_static_tick() { - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut flow = super::test_difference!(&out, true, false); assert_graphvis_snapshots!(flow); @@ -142,7 +142,7 @@ mod tests { #[test] fn test_difference_static_static() { - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut flow = super::test_difference!(&out, true, true); assert_graphvis_snapshots!(flow); @@ -158,7 +158,7 @@ mod tests { #[test] fn test_anti_join_tick_tick() { - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut flow = super::test_anti_join!(&out, false, false); assert_graphvis_snapshots!(flow); @@ -174,7 +174,7 @@ mod tests { #[test] fn test_anti_join_tick_static() { - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut flow = super::test_anti_join!(&out, false, true); assert_graphvis_snapshots!(flow); @@ -190,7 +190,7 @@ mod tests { #[test] fn test_anti_join_static_tick() { - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut flow = super::test_anti_join!(&out, true, false); assert_graphvis_snapshots!(flow); @@ -209,7 +209,7 @@ mod tests { #[test] fn test_anti_join_static_static() { - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut flow = super::test_anti_join!(&out, true, true); assert_graphvis_snapshots!(flow); diff --git a/hydro_test_local/src/local/teed_join.rs b/hydro_test_local/src/local/teed_join.rs index 01a097e70784..8238256907c1 100644 --- a/hydro_test_local/src/local/teed_join.rs +++ b/hydro_test_local/src/local/teed_join.rs @@ -1,9 +1,9 @@ +use dfir_rs::futures::stream::Stream; +use dfir_rs::tokio::sync::mpsc::UnboundedSender; +use dfir_rs::tokio_stream::wrappers::UnboundedReceiverStream; use hydro_lang::deploy::MultiGraph; -use hydro_lang::hydroflow::scheduled::graph::Hydroflow; +use hydro_lang::dfir_rs::scheduled::graph::Hydroflow; use hydro_lang::*; -use hydroflow::futures::stream::Stream; -use hydroflow::tokio::sync::mpsc::UnboundedSender; -use hydroflow::tokio_stream::wrappers::UnboundedReceiverStream; use stageleft::{Quoted, RuntimeData}; struct N0 {} @@ -55,13 +55,13 @@ pub fn teed_join<'a, S: Stream + Unpin + 'a>( #[stageleft::runtime] #[cfg(test)] mod tests { - use hydroflow::assert_graphvis_snapshots; - use hydroflow::util::collect_ready; + use dfir_rs::assert_graphvis_snapshots; + use dfir_rs::util::collect_ready; #[test] fn test_teed_join() { - let (in_send, input) = hydroflow::util::unbounded_channel(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (in_send, input) = dfir_rs::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut joined = super::teed_join!(input, &out, false, 0); assert_graphvis_snapshots!(joined); @@ -78,8 +78,8 @@ mod tests { #[test] fn test_teed_join_twice() { - let (in_send, input) = hydroflow::util::unbounded_channel(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (in_send, input) = dfir_rs::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut joined = super::teed_join!(input, &out, true, 0); assert_graphvis_snapshots!(joined); @@ -96,8 +96,8 @@ mod tests { #[test] fn test_teed_join_multi_node() { - let (_, input) = hydroflow::util::unbounded_channel(); - let (out, mut out_recv) = hydroflow::util::unbounded_channel(); + let (_, input) = dfir_rs::util::unbounded_channel(); + let (out, mut out_recv) = dfir_rs::util::unbounded_channel(); let mut joined = super::teed_join!(input, &out, true, 1); assert_graphvis_snapshots!(joined); diff --git a/hydroflow/tests/compile-fail/surface_dest_sink_badsink.stderr b/hydroflow/tests/compile-fail/surface_dest_sink_badsink.stderr deleted file mode 100644 index 28f1c8183594..000000000000 --- a/hydroflow/tests/compile-fail/surface_dest_sink_badsink.stderr +++ /dev/null @@ -1,28 +0,0 @@ -error[E0277]: the trait bound `&str: hydroflow::futures::Sink<_>` is not satisfied - --> tests/compile-fail/surface_dest_sink_badsink.rs:6:41 - | -6 | source_iter(0..10) -> dest_sink(sink); - | ----------^^^^- - | | | - | | the trait `hydroflow::futures::Sink<_>` is not implemented for `&str` - | required by a bound introduced by this call - | - = help: the following other types implement trait `hydroflow::futures::Sink`: - <&hydroflow::futures::futures_channel::mpsc::UnboundedSender as hydroflow::futures::Sink> - <&mut S as hydroflow::futures::Sink> - as hydroflow::futures::Sink> - as hydroflow::futures::Sink> - as hydroflow::futures::Sink> - as hydroflow::futures::Sink<(u32, T)>> - as hydroflow::futures::Sink> - as hydroflow::futures::Sink<_Item>> - and $N others -note: required by a bound in `sink_feed_flush` - --> tests/compile-fail/surface_dest_sink_badsink.rs:5:18 - | -5 | let mut df = dfir_syntax! { - | __________________^ -6 | | source_iter(0..10) -> dest_sink(sink); -7 | | }; - | |_____^ required by this bound in `sink_feed_flush` - = note: this error originates in the macro `dfir_syntax` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/hydroflow/tests/compile-fail/surface_lattice_fold_wronggeneric.rs b/hydroflow/tests/compile-fail/surface_lattice_fold_wronggeneric.rs deleted file mode 100644 index a2fa207c71d3..000000000000 --- a/hydroflow/tests/compile-fail/surface_lattice_fold_wronggeneric.rs +++ /dev/null @@ -1,10 +0,0 @@ -use hydroflow::dfir_syntax; - -fn main() { - let mut df = dfir_syntax! { - source_iter([1,2,3,4,5]) - -> lattice_fold::<'static, hydroflow::lattices::set_union::SetUnionHashSet>(hydroflow::lattices::set_union::SetUnionHashSet::::default()) - -> for_each(|x| println!("Least upper bound: {:?}", x)); - }; - df.run_available(); -} diff --git a/multiplatform_test/README.md b/multiplatform_test/README.md index 3d69f347551f..6e649777caa8 100644 --- a/multiplatform_test/README.md +++ b/multiplatform_test/README.md @@ -43,7 +43,7 @@ There are many platforms which can be specified: * `test` - Adds a standard [`#[test]` attribute](https://doc.rust-lang.org/reference/attributes/testing.html#the-test-attribute). * `tokio` - Adds a [`#[tokio::test]` attribute](https://docs.rs/tokio/latest/tokio/attr.test.html). * `async_std` - Adds an [`#[async_std::test]` attribute](https://docs.rs/async-std/latest/async_std/attr.test.html). -* `hydroflow` - Adds a [`#[hydroflow::test]` attribute](https://docs.rs/hydroflow/latest/hydroflow/attr.test.html). +* `hydroflow` - Adds a [`#[dfir_rs::test]` attribute](https://docs.rs/hydroflow/latest/hydroflow/attr.test.html). * `wasm` - Adds a [`#[wasm_bindgen_test::wasm_bindgen_test]` attribute](https://docs.rs/wasm-bindgen-test/0.3.36/wasm_bindgen_test/attr.wasm_bindgen_test.html). * `env_logging` - Registers [`env_logger`](https://docs.rs/env_logger/latest/env_logger/) for [`log`ging](https://docs.rs/log/latest/log/). * `env_tracing` - Registers a [`FmtSubscriber`](https://docs.rs/tracing-subscriber/latest/tracing_subscriber/index.html#reexport.FmtSubscriber) with an [`EnvFilter`](https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html) for [`tracing`](https://docs.rs/tracing/latest/tracing/). diff --git a/multiplatform_test/src/lib.rs b/multiplatform_test/src/lib.rs index 1a1b019cf527..a1826fc960a3 100644 --- a/multiplatform_test/src/lib.rs +++ b/multiplatform_test/src/lib.rs @@ -8,7 +8,7 @@ enum Platform { Default, Tokio, AsyncStd, - Hydroflow, + Dfir, Wasm, EnvLogging, EnvTracing, @@ -19,7 +19,7 @@ impl Platform { Self::Default, Self::Tokio, Self::AsyncStd, - Self::Hydroflow, + Self::Dfir, Self::Wasm, Self::EnvLogging, Self::EnvTracing, @@ -33,7 +33,7 @@ impl Platform { Self::Default => "test", Self::Tokio => "tokio", Self::AsyncStd => "async_std", - Self::Hydroflow => "hydroflow", + Self::Dfir => "dfir", Self::Wasm => "wasm", Self::EnvLogging => "env_logging", Self::EnvTracing => "env_tracing", @@ -50,7 +50,7 @@ impl Platform { Platform::Default => quote! { #[test] }, Platform::Tokio => quote! { #[tokio::test ] }, Platform::AsyncStd => quote! { #[async_std::test] }, - Platform::Hydroflow => quote! { #[hydroflow::test] }, + Platform::Dfir => quote! { #[dfir_rs::test] }, Platform::Wasm => { quote! { #[wasm_bindgen_test::wasm_bindgen_test] } } diff --git a/precheck.bash b/precheck.bash index 1888e4907965..4c16cd439586 100755 --- a/precheck.bash +++ b/precheck.bash @@ -19,4 +19,4 @@ INSTA_FORCE_PASS=1 INSTA_UPDATE=always TRYBUILD=overwrite cargo test --all-targe cargo test --doc [ "$FULL" = false ] || RUSTDOCFLAGS="-Dwarnings" cargo doc --no-deps -[ "$FULL" = false ] || CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner cargo test -p hydroflow --target wasm32-unknown-unknown --tests --no-fail-fast +[ "$FULL" = false ] || CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner cargo test -p dfir_rs --target wasm32-unknown-unknown --tests --no-fail-fast diff --git a/relalg/Cargo.toml b/relalg/Cargo.toml index e7c6edba3316..bcde3949e4dd 100644 --- a/relalg/Cargo.toml +++ b/relalg/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] anyhow = "1.0.82" datadriven = "0.6.0" -hydroflow = { path = "../hydroflow" } +dfir_rs = { path = "../dfir_rs" } proc-macro2 = "1.0.74" quote = "1.0.35" syn = { version = "2.0.46", features = [ "parsing", "extra-traits" ] } diff --git a/relalg/src/runtime.rs b/relalg/src/runtime.rs index 3bedaa97b7d1..615c6cb65076 100644 --- a/relalg/src/runtime.rs +++ b/relalg/src/runtime.rs @@ -1,10 +1,10 @@ use std::cell::RefCell; use std::rc::Rc; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::scheduled::graph_ext::GraphExt; -use hydroflow::scheduled::handoff::{Iter, VecHandoff}; -use hydroflow::scheduled::port::RecvPort; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::scheduled::graph_ext::GraphExt; +use dfir_rs::scheduled::handoff::{Iter, VecHandoff}; +use dfir_rs::scheduled::port::RecvPort; use crate::{Datum, RelExpr}; diff --git a/template/hydro/src/first_ten_cluster.rs b/template/hydro/src/first_ten_cluster.rs index a30a9884e78b..4c94a41415ee 100644 --- a/template/hydro/src/first_ten_cluster.rs +++ b/template/hydro/src/first_ten_cluster.rs @@ -17,7 +17,7 @@ pub fn first_ten_cluster<'a>(leader: &Process<'a, Leader>, workers: &Cluster<'a, mod tests { use hydro_deploy::Deployment; use hydro_lang::deploy::DeployCrateWrapper; - use hydro_lang::hydroflow::futures::StreamExt; + use hydro_lang::dfir_rs::futures::StreamExt; use tokio_stream::wrappers::UnboundedReceiverStream; #[tokio::test] diff --git a/template/hydro/src/first_ten_distributed.rs b/template/hydro/src/first_ten_distributed.rs index a5febbba29ae..d9e795e3a2c7 100644 --- a/template/hydro/src/first_ten_distributed.rs +++ b/template/hydro/src/first_ten_distributed.rs @@ -13,7 +13,7 @@ pub fn first_ten_distributed<'a>(p1: &Process<'a, P1>, p2: &Process<'a, P2>) { mod tests { use hydro_deploy::Deployment; use hydro_lang::deploy::DeployCrateWrapper; - use hydro_lang::hydroflow::futures::StreamExt; + use hydro_lang::dfir_rs::futures::StreamExt; use tokio_stream::wrappers::UnboundedReceiverStream; #[tokio::test] diff --git a/template/hydroflow/Cargo.toml b/template/hydroflow/Cargo.toml index c6bad8c7e3a4..79cac797950e 100644 --- a/template/hydroflow/Cargo.toml +++ b/template/hydroflow/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [dependencies] chrono = { version = "0.4.20", features = [ "serde" ], default-features = true } clap = { version = "4.5.4", features = [ "derive" ] } -hydroflow = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow.git' }}", branch = "{{ hydroflow_branch | default: 'main' }}" } +dfir_rs = { git = "{{ hydroflow_git | default: 'https://github.com/hydro-project/hydroflow.git' }}", branch = "{{ hydroflow_branch | default: 'main' }}" } serde = { version = "1.0.197", features = [ "derive" ] } diff --git a/template/hydroflow/src/client.rs b/template/hydroflow/src/client.rs index a58e8dfd993b..ac6af6ad2009 100644 --- a/template/hydroflow/src/client.rs +++ b/template/hydroflow/src/client.rs @@ -2,8 +2,8 @@ use crate::helpers::print_graph; use crate::protocol::Message; use crate::{Opts, DEFAULT_SERVER_ADDRESS}; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::dfir_syntax; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use std::net::SocketAddr; /// Runs the client. The client is a long-running process that reads stdin, and sends messages that diff --git a/template/hydroflow/src/helpers.rs b/template/hydroflow/src/helpers.rs index 58264872461b..a3f6114d4086 100644 --- a/template/hydroflow/src/helpers.rs +++ b/template/hydroflow/src/helpers.rs @@ -1,5 +1,5 @@ -use hydroflow::lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::scheduled::graph::Hydroflow; +use dfir_rs::lang::graph::{WriteConfig, WriteGraphType}; +use dfir_rs::scheduled::graph::Hydroflow; pub fn print_graph(flow: &Hydroflow, graph: WriteGraphType, write_config: Option) { let serde_graph = flow diff --git a/template/hydroflow/src/main.rs b/template/hydroflow/src/main.rs index 17328ce06bbd..5beb60e9a834 100644 --- a/template/hydroflow/src/main.rs +++ b/template/hydroflow/src/main.rs @@ -1,8 +1,8 @@ use clap::{Parser, ValueEnum}; use client::run_client; -use hydroflow::lang::graph::{WriteConfig, WriteGraphType}; -use hydroflow::tokio; -use hydroflow::util::ipv4_resolve; +use dfir_rs::lang::graph::{WriteConfig, WriteGraphType}; +use dfir_rs::tokio; +use dfir_rs::util::ipv4_resolve; use server::run_server; use std::net::SocketAddr; @@ -42,7 +42,7 @@ struct Opts { write_config: Option, } -#[hydroflow::main] +#[dfir_rs::main] /// This is the main entry-point for both `Client` and `Server`. async fn main() { // Parse command line arguments diff --git a/template/hydroflow/src/server.rs b/template/hydroflow/src/server.rs index 26ae2f05476a..ce6ffdfd5944 100644 --- a/template/hydroflow/src/server.rs +++ b/template/hydroflow/src/server.rs @@ -2,9 +2,9 @@ use crate::helpers::print_graph; use crate::protocol::Message; use crate::DEFAULT_SERVER_ADDRESS; use chrono::prelude::*; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::{bind_udp_bytes, ipv4_resolve}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::{bind_udp_bytes, ipv4_resolve}; use std::net::SocketAddr; /// Runs the server. The server is a long-running process that listens for messages and echoes @@ -30,7 +30,7 @@ pub(crate) async fn run_server(opts: crate::Opts) { println!("Server is live! Listening on {:?}", actual_server_addr); // The skeletal hydroflow spec for a server. - let mut flow: Hydroflow = dfir_syntax! { + let mut flow: dfir_rs = dfir_syntax! { // Whenever a serialized message is received by the application from a particular address, // a (serialized_payload, address_of_sender) pair is emitted by the `inbound` stream. diff --git a/topolotree/Cargo.toml b/topolotree/Cargo.toml index 25f383022b00..1870b475a477 100644 --- a/topolotree/Cargo.toml +++ b/topolotree/Cargo.toml @@ -24,7 +24,7 @@ name = "latency_measure" path = "src/latency_measure.rs" [dependencies] -hydroflow = { path = "../hydroflow", features = [ "deploy_integration" ] } +dfir_rs = { path = "../dfir_rs", features = [ "deploy_integration" ] } dfir_datalog = { path = "../dfir_datalog" } tokio = { version = "1.29.0", features = [ "full" ] } diff --git a/topolotree/src/latency_measure.rs b/topolotree/src/latency_measure.rs index 724cc349193e..e31866841c05 100644 --- a/topolotree/src/latency_measure.rs +++ b/topolotree/src/latency_measure.rs @@ -5,17 +5,17 @@ use std::sync::{mpsc, Arc}; use std::thread; use std::time::Instant; +use dfir_rs::bytes::Bytes; +use dfir_rs::util::deploy::{ConnectedDirect, ConnectedSink, ConnectedSource}; +use dfir_rs::util::{deserialize_from_bytes, serialize_to_bytes}; use futures::{SinkExt, StreamExt}; -use hydroflow::bytes::Bytes; -use hydroflow::util::deploy::{ConnectedDirect, ConnectedSink, ConnectedSource}; -use hydroflow::util::{deserialize_from_bytes, serialize_to_bytes}; mod protocol; use protocol::*; #[tokio::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let mut start_node = ports .port("increment_start_node") .connect::() diff --git a/topolotree/src/main.rs b/topolotree/src/main.rs index 0a0bbf5fa4eb..c6198d97b8eb 100644 --- a/topolotree/src/main.rs +++ b/topolotree/src/main.rs @@ -8,17 +8,17 @@ use std::io; use std::rc::Rc; use std::time::Duration; -use futures::{SinkExt, Stream}; -use hydroflow::bytes::{Bytes, BytesMut}; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::graph::Hydroflow; -use hydroflow::util::deploy::{ +use dfir_rs::bytes::{Bytes, BytesMut}; +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::graph::Hydroflow; +use dfir_rs::util::deploy::{ ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource, ConnectedTagged, }; +use futures::{SinkExt, Stream}; mod protocol; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::util::{deserialize_from_bytes, serialize_to_bytes}; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::util::{deserialize_from_bytes, serialize_to_bytes}; use protocol::*; use tokio::time::Instant; @@ -211,13 +211,13 @@ fn run_topolotree( } } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { let mut args = std::env::args().skip(1); let _self_id: u32 = args.next().unwrap().parse().unwrap(); let neighbors: Vec = args.map(|x| x.parse().unwrap()).collect(); - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let input_recv = ports .port("from_peer") @@ -289,6 +289,6 @@ async fn main() { } let f1_handle = tokio::spawn(f1); - hydroflow::util::deploy::launch_flow(flow).await; + dfir_rs::util::deploy::launch_flow(flow).await; f1_handle.abort(); } diff --git a/topolotree/src/pn.rs b/topolotree/src/pn.rs index f67ce3a92780..b1d9fd60b8bc 100644 --- a/topolotree/src/pn.rs +++ b/topolotree/src/pn.rs @@ -3,13 +3,13 @@ use std::collections::{HashMap, HashSet}; use std::ops::Deref; use std::rc::Rc; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::serde::{Deserialize, Serialize}; -use hydroflow::util::deploy::{ +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::serde::{Deserialize, Serialize}; +use dfir_rs::util::deploy::{ ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource, ConnectedTagged, }; -use hydroflow::util::{deserialize_from_bytes, serialize_to_bytes}; +use dfir_rs::util::{deserialize_from_bytes, serialize_to_bytes}; mod protocol; use protocol::*; @@ -22,9 +22,9 @@ enum GossipOrIncrement { Increment(u64, i64), } -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let my_id: Vec = serde_json::from_str(&std::env::args().nth(1).unwrap()).unwrap(); let my_id = my_id[0]; @@ -162,6 +162,6 @@ async fn main() { } let f1_handle = tokio::spawn(f1); - hydroflow::util::deploy::launch_flow(df).await; + dfir_rs::util::deploy::launch_flow(df).await; f1_handle.abort(); } diff --git a/topolotree/src/pn_delta.rs b/topolotree/src/pn_delta.rs index 7f0062b58140..f6c1ed4fbcef 100644 --- a/topolotree/src/pn_delta.rs +++ b/topolotree/src/pn_delta.rs @@ -3,13 +3,13 @@ use std::collections::HashMap; use std::ops::Deref; use std::rc::Rc; -use hydroflow::dfir_syntax; -use hydroflow::scheduled::ticks::TickInstant; -use hydroflow::serde::{Deserialize, Serialize}; -use hydroflow::util::deploy::{ +use dfir_rs::dfir_syntax; +use dfir_rs::scheduled::ticks::TickInstant; +use dfir_rs::serde::{Deserialize, Serialize}; +use dfir_rs::util::deploy::{ ConnectedDemux, ConnectedDirect, ConnectedSink, ConnectedSource, ConnectedTagged, }; -use hydroflow::util::{deserialize_from_bytes, serialize_to_bytes}; +use dfir_rs::util::{deserialize_from_bytes, serialize_to_bytes}; mod protocol; use protocol::*; @@ -22,9 +22,9 @@ enum GossipOrIncrement { type NextStateType = (u64, bool, Rc, Vec)>>); -#[hydroflow::main] +#[dfir_rs::main] async fn main() { - let ports = hydroflow::util::deploy::init::<()>().await; + let ports = dfir_rs::util::deploy::init::<()>().await; let my_id: Vec = serde_json::from_str(&std::env::args().nth(1).unwrap()).unwrap(); let my_id = my_id[0]; @@ -163,6 +163,6 @@ async fn main() { } let f1_handle = tokio::spawn(f1); - hydroflow::util::deploy::launch_flow(df).await; + dfir_rs::util::deploy::launch_flow(df).await; f1_handle.abort(); } diff --git a/topolotree/src/tests.rs b/topolotree/src/tests.rs index 78cf3346c74a..84bfef80271a 100644 --- a/topolotree/src/tests.rs +++ b/topolotree/src/tests.rs @@ -1,9 +1,9 @@ use std::time::Duration; -use hydroflow::bytes::{Bytes, BytesMut}; -use hydroflow::tokio_stream::wrappers::UnboundedReceiverStream; -use hydroflow::util::multiset::HashMultiSet; -use hydroflow::util::{ +use dfir_rs::bytes::{Bytes, BytesMut}; +use dfir_rs::tokio_stream::wrappers::UnboundedReceiverStream; +use dfir_rs::util::multiset::HashMultiSet; +use dfir_rs::util::{ collect_ready_async, deserialize_from_bytes, serialize_to_bytes, unbounded_channel, }; use tokio::sync::mpsc::error::SendError; @@ -55,7 +55,7 @@ pub async fn read_all_query( .collect::>() } -#[hydroflow::test(start_paused = true)] +#[dfir_rs::test(start_paused = true)] async fn simple_payload_test() { let neighbors: Vec = vec![1, 2, 3]; @@ -93,7 +93,7 @@ async fn simple_payload_test() { ])); } -#[hydroflow::test(start_paused = true)] +#[dfir_rs::test(start_paused = true)] async fn idempotence_test() { let neighbors: Vec = vec![1, 2, 3]; let (_operations_tx, operations_rx) = unbounded_channel::>(); @@ -134,7 +134,7 @@ async fn idempotence_test() { ])); } -#[hydroflow::test(start_paused = true)] +#[dfir_rs::test(start_paused = true)] async fn backwards_in_time_test() { let neighbors: Vec = vec![1, 2, 3]; @@ -175,7 +175,7 @@ async fn backwards_in_time_test() { ])); } -#[hydroflow::test(start_paused = true)] +#[dfir_rs::test(start_paused = true)] async fn multiple_input_sources_test() { let neighbors: Vec = vec![1, 2, 3]; let (_operations_tx, operations_rx) = unbounded_channel::>(); @@ -217,7 +217,7 @@ async fn multiple_input_sources_test() { ])); } -#[hydroflow::test(start_paused = true)] +#[dfir_rs::test(start_paused = true)] async fn operations_across_ticks() { let neighbors: Vec = vec![1, 2, 3]; @@ -280,7 +280,7 @@ async fn operations_across_ticks() { ])); } -#[hydroflow::test(start_paused = true)] +#[dfir_rs::test(start_paused = true)] async fn operations_multiple_keys() { let neighbors: Vec = vec![1, 2, 3]; @@ -367,7 +367,7 @@ async fn operations_multiple_keys() { ])); } -#[hydroflow::test(start_paused = true)] +#[dfir_rs::test(start_paused = true)] async fn gossip_multiple_keys() { let neighbors: Vec = vec![1, 2, 3]; @@ -437,7 +437,7 @@ async fn gossip_multiple_keys() { ])); } -#[hydroflow::test(start_paused = true)] +#[dfir_rs::test(start_paused = true)] async fn ping_pongs() { let neighbors: Vec = vec![1]; diff --git a/website_playground/Cargo.toml b/website_playground/Cargo.toml index 288b9936f081..50b797e7479f 100644 --- a/website_playground/Cargo.toml +++ b/website_playground/Cargo.toml @@ -17,7 +17,7 @@ default = ["console_error_panic_hook"] futures = "0.3.0" dfir_datalog_core = { path = "../dfir_datalog_core" } dfir_lang = { path = "../dfir_lang" } -hydroflow = { path = "../hydroflow" } +dfir_rs = { path = "../dfir_rs" } prettyplease = { version = "0.2.0", features = [ "verbatim" ] } proc-macro2 = "1.0.74" quote = "1.0.35" diff --git a/website_playground/src/lib.rs b/website_playground/src/lib.rs index fdba318f859c..5736210761d4 100644 --- a/website_playground/src/lib.rs +++ b/website_playground/src/lib.rs @@ -7,8 +7,8 @@ use std::thread_local; use dfir_datalog_core::gen_hydroflow_graph; use dfir_lang::diagnostic::{Diagnostic, Level}; use dfir_lang::graph::{build_hfcode, partition_graph, WriteConfig}; -use hydroflow::datalog; -use hydroflow::scheduled::graph::Hydroflow; +use dfir_rs::datalog; +use dfir_rs::scheduled::graph::Hydroflow; use proc_macro2::{LineColumn, Span}; use quote::quote; use serde::{Deserialize, Serialize}; @@ -226,7 +226,7 @@ pub fn compile_datalog( } struct HydroflowInstance<'a, In, Out> { - hydroflow: Hydroflow<'a>, + dfir: Hydroflow<'a>, input: tokio::sync::mpsc::UnboundedSender, output: tokio::sync::mpsc::UnboundedReceiver, } @@ -241,9 +241,9 @@ thread_local! { #[wasm_bindgen] pub fn init_datalog_boolean_demo(instance_name: &str) { DATALOG_BOOLEAN_DEMO_INSTANCES.with(|map| { - let (in_send, input) = hydroflow::util::unbounded_channel::<(i32,)>(); - let (out, out_recv) = hydroflow::util::unbounded_channel::<(i32,)>(); - let hydroflow = datalog!( + let (in_send, input) = dfir_rs::util::unbounded_channel::<(i32,)>(); + let (out, out_recv) = dfir_rs::util::unbounded_channel::<(i32,)>(); + let dfir = datalog!( r#" .input ints `source_stream(input)` .output result `for_each(|v| out.send(v).unwrap())` @@ -255,7 +255,7 @@ pub fn init_datalog_boolean_demo(instance_name: &str) { map.borrow_mut().insert( instance_name.into(), DatalogBooleanDemoInstance { - hydroflow, + dfir, input: in_send, output: out_recv.into_inner(), }, @@ -269,7 +269,7 @@ pub fn send_datalog_boolean_demo(instance_name: &str, input: i32) -> Option let mut map = map.borrow_mut(); let instance = map.get_mut(instance_name)?; instance.input.send((input,)).unwrap(); - instance.hydroflow.run_tick(); + instance.dfir.run_tick(); match instance .output .poll_recv(&mut Context::from_waker(futures::task::noop_waker_ref()))