chore: Renamed hydroflow_lang -> dfir_lang.

.github/workflows/ci.yml

@@ -116,11 +116,11 @@ jobs:
           target: wasm32-unknown-unknown
           override: ${{ matrix.rust_release == 'latest-stable' }}
 
-      - name: Check hydroflow_lang
+      - name: Check dfir_lang
         uses: actions-rs/cargo@v1
         with:
           command: check
-          args: -p hydroflow_lang --target wasm32-unknown-unknown
+          args: -p dfir_lang --target wasm32-unknown-unknown
 
   test:
     name: Test Suite

.github/workflows/release.yml

@@ -86,7 +86,7 @@ jobs:
           --no-changelog-preview --allow-fully-generated-changelogs
           --bump ${{ inputs.bump }} --bump-dependencies auto
           ${{ inputs.execute && '--execute' || '--no-publish' }}
-          hydroflow hydroflow_lang dfir_macro hydroflow_plus
+          hydroflow dfir_lang dfir_macro hydroflow_plus
           hydroflow_plus_std dfir_datalog dfir_datalog_core
           hydro_deploy hydro_cli hydroflow_deploy_integration
           stageleft stageleft_macro stageleft_tool

CONTRIBUTING.md

@@ -10,7 +10,7 @@ The Hydroflow repo is set up as a monorepo and [Cargo workspace](https://doc.rus
 Relative to the repository root:
 
 * `hydroflow` is the main Hydroflow package, containing the Hydroflow runtime. It re-exports the
-  surface syntax macros in `dfir_macro` and `hydroflow_lang`. The runtime is the "scheduled
+  surface syntax macros in `dfir_macro` and `dfir_lang`. The runtime is the "scheduled
   layer" while the surface syntax compiler is the "compiled layer".
 * `hydro_lang` and related (hydro_*) packages contain Hydro, which is a functional syntax built on
   top of `hydroflow`.

Cargo.toml

@@ -11,7 +11,7 @@ members = [
     "hydroflow",
     "dfir_datalog",
     "dfir_datalog_core",
-    "hydroflow_lang",
+    "dfir_lang",
     "dfir_macro",
     "hydro_lang",
     "hydro_std",

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 hydroflow_lang dfir_macro hydro_lang \
+   hydroflow dfir_lang dfir_macro hydro_lang \
    dfir_datalog dfir_datalog_core \
    hydro_deploy hydro_cli hydroflow_cli_integration \
    hydroflow_plus_cli_integration \
@@ -60,18 +60,18 @@ showing that all the changelogs can be modified. Make sure the version bumps loo
 [INFO ] Updating crates-io index
 [WARN ] Refused to publish 'hydroflow_deploy_integration' as as it didn't change.
 [INFO ] Will not publish or alter 3 dependent crates: unchanged = 'hydroflow_deploy_integration', 'variadics', 'pusherator'
-[INFO ] WOULD auto-bump dependent package 'hydroflow_lang' from 0.4.0 to 0.5.0 for publishing
-[INFO ] WOULD auto-bump dependent package 'dfir_datalog_core' from 0.4.0 to 0.5.0 for publishing, for SAFETY due to breaking package 'hydroflow_lang'
+[INFO ] WOULD auto-bump dependent package 'dfir_lang' from 0.4.0 to 0.5.0 for publishing
+[INFO ] WOULD auto-bump dependent package 'dfir_datalog_core' from 0.4.0 to 0.5.0 for publishing, for SAFETY due to breaking package 'dfir_lang'
 [INFO ] WOULD auto-bump dependent package 'dfir_datalog' from 0.4.0 to 0.5.0 for publishing, for SAFETY due to breaking package 'dfir_datalog_core'
-[INFO ] WOULD auto-bump dependent package 'hydroflow_macro' from 0.4.0 to 0.5.0 for publishing, for SAFETY due to breaking package 'hydroflow_lang'
+[INFO ] WOULD auto-bump dependent package 'hydroflow_macro' from 0.4.0 to 0.5.0 for publishing, for SAFETY due to breaking package 'dfir_lang'
 [INFO ] WOULD auto-bump dependent package 'lattices' from 0.4.0 to 0.5.0 for publishing
 [INFO ] WOULD minor-bump provided package 'hydroflow' from 0.4.0 to 0.5.0 for publishing, for SAFETY due to breaking package 'dfir_datalog'
 [INFO ] WOULD minor-bump provided package 'hydro_cli' from 0.4.0 to 0.5.0 for publishing
-[INFO ] WOULD adjust 2 manifest versions due to breaking change in 'hydroflow_lang': 'dfir_datalog_core' 0.4.0 ➡ 0.5.0, 'hydroflow_macro' 0.4.0 ➡ 0.5.0
+[INFO ] WOULD adjust 2 manifest versions due to breaking change in 'dfir_lang': 'dfir_datalog_core' 0.4.0 ➡ 0.5.0, 'hydroflow_macro' 0.4.0 ➡ 0.5.0
 [INFO ] WOULD adjust 1 manifest version due to breaking change in 'dfir_datalog_core': 'dfir_datalog' 0.4.0 ➡ 0.5.0
 [INFO ] WOULD adjust 1 manifest version due to breaking change in 'dfir_datalog': 'hydroflow' 0.4.0 ➡ 0.5.0
 [INFO ] WOULD adjust version constraints in manifests of 2 packages as direct dependencies are changing: relalg, website_playground
-[INFO ] WOULD modify existing changelog for 'hydroflow_lang'.
+[INFO ] WOULD modify existing changelog for 'dfir_lang'.
 [INFO ] WOULD modify existing changelog for 'dfir_datalog_core'.
 [INFO ] WOULD modify existing changelog for 'dfir_datalog'.
 [INFO ] WOULD modify existing changelog for 'hydroflow_macro'.

dfir_datalog_core/Cargo.toml

@@ -19,7 +19,7 @@ slotmap = "1.0.0"
 syn = { version = "2.0.46", features = [ "parsing", "extra-traits" ] }
 proc-macro2 = "1.0.74"
 rust-sitter = "0.4.3"
-hydroflow_lang = { path = "../hydroflow_lang", version = "^0.10.0" }
+dfir_lang = { path = "../dfir_lang", version = "^0.10.0" }
 
 [build-dependencies]
 rust-sitter-tool = "0.4.3"

dfir_datalog_core/src/join_plan.rs

@@ -1,9 +1,9 @@
 use std::collections::btree_map::Entry;
 use std::collections::{BTreeMap, HashMap};
 
-use hydroflow_lang::diagnostic::{Diagnostic, Level};
-use hydroflow_lang::graph::FlatGraphBuilder;
-use hydroflow_lang::parse::Pipeline;
+use dfir_lang::diagnostic::{Diagnostic, Level};
+use dfir_lang::graph::FlatGraphBuilder;
+use dfir_lang::parse::Pipeline;
 use proc_macro2::Span;
 use rust_sitter::Spanned;
 use syn::{parse_quote, parse_quote_spanned};

dfir_datalog_core/src/lib.rs

@@ -1,12 +1,12 @@
 use std::collections::{HashMap, HashSet};
 use std::ops::Deref;
 
-pub use hydroflow_lang::diagnostic;
-use hydroflow_lang::diagnostic::{Diagnostic, Level};
-use hydroflow_lang::graph::{
+pub use dfir_lang::diagnostic;
+use dfir_lang::diagnostic::{Diagnostic, Level};
+use dfir_lang::graph::{
     eliminate_extra_unions_tees, partition_graph, FlatGraphBuilder, HydroflowGraph,
 };
-use hydroflow_lang::parse::{
+use dfir_lang::parse::{
     HfStatement, IndexInt, Indexing, Pipeline, PipelineLink, PipelineStatement, PortIndex,
 };
 use proc_macro2::{Span, TokenStream};

hydroflow_lang/Cargo.toml → dfir_lang/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-name = "hydroflow_lang"
+name = "dfir_lang"
 publish = true
 version = "0.10.0"
 edition = "2021"
 license = "Apache-2.0"
-documentation = "https://docs.rs/hydroflow_lang/"
-description = "Hydroflow's Surface Syntax implementation"
+documentation = "https://docs.rs/dfir_lang/"
+description = "Hydro's Data Flow Intermediate Representation (DFIR) implementation"
 
 [lints]
 workspace = true

hydroflow_lang/build.rs → dfir_lang/build.rs

@@ -24,7 +24,7 @@ fn main() {
 
     if Err(VarError::NotPresent) != var("CARGO_CFG_HYDROFLOW_GENERATE_DOCS") {
         if let Err(err) = generate_op_docs() {
-            eprintln!("hydroflow_lang/build.rs error: {:?}", err);
+            eprintln!("dfir_lang/build.rs error: {:?}", err);
         }
     }
 }
@@ -74,7 +74,7 @@ fn generate_op_docs() -> Result<()> {
             ]);
             eprintln!("{:?}", docgen_path);
             let mut docgen_write = BufWriter::new(File::create(docgen_path)?);
-            writeln!(docgen_write, "<!-- GENERATED hydroflow_lang/build.rs -->")?;
+            writeln!(docgen_write, "<!-- GENERATED dfir_lang/build.rs -->")?;
 
             let mut in_hf_doctest = false;
             for attr in item_const.attrs.iter() {

dfir_macro/Cargo.toml

@@ -17,14 +17,14 @@ proc-macro = true
 # Note: If we ever compile this proc macro crate to WASM (e.g., if we are
 # building on a WASM host), we may need to turn diagnostics off for WASM if
 # proc_macro2 still does not support WASM.
-hydroflow_lang = { path = "../hydroflow_lang", version = "^0.10.0" }
+dfir_lang = { path = "../dfir_lang", version = "^0.10.0" }
 proc-macro2 = "1.0.74"
 proc-macro-crate = "1.0.0"
 quote = "1.0.35"
 syn = { version = "2.0.46", features = [ "parsing", "extra-traits" ] }
 
 [build-dependencies]
-hydroflow_lang = { path = "../hydroflow_lang", version = "^0.10.0" }
+dfir_lang = { path = "../dfir_lang", version = "^0.10.0" }
 itertools = "0.10.0"
 quote = "1.0.35"
 rustc_version = "0.4.0"

dfir_macro/build.rs

@@ -6,8 +6,8 @@ use std::fs::File;
 use std::io::{BufWriter, Read, Result, Write};
 use std::path::{Path, PathBuf};
 
-use hydroflow_lang::graph::ops::{PortListSpec, OPERATORS};
-use hydroflow_lang::graph::PortIndexValue;
+use dfir_lang::graph::ops::{PortListSpec, OPERATORS};
+use dfir_lang::graph::PortIndexValue;
 use itertools::Itertools;
 use quote::ToTokens;
 use rustc_version::{version_meta, Channel};

dfir_macro/src/lib.rs

@@ -3,9 +3,9 @@
     feature(proc_macro_diagnostic, proc_macro_span, proc_macro_def_site)
 )]
 
-use hydroflow_lang::diagnostic::{Diagnostic, Level};
-use hydroflow_lang::graph::{build_hfcode, partition_graph, FlatGraphBuilder};
-use hydroflow_lang::parse::HfCode;
+use dfir_lang::diagnostic::{Diagnostic, Level};
+use dfir_lang::graph::{build_hfcode, partition_graph, FlatGraphBuilder};
+use dfir_lang::parse::HfCode;
 use proc_macro2::{Ident, Literal, Span};
 use quote::{format_ident, quote};
 use syn::{
@@ -124,7 +124,7 @@ pub fn dfir_parser(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 #[proc_macro]
 pub fn surface_booktest_operators(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     assert!(input.is_empty(), "Input must be empty");
-    let each = hydroflow_lang::graph::ops::OPERATORS.iter().map(|op| {
+    let each = dfir_lang::graph::ops::OPERATORS.iter().map(|op| {
         let op_ident = Ident::new(op.name, Span::call_site());
         let op_filename = format!("../../docs/docgen/{}.md", op.name);
         let lit_filename = LitStr::new(&op_filename, Span::call_site());

hydro_lang/Cargo.toml

@@ -17,13 +17,13 @@ path = "src/lib.rs"
 default = []
 stageleft_devel = []
 deploy = [ "build", "dep:hydro_deploy", "dep:trybuild-internals-api", "dep:toml", "dep:prettyplease", "dep:sha2", "dep:stageleft_tool", "dep:nameof" ]
-build = [ "dep:hydroflow_lang" ]
+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"] }
-hydroflow_lang = { path = "../hydroflow_lang", version = "^0.10.0", optional = true }
+dfir_lang = { path = "../dfir_lang", version = "^0.10.0", optional = true }
 match_box = "0.0.2"
 nameof = { version = "1.0.0", optional = true }
 prettyplease = { version = "0.2.0", features = [ "verbatim" ], optional = true }

hydro_lang/src/builder/built.rs

@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, HashMap};
 use std::marker::PhantomData;
 
-use hydroflow_lang::graph::{eliminate_extra_unions_tees, HydroflowGraph};
+use dfir_lang::graph::{eliminate_extra_unions_tees, HydroflowGraph};
 
 use super::compiled::CompiledFlow;
 use super::deploy::{DeployFlow, DeployResult};

hydro_lang/src/builder/compiled.rs

@@ -1,8 +1,8 @@
 use std::collections::BTreeMap;
 use std::marker::PhantomData;
 
+use dfir_lang::graph::{partition_graph, HydroflowGraph};
 use hydroflow::scheduled::graph::Hydroflow;
-use hydroflow_lang::graph::{partition_graph, HydroflowGraph};
 use proc_macro2::TokenStream;
 use quote::quote;
 use stageleft::runtime_support::FreeVariableWithContext;

hydro_lang/src/deploy/deploy_graph.rs

@@ -6,6 +6,7 @@ use std::pin::Pin;
 use std::rc::Rc;
 use std::sync::Arc;
 
+use dfir_lang::graph::HydroflowGraph;
 use hydro_deploy::custom_service::CustomClientPort;
 use hydro_deploy::hydroflow_crate::ports::{
     DemuxSink, HydroflowSink, HydroflowSource, TaggedSource,
@@ -16,7 +17,6 @@ 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 hydroflow_lang::graph::HydroflowGraph;
 use nameof::name_of;
 use serde::de::DeserializeOwned;
 use serde::Serialize;

hydro_lang/src/deploy/in_memory_graph.rs

@@ -1,4 +1,4 @@
-use hydroflow_lang::graph::HydroflowGraph;
+use dfir_lang::graph::HydroflowGraph;
 
 use super::{LocalDeploy, Node, ProcessSpec};
 

hydro_lang/src/deploy/macro_runtime.rs

@@ -3,10 +3,10 @@ use std::future::Future;
 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 hydroflow_lang::graph::HydroflowGraph;
 use stageleft::{QuotedWithContext, RuntimeData};
 
 use crate::deploy::{ClusterSpec, Deploy, ExternalSpec, Node, ProcessSpec, RegisterPort};

hydro_lang/src/deploy/mod.rs

@@ -2,9 +2,9 @@ use std::future::Future;
 use std::io::Error;
 use std::pin::Pin;
 
+use dfir_lang::graph::HydroflowGraph;
 use hydroflow::bytes::Bytes;
 use hydroflow::futures::{Sink, Stream};
-use hydroflow_lang::graph::HydroflowGraph;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 use stageleft::QuotedWithContext;

hydro_lang/src/deploy/trybuild.rs

@@ -1,7 +1,7 @@
 use std::fs;
 use std::path::PathBuf;
 
-use hydroflow_lang::graph::{partition_graph, HydroflowGraph};
+use dfir_lang::graph::{partition_graph, HydroflowGraph};
 use sha2::{Digest, Sha256};
 use stageleft::internal::quote;
 use syn::visit_mut::VisitMut;

hydro_lang/src/ir.rs

@@ -8,7 +8,7 @@ use std::ops::Deref;
 use std::rc::Rc;
 
 #[cfg(feature = "build")]
-use hydroflow_lang::graph::FlatGraphBuilder;
+use dfir_lang::graph::FlatGraphBuilder;
 #[cfg(feature = "build")]
 use proc_macro2::Span;
 use proc_macro2::TokenStream;