Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
shadaj committed Aug 22, 2024
1 parent 3c41e1e commit 30b6f03
Show file tree
Hide file tree
Showing 34 changed files with 750 additions and 913 deletions.
1,422 changes: 635 additions & 787 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion benches/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rand_distr = "0.4.3"
seq-macro = "0.2"
timely = { package = "timely-master", version = "0.13.0-dev.1" }
differential-dataflow = { package = "differential-dataflow-master", version = "0.13.0-dev.1" } # git = "https://github.com/TimelyDataflow/differential-dataflow.git", rev = "7bc5338a977fe1d95b96a9ba84ba8cd460e0cdd7" } # "0.12"
tokio = { version = "1.0", features = [ "rt-multi-thread" ] }
tokio = { version = "1", features = [ "rt-multi-thread" ] }
static_assertions = "1.1.0"

[[bench]]
Expand Down
38 changes: 19 additions & 19 deletions hydro_deploy/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ documentation = "https://docs.rs/hydro_deploy/"
description = "Hydro Deploy"

[dependencies]
anyhow = { version = "1.0.69", features = [ "backtrace" ] }
async-process = "1.6.0"
async-recursion = "1.0"
anyhow = { version = "1", features = [ "backtrace" ] }
async-process = "2.2"
async-recursion = "1"
async-ssh2-lite = { version = "0.5.0", features = [ "tokio" ] }
async-trait = "0.1.64"
buildstructor = "0.5.4"
async-trait = "0.1"
buildstructor = "0.5"
bytes = "1.1.0"
cargo_metadata = "0.15.4"
dunce = "1.0.4"
cargo_metadata = "0.18"
dunce = "1"
dyn-clone = "1"
futures = "0.3.26"
futures-core = "0.3.26"
futures = "0.3"
futures-core = "0.3"
hydroflow_deploy_integration = { path = "../hydroflow_deploy_integration", version = "^0.5.2" }
indicatif = "0.17.8"
inferno = "0.11.20"
memo-map = "0.3.2"
nanoid = "0.4.0"
nix = "0.26.2"
indicatif = "0.17"
inferno = "0.11"
memo-map = "0.3"
nanoid = "0.4"
nix = { version = "0.29", features = [ "signal" ] }
serde = { version = "1", features = [ "derive" ] }
serde_json = "1"
shell-escape = "0.1.5"
tempfile = "3.3.0"
tokio = { version = "1.16", features = [ "full" ] }
tokio-stream = { version = "0.1.15", default-features = false }
tokio-util = { version = "0.7.7", features = [ "io-util" ] }
shell-escape = "0.1"
tempfile = "3"
tokio = { version = "1", features = [ "full" ] }
tokio-stream = { version = "0.1", default-features = false }
tokio-util = { version = "0.7", features = [ "io-util" ] }
6 changes: 3 additions & 3 deletions hydro_deploy/hydro_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ crate-type = ["cdylib"]

[dependencies]
hydro_deploy = { path = "../core", version = "^0.8.0" }
tokio = { version = "1.16", features = [ "full" ] }
anyhow = { version = "1.0.69", features = [ "backtrace" ] }
clap = { version = "4.1.8", features = ["derive"] }
tokio = { version = "1", features = [ "full" ] }
anyhow = { version = "1", features = [ "backtrace" ] }
clap = { version = "4", features = ["derive"] }
pyo3 = { version = "0.20", features = ["abi3-py37"] }
pyo3-asyncio = { version = "0.20", features = ["attributes", "tokio-runtime"] }
pythonize = "0.20"
Expand Down
2 changes: 1 addition & 1 deletion hydro_deploy/hydro_cli_examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ name = "ws_chat_server"
hydroflow = { path = "../../hydroflow", features = [ "deploy_integration" ] }
hydroflow_datalog = { path = "../../hydroflow_datalog" }

tokio = { version = "1.16", features = [ "full" ] }
tokio = { version = "1", features = [ "full" ] }
serde = { version = "1", features = ["rc"] }
serde_json = "1"
rand = "0.8.5"
Expand Down
12 changes: 6 additions & 6 deletions hydro_deploy/hydroflow_deploy_integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ bytes = "1.1.0"
futures = "0.3.26"
pin-project = "1"
serde = { version = "1", features = [ "derive" ] }
tempfile = "3.3.0"
tempfile = "3"

# [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1.16", features = [ "full" ] }
tokio-util = { version = "0.7.4", features = [ "net", "codec" ] }
tokio-stream = { version = "0.1.15", default-features = false, features = [ "net" ] }
tokio = { version = "1", features = [ "full" ] }
tokio-util = { version = "0.7", features = [ "net", "codec" ] }
tokio-stream = { version = "0.1", default-features = false, features = [ "net" ] }

# [target.'cfg(target_arch = "wasm32")'.dependencies]
# tokio = { version = "1.16", features = [ "rt" , "sync", "macros", "io-util", "time" ] }
# tokio-util = { version = "0.7.4", features = [ "codec" ] }
# tokio = { version = "1", features = [ "rt" , "sync", "macros", "io-util", "time" ] }
# tokio-util = { version = "0.7", features = [ "codec" ] }
4 changes: 2 additions & 2 deletions hydro_deploy/hydroflow_plus_deploy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ stageleft_devel = []
[dependencies]
stageleft = { path = "../../stageleft", version = "^0.3.0" }
hydroflow_plus = { path = "../../hydroflow_plus", version = "^0.8.0", features = [ "deploy_integration" ] }
syn = { version = "2.0.0", features = [ "parsing", "extra-traits" ] }
tokio = { version = "1.16", features = [ "full" ] }
syn = { version = "2", features = [ "parsing", "extra-traits" ] }
tokio = { version = "1", features = [ "full" ] }
serde = { version = "1", features = [ "derive" ] }

hydro_deploy = { path = "../core", version = "^0.8.0", optional = true }
Expand Down
20 changes: 10 additions & 10 deletions hydroflow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ serde = { version = "1", features = [ "derive" ] }
serde_json = "1"
slotmap = "1.0"
smallvec = "1.10.0"
tokio-stream = { version = "0.1.10", features = [ "io-util", "sync" ] }
tokio-stream = { version = "0.1", features = [ "io-util", "sync" ] }
tracing = "0.1"
variadics = { path = "../variadics", version = "^0.0.5" }
web-time = "1.1.0"
Expand All @@ -56,12 +56,12 @@ web-time = "1.1.0"
multiplatform_test = { path = "../multiplatform_test", version = "^0.1.0", optional = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1.16", features = [ "full" ] }
tokio-util = { version = "0.7.4", features = [ "net", "codec" ] }
tokio = { version = "1", features = [ "full" ] }
tokio-util = { version = "0.7", features = [ "net", "codec" ] }

[target.'cfg(target_arch = "wasm32")'.dependencies]
tokio = { version = "1.16", features = [ "rt" , "sync", "macros", "io-util", "time" ] }
tokio-util = { version = "0.7.4", features = [ "codec" ] }
tokio = { version = "1", features = [ "rt" , "sync", "macros", "io-util", "time" ] }
tokio-util = { version = "0.7", features = [ "codec" ] }
# We depend on getrandom transitively through rand. To compile getrandom to
# WASM, we need to enable its "js" feature. However, rand does not expose a
# passthrough to enable "js" on getrandom. As a workaround, we enable the
Expand All @@ -71,20 +71,20 @@ getrandom = { version = "0.2.6", features = [ "js" ] }

[dev-dependencies]
chrono = { version = "0.4.20", features = [ "serde", "clock" ], default-features = false }
clap = { version = "4.1.8", features = [ "derive" ] }
clap = { version = "4", features = [ "derive" ] }
colored = "2.0"
futures = { version = "0.3" }
insta = "1.7.1"
insta = "1.39"
multiplatform_test = { path = "../multiplatform_test", version = "^0.1.0" }
wasm-bindgen-test = "0.3.34"
rand = {version = "0.8.4", features = ["small_rng"]}
rand_distr = "0.4.3"
regex = "1"
static_assertions = "1.1.0"
static_assertions = "1"
time = "0.3"
tracing-subscriber = { version = "0.3", features = [ "env-filter" ] }
trybuild = "1.0.80"
zipf = "7.0.0"
trybuild = "1"
zipf = "7"

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
# Rayon (rust data-parallelism library) does not compile on WASM.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ error[E0308]: mismatched types
| arguments to this function are incorrect
|
note: function defined here
--> $CARGO/tokio-1.35.1/src/time/interval.rs
--> $CARGO/tokio-1.39.3/src/time/interval.rs
|
| pub fn interval(period: Duration) -> Interval {
| ^^^^^^^^
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error: unexpected token
error: unexpected token, expected `)`
--> tests/compile-fail/surface_syntax_paren_semicolon.rs:5:28
|
5 | (source_iter(0..10););
Expand Down
8 changes: 4 additions & 4 deletions hydroflow_datalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ path = "src/lib.rs"
diagnostics = [ "hydroflow_datalog_core/diagnostics" ]

[dependencies]
quote = "1.0.0"
syn = { version = "2.0.0", features = [ "parsing", "extra-traits" ] }
proc-macro2 = "1.0.63"
proc-macro-crate = "1.1.0"
quote = "1"
syn = { version = "2", features = [ "parsing", "extra-traits" ] }
proc-macro2 = "1"
proc-macro-crate = "1.1"
# 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 does not support WASM at that time.
Expand Down
10 changes: 5 additions & 5 deletions hydroflow_datalog_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ default = []
diagnostics = [ "hydroflow_lang/diagnostics" ]

[dependencies]
quote = "1.0.0"
quote = "1"
slotmap = "1.0.6"
syn = { version = "2.0.0", features = [ "parsing", "extra-traits" ] }
proc-macro2 = "1.0.63"
syn = { version = "2", features = [ "parsing", "extra-traits" ] }
proc-macro2 = "1"
rust-sitter = "0.4.2"
hydroflow_lang = { path = "../hydroflow_lang", version = "^0.8.0" }

[build-dependencies]
rust-sitter-tool = "0.4.2"

[dev-dependencies]
insta = "1.7.1"
insta = "1.39"
prettyplease = "0.2.0"
tempfile = "3.2.0"
tempfile = "3"
4 changes: 2 additions & 2 deletions hydroflow_datalog_core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ mod tests {

let flat_graph_ref = &flat_graph;
insta::with_settings!({snapshot_suffix => "surface_graph"}, {
insta::assert_display_snapshot!(flat_graph_ref.surface_syntax_string());
insta::assert_snapshot!(flat_graph_ref.surface_syntax_string());
});

let tokens = hydroflow_graph_to_program(flat_graph, quote::quote! { hydroflow });
Expand All @@ -845,7 +845,7 @@ mod tests {
};

insta::with_settings!({snapshot_suffix => "datalog_program"}, {
insta::assert_display_snapshot!(
insta::assert_snapshot!(
prettyplease::unparse(&wrapped)
);
});
Expand Down
16 changes: 8 additions & 8 deletions hydroflow_lang/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ diagnostics = []
debugging = [ "dep:data-encoding", "dep:webbrowser", "dep:clap" ]

[dependencies]
auto_impl = "1.0.1"
clap = { version = "4.1.8", features = [ "derive" ], optional = true }
auto_impl = "1"
clap = { version = "4", features = [ "derive" ], optional = true }
data-encoding = { version = "2.4.0", optional = true }
itertools = "0.10" # TODO(mingwei): remove when `iter_intersperse` is stabilized.
prettyplease = { version = "0.2.0", features = [ "verbatim" ] }
proc-macro2 = { version = "1.0.63", features = ["span-locations"] }
quote = "1.0.0"
serde = "1.0.1"
serde_json = "1.0.8"
quote = "1"
serde = "1"
serde_json = "1"
slotmap = { version = "1.0.6", features = ["serde"] }
syn = { version = "2.0.0", features = [ "extra-traits", "full", "parsing" ] }
webbrowser = { version = "0.8.11", optional = true }
syn = { version = "2", features = [ "extra-traits", "full", "parsing" ] }
webbrowser = { version = "1", optional = true }

[dev-dependencies]

[build-dependencies]
syn = { version = "2.0.0", features = [ "extra-traits", "full", "parsing" ] }
syn = { version = "2", features = [ "extra-traits", "full", "parsing" ] }
10 changes: 5 additions & 5 deletions hydroflow_macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ diagnostics = [ "hydroflow_lang/diagnostics" ]
# 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.8.0" }
proc-macro2 = "1.0.63"
proc-macro-crate = "1.1.0"
quote = "1.0.0"
syn = { version = "2.0.0", features = [ "parsing", "extra-traits" ] }
proc-macro2 = "1"
proc-macro-crate = "1.1"
quote = "1"
syn = { version = "2", features = [ "parsing", "extra-traits" ] }

[build-dependencies]
hydroflow_lang = { path = "../hydroflow_lang", version = "^0.8.0" }
itertools = "0.10"
quote = "1.0.0"
quote = "1"
10 changes: 5 additions & 5 deletions hydroflow_plus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ deploy_integration = [ "hydroflow/deploy_integration" ]
stageleft_devel = []

[dependencies]
quote = "1.0.0"
syn = { version = "2.0.0", features = [ "parsing", "extra-traits", "visit-mut" ] }
proc-macro2 = "1.0.57"
proc-macro-crate = "1.1.0"
quote = "1"
syn = { version = "2", features = [ "parsing", "extra-traits", "visit-mut" ] }
proc-macro2 = "1"
proc-macro-crate = "1.1"
hydroflow = { path = "../hydroflow", version = "^0.8.0", default-features = false }
hydroflow_lang = { path = "../hydroflow_lang", version = "^0.8.0" }
serde = "1"
Expand All @@ -33,4 +33,4 @@ stageleft_tool = { path = "../stageleft_tool", version = "^0.2.0", optional = tr
stageleft_tool = { path = "../stageleft_tool", version = "^0.2.0" }

[dev-dependencies]
insta = "1.7.1"
insta = "1.39"
4 changes: 2 additions & 2 deletions hydroflow_plus/src/persist_pullup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ mod tests {
insta::assert_debug_snapshot!(optimized.ir());
for (id, graph) in optimized.compile_no_network::<MultiGraph>().hydroflow_ir() {
insta::with_settings!({snapshot_suffix => format!("surface_graph_{id}")}, {
insta::assert_display_snapshot!(graph.surface_syntax_string());
insta::assert_snapshot!(graph.surface_syntax_string());
});
}
}
Expand Down Expand Up @@ -83,7 +83,7 @@ mod tests {

for (id, graph) in optimized.compile_no_network::<MultiGraph>().hydroflow_ir() {
insta::with_settings!({snapshot_suffix => format!("surface_graph_{id}")}, {
insta::assert_display_snapshot!(graph.surface_syntax_string());
insta::assert_snapshot!(graph.surface_syntax_string());
});
}
}
Expand Down
4 changes: 2 additions & 2 deletions hydroflow_plus_test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ stageleft_devel = []

[dependencies]
hydroflow_plus = { path = "../hydroflow_plus", version = "^0.8.0" }
tokio = { version = "1.16", features = [ "full" ] }
tokio = { version = "1", features = [ "full" ] }
stageleft = { path = "../stageleft", version = "^0.3.0" }
hydroflow_plus_deploy = { path = "../hydro_deploy/hydroflow_plus_deploy", version = "^0.8.0" }
rand = "0.8.5"
Expand All @@ -20,7 +20,7 @@ serde = { version = "1", features = [ "derive" ] }
stageleft_tool = { path = "../stageleft_tool", version = "^0.2.0" }

[dev-dependencies]
insta = "1.7.1"
insta = "1.39"
hydro_deploy = { path = "../hydro_deploy/core", version = "^0.8.0" }
hydroflow_plus_deploy = { path = "../hydro_deploy/hydroflow_plus_deploy", version = "^0.8.0", features = [ "deploy" ] }
futures = "0.3"
2 changes: 1 addition & 1 deletion hydroflow_plus_test/src/cluster/compute_pi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ mod tests {
.hydroflow_ir()
{
insta::with_settings!({snapshot_suffix => format!("surface_graph_{id}")}, {
insta::assert_display_snapshot!(ir.surface_syntax_string());
insta::assert_snapshot!(ir.surface_syntax_string());
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion hydroflow_plus_test/src/cluster/map_reduce.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ mod tests {
.hydroflow_ir()
{
insta::with_settings!({snapshot_suffix => format!("surface_graph_{id}")}, {
insta::assert_display_snapshot!(ir.surface_syntax_string());
insta::assert_snapshot!(ir.surface_syntax_string());
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion hydroflow_plus_test_local/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ hydroflow_plus_test_local_macro = { path = "../hydroflow_plus_test_local_macro"
stageleft_tool = { path = "../stageleft_tool", version = "^0.2.0" }

[dev-dependencies]
insta = "1.7.1"
insta = "1.39"
futures = "0.3"
4 changes: 2 additions & 2 deletions lattices/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ serde = ["dep:serde"]
[dependencies]
cc-traits = "2.0.0"
sealed = "0.5"
serde = { version = "1.0.160", features = ["derive"], optional = true }
trybuild = "1.0.80"
serde = { version = "1", features = ["derive"], optional = true }
trybuild = "1"
lattices_macro = { path = "../lattices_macro", version = "^0.5.5" }
10 changes: 5 additions & 5 deletions lattices_macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ description = "Procedural macros for the `lattices` crate."
proc-macro = true

[dependencies]
proc-macro2 = "1.0.63"
proc-macro-crate = "1.1.0"
quote = "1.0.0"
syn = { version = "2.0.0", features = [ "full", "parsing", "visit-mut" ] }
proc-macro2 = "1"
proc-macro-crate = "1.1"
quote = "1"
syn = { version = "2", features = [ "full", "parsing", "visit-mut" ] }

[dev-dependencies]
insta = "1.7.1"
insta = "1.39"
prettyplease = "0.2.20"
Loading

0 comments on commit 30b6f03

Please sign in to comment.