diff --git a/Cargo.lock b/Cargo.lock index a7a0fd20af08..13fc77d02dfe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,7 +41,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.11", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -83,7 +83,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -342,18 +342,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - [[package]] name = "basic-toml" version = "0.1.7" @@ -371,7 +359,7 @@ dependencies = [ "differential-dataflow-master", "hydroflow", "lazy_static", - "rand 0.8.5", + "rand", "rand_distr", "seq-macro", "static_assertions", @@ -727,18 +715,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "core_affinity" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8a03115cc34fb0d7c321dd154a3914b3ca082ccc5c11d91bf7117dbbe7171f" -dependencies = [ - "kernel32-sys", - "libc", - "num_cpus", - "winapi 0.2.8", -] - [[package]] name = "cpufeatures" version = "0.2.11" @@ -748,15 +724,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "criterion" version = "0.5.1" @@ -847,16 +814,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctor" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" -dependencies = [ - "quote", - "syn 2.0.60", -] - [[package]] name = "ctrlc" version = "3.4.4" @@ -867,19 +824,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -] - [[package]] name = "dashmap" version = "6.0.1" @@ -1106,16 +1050,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1274,17 +1208,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.11" @@ -1294,7 +1217,7 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -1322,20 +1245,6 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "base64 0.21.5", - "byteorder", - "crossbeam-channel", - "flate2", - "nom 7.1.3", - "num-traits", -] - [[package]] name = "heck" version = "0.4.1" @@ -1428,12 +1337,10 @@ dependencies = [ name = "hydro_cli_examples" version = "0.0.0" dependencies = [ - "dashmap 5.5.3", "futures", "hydroflow", "hydroflow_datalog", - "procinfo", - "rand 0.8.5", + "rand", "serde", "serde_json", "tokio", @@ -1481,12 +1388,9 @@ dependencies = [ "chrono", "clap", "colored", - "core_affinity", "criterion", - "ctor", "futures", - "getrandom 0.2.11", - "hdrhistogram", + "getrandom", "hydroflow_datalog", "hydroflow_deploy_integration", "hydroflow_lang", @@ -1497,7 +1401,7 @@ dependencies = [ "multiplatform_test", "pusherator", "pyo3", - "rand 0.8.5", + "rand", "rand_distr", "ref-cast", "regex", @@ -1508,7 +1412,6 @@ dependencies = [ "slotmap", "smallvec", "static_assertions", - "textnonce", "time", "tokio", "tokio-stream", @@ -1540,7 +1443,6 @@ dependencies = [ "hydroflow_lang", "insta", "prettyplease", - "proc-macro-crate", "proc-macro2", "quote", "rust-sitter", @@ -1577,7 +1479,6 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "regex", "serde", "serde_json", "slotmap", @@ -1640,7 +1541,7 @@ dependencies = [ "hydroflow_plus", "hydroflow_plus_deploy", "insta", - "rand 0.8.5", + "rand", "serde", "stageleft", "stageleft_tool", @@ -1656,7 +1557,7 @@ dependencies = [ "hydroflow_plus", "hydroflow_plus_test_local_macro", "insta", - "rand 0.8.5", + "rand", "stageleft", "stageleft_tool", ] @@ -1666,7 +1567,7 @@ name = "hydroflow_plus_test_local_macro" version = "0.0.0" dependencies = [ "hydroflow_plus", - "rand 0.8.5", + "rand", "stageleft", "stageleft_tool", ] @@ -1743,7 +1644,7 @@ dependencies = [ "clap", "crossbeam-channel", "crossbeam-utils", - "dashmap 6.0.1", + "dashmap", "env_logger 0.11.5", "indexmap", "is-terminal", @@ -1846,16 +1747,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "lattices" version = "0.5.6" @@ -2032,12 +1923,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -2054,7 +1939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -2077,7 +1962,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -2117,16 +2002,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff" -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2134,7 +2009,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ "overload", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2275,7 +2150,7 @@ dependencies = [ "libc", "redox_syscall 0.2.16", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2489,7 +2364,7 @@ checksum = "6ab1427f3d2635891f842892dda177883dca0639e05fe66796a62c9d2f23b49c" dependencies = [ "byteorder", "libc", - "nom 2.2.1", + "nom", "rustc_version", ] @@ -2617,19 +2492,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -2637,18 +2499,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -2658,16 +2510,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -2676,7 +2519,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom", ] [[package]] @@ -2686,16 +2529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "rand", ] [[package]] @@ -2748,7 +2582,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", + "getrandom", "libredox", "thiserror", ] @@ -3160,7 +2994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3347,16 +3181,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textnonce" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f8d70cd784ed1dc33106a18998d77758d281dc40dc3e6d050cf0f5286683" -dependencies = [ - "base64 0.12.3", - "rand 0.7.3", -] - [[package]] name = "thiserror" version = "1.0.58" @@ -3616,12 +3440,11 @@ dependencies = [ name = "topolotree" version = "0.0.0" dependencies = [ - "dashmap 5.5.3", "futures", "hydroflow", "hydroflow_datalog", "procinfo", - "rand 0.8.5", + "rand", "serde", "serde_json", "tokio", @@ -3869,7 +3692,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.5", + "rand", "sha1", "thiserror", "url", @@ -3992,12 +3815,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4174,15 +3991,9 @@ dependencies = [ "cfg-if 0.1.10", "libc", "memory_units", - "winapi 0.3.9", + "winapi", ] -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -4193,12 +4004,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -4211,7 +4016,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4480,5 +4285,5 @@ version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "390e51da0ed8cc3ade001d15fa5ba6f966b99c858fb466ec6b06d1682f1f94dd" dependencies = [ - "rand 0.8.5", + "rand", ] diff --git a/hydro_deploy/hydro_cli_examples/Cargo.toml b/hydro_deploy/hydro_cli_examples/Cargo.toml index 97588ffb05ba..9c18713f69cb 100644 --- a/hydro_deploy/hydro_cli_examples/Cargo.toml +++ b/hydro_deploy/hydro_cli_examples/Cargo.toml @@ -42,11 +42,7 @@ tokio = { version = "1.16", features = [ "full" ] } serde = { version = "1", features = ["rc"] } serde_json = "1" rand = "0.8.5" -dashmap = "5.4.0" futures = "0.3.28" tokio-tungstenite = "0.20.0" - -[target.'cfg(target_os = "linux")'.dev-dependencies] -procinfo = "0.4.2" diff --git a/hydroflow/Cargo.toml b/hydroflow/Cargo.toml index 810eb8a4cf4f..0adbd5db1aeb 100644 --- a/hydroflow/Cargo.toml +++ b/hydroflow/Cargo.toml @@ -73,10 +73,7 @@ getrandom = { version = "0.2.6", features = [ "js" ] } chrono = { version = "0.4.20", features = [ "serde", "clock" ], default-features = false } clap = { version = "4.1.8", features = [ "derive" ] } colored = "2.0" -core_affinity = "0.5.10" -ctor = "0.2" futures = { version = "0.3" } -hdrhistogram = "7" insta = "1.7.1" multiplatform_test = { path = "../multiplatform_test", version = "^0.1.0" } wasm-bindgen-test = "0.3.34" @@ -84,7 +81,6 @@ rand = {version = "0.8.4", features = ["small_rng"]} rand_distr = "0.4.3" regex = "1" static_assertions = "1.1.0" -textnonce = "1.0.0" time = "0.3" tracing-subscriber = { version = "0.3", features = [ "env-filter" ] } trybuild = "1.0.80" diff --git a/hydroflow_datalog_core/Cargo.toml b/hydroflow_datalog_core/Cargo.toml index dc5eb2a82424..21ac75bbfedb 100644 --- a/hydroflow_datalog_core/Cargo.toml +++ b/hydroflow_datalog_core/Cargo.toml @@ -19,7 +19,6 @@ quote = "1.0.0" slotmap = "1.0.6" syn = { version = "2.0.0", features = [ "parsing", "extra-traits" ] } proc-macro2 = "1.0.63" -proc-macro-crate = "1.1.0" rust-sitter = "0.4.2" hydroflow_lang = { path = "../hydroflow_lang", version = "^0.8.0" } diff --git a/hydroflow_lang/Cargo.toml b/hydroflow_lang/Cargo.toml index 1fadb317deaf..3f5b3d9da508 100644 --- a/hydroflow_lang/Cargo.toml +++ b/hydroflow_lang/Cargo.toml @@ -20,7 +20,6 @@ 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" -regex = "1.7.0" serde = "1.0.1" serde_json = "1.0.8" slotmap = { version = "1.0.6", features = ["serde"] } diff --git a/topolotree/Cargo.toml b/topolotree/Cargo.toml index 068f17b7f491..e9a4adbd9b6e 100644 --- a/topolotree/Cargo.toml +++ b/topolotree/Cargo.toml @@ -28,7 +28,6 @@ tokio = { version = "1.16", features = [ "full" ] } serde = { version = "1", features = ["rc"] } serde_json = "1" rand = "0.8.5" -dashmap = "5.4.0" futures = "0.3.28"