Merge master; Reset unrelated changes from branch

asimov-platform · Nov 29, 2024 · 85af8a6 · 85af8a6
2 parents 393d990 + 053e5dd
commit 85af8a6
Show file tree

Hide file tree

Showing 2 changed files with 929 additions and 2 deletions.
diff --git a/lib/protoflow-zeromq/Cargo.toml b/lib/protoflow-zeromq/Cargo.toml
@@ -17,7 +17,7 @@ publish.workspace = true
 [features]
 default = ["all", "std"]
 all = ["tracing"]
-std = ["protoflow-core/std", "tracing?/std"] #, "zeromq/default"]
+std = ["protoflow-core/std", "tracing?/std"]
 tracing = ["protoflow-core/tracing", "dep:tracing"]
 unstable = ["protoflow-core/unstable"]
 
@@ -27,6 +27,12 @@ cfg_aliases.workspace = true
 [dependencies]
 protoflow-core.workspace = true
 tracing = { version = "0.1", default-features = false, optional = true }
-#zeromq = { version = "0.4", default-features = false }
+zeromq = { version = "0.4.1", default-features = false, features = [
+	"tokio-runtime",
+	"all-transport",
+] }
+tokio = { version = "1.40.0", default-features = false }
+parking_lot = "0.12"
 
 [dev-dependencies]
+futures-util = "0.3.31"