diff --git a/Cargo.lock b/Cargo.lock index 6c75ec2..5364758 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -245,13 +245,34 @@ dependencies = [ "wyz", ] +[[package]] +name = "block-buffer" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +dependencies = [ + "block-padding", + "byte-tools", + "byteorder", + "generic-array 0.12.4", +] + [[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array", + "generic-array 0.14.4", +] + +[[package]] +name = "block-padding" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +dependencies = [ + "byte-tools", ] [[package]] @@ -293,6 +314,12 @@ version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +[[package]] +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + [[package]] name = "bytemuck" version = "1.7.2" @@ -445,6 +472,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "cpufeatures" version = "0.2.1" @@ -547,13 +580,35 @@ dependencies = [ "byteorder", ] +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn", +] + +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +dependencies = [ + "generic-array 0.12.4", +] + [[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array", + "generic-array 0.14.4", ] [[package]] @@ -625,6 +680,12 @@ version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" +[[package]] +name = "fake-simd" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + [[package]] name = "fastrand" version = "1.5.0" @@ -637,7 +698,7 @@ dependencies = [ [[package]] name = "ffmpeg-next" version = "4.4.0" -source = "git+https://github.com/tpoisonooo/rust-ffmpeg?branch=dylib#9092c9c4a793c1989d0716657bad5edd53f03f2b" +source = "git+https://github.com/tpoisonooo/rust-ffmpeg?rev=f80c21fd#f80c21fd1a6fc4106fc72c7e2a75751e7d1c6320" dependencies = [ "bitflags", "ffmpeg-sys-next", @@ -647,7 +708,7 @@ dependencies = [ [[package]] name = "ffmpeg-sys-next" version = "4.4.0" -source = "git+https://github.com/tpoisonooo/rust-ffmpeg-sys?branch=dylib#536104e13d09f1c779437910187cedbd070fc8f6" +source = "git+https://github.com/tpoisonooo/rust-ffmpeg-sys?branch=staticlib#194f605b3211b105f503a244fdc2482bf84938c3" dependencies = [ "bindgen", "cc", @@ -659,7 +720,7 @@ dependencies = [ [[package]] name = "flow-debugger" -version = "0.1.0" +version = "0.3.5" dependencies = [ "tokio", "warp", @@ -667,7 +728,7 @@ dependencies = [ [[package]] name = "flow-derive" -version = "0.3.0" +version = "0.3.5" dependencies = [ "anyhow", "flow-rs", @@ -679,7 +740,7 @@ dependencies = [ [[package]] name = "flow-message" -version = "0.3.0" +version = "0.3.5" dependencies = [ "byteorder", "dashmap", @@ -692,7 +753,7 @@ dependencies = [ [[package]] name = "flow-plugins" -version = "0.3.0" +version = "0.3.5" dependencies = [ "anyhow", "bytes", @@ -721,8 +782,10 @@ dependencies = [ [[package]] name = "flow-python" -version = "0.3.0" +version = "0.3.5" dependencies = [ + "anyhow", + "clap", "ctrlc", "flow-plugins", "flow-rs", @@ -735,7 +798,7 @@ dependencies = [ [[package]] name = "flow-quickstart" -version = "0.1.0" +version = "0.3.5" dependencies = [ "anyhow", "clap", @@ -756,22 +819,19 @@ dependencies = [ [[package]] name = "flow-rs" -version = "0.3.0" +version = "0.3.5" dependencies = [ "anyhow", "async-std", "clap", "concurrent-queue", "ctor", - "ctrlc", "dyn-clone", "event-listener", "flow-derive", - "flow-plugins", "futures-core", "futures-util", "lazy_static", - "libc", "log", "numpy", "oneshot", @@ -781,7 +841,9 @@ dependencies = [ "serde_json", "stackful", "tempfile", + "templar", "toml", + "unstructured", "warp", ] @@ -924,6 +986,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "generic-array" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +dependencies = [ + "typenum", +] + [[package]] name = "generic-array" version = "0.14.4" @@ -1040,7 +1111,7 @@ dependencies = [ "http", "httpdate", "mime", - "sha-1", + "sha-1 0.9.8", ] [[package]] @@ -1177,12 +1248,12 @@ dependencies = [ [[package]] name = "im" -version = "15.0.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111c1983f3c5bb72732df25cddacee9b546d08325fb584b5ebd38148be7b0246" +checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" dependencies = [ "bitmaps", - "rand_core 0.5.1", + "rand_core", "rand_xoshiro", "sized-chunks", "typenum", @@ -1403,6 +1474,12 @@ dependencies = [ "scoped-tls", ] +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + [[package]] name = "matches" version = "0.1.9" @@ -1687,6 +1764,12 @@ dependencies = [ "loom", ] +[[package]] +name = "opaque-debug" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + [[package]] name = "opaque-debug" version = "0.3.0" @@ -1712,6 +1795,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "ordered-float" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +dependencies = [ + "num-traits", +] + [[package]] name = "os_str_bytes" version = "4.2.0" @@ -1789,6 +1881,49 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +dependencies = [ + "maplit", + "pest", + "sha-1 0.8.2", +] + [[package]] name = "pin-project" version = "1.0.8" @@ -1996,7 +2131,7 @@ checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.3", + "rand_core", "rand_hc", ] @@ -2007,15 +2142,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" - [[package]] name = "rand_core" version = "0.6.3" @@ -2031,16 +2160,16 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.3", + "rand_core", ] [[package]] name = "rand_xoshiro" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core 0.5.1", + "rand_core", ] [[package]] @@ -2138,6 +2267,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + [[package]] name = "rustversion" version = "1.0.5" @@ -2238,6 +2376,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "semver" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" + [[package]] name = "serde" version = "1.0.130" @@ -2281,17 +2425,29 @@ dependencies = [ "serde", ] +[[package]] +name = "sha-1" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +dependencies = [ + "block-buffer 0.7.3", + "digest 0.8.1", + "fake-simd", + "opaque-debug 0.2.3", +] + [[package]] name = "sha-1" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", - "opaque-debug", + "digest 0.9.0", + "opaque-debug 0.3.0", ] [[package]] @@ -2398,6 +2554,32 @@ dependencies = [ "winapi", ] +[[package]] +name = "templar" +version = "0.5.0" +source = "git+https://github.com/proctorlabs/templar.git?rev=85469a4c#85469a4c52cbd7efa7391918866107224bcdca2f" +dependencies = [ + "derive_more", + "lazy_static", + "parking_lot", + "pest", + "pest_derive", + "serde", + "templar_macros", + "toml", + "unstructured", +] + +[[package]] +name = "templar_macros" +version = "0.5.0" +source = "git+https://github.com/proctorlabs/templar.git?rev=85469a4c#85469a4c52cbd7efa7391918866107224bcdca2f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "termcolor" version = "1.1.2" @@ -2612,7 +2794,7 @@ dependencies = [ "httparse", "log", "rand", - "sha-1", + "sha-1 0.9.8", "thiserror", "url", "utf-8", @@ -2633,6 +2815,12 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + [[package]] name = "unicase" version = "2.6.0" @@ -2681,6 +2869,18 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" +[[package]] +name = "unstructured" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bae5a28ab9d8cd21bb5300077b36a70809ff6a4ce3fc3915767c59fbdf35b7bc" +dependencies = [ + "ordered-float", + "pest", + "pest_derive", + "serde", +] + [[package]] name = "url" version = "2.2.2" diff --git a/flow-message/Cargo.toml b/flow-message/Cargo.toml index 35152f4..82c313d 100644 --- a/flow-message/Cargo.toml +++ b/flow-message/Cargo.toml @@ -13,7 +13,7 @@ c = ["libc"] byteorder = {version="1.4", optional=true} dashmap = {version="4.0", optional=true} enum-as-inner = {version="0.3", optional=true} -im = {version="15.0", optional=true} +im = {version="15.1", optional=true} paste = {version="1.0",optional=true} pyo3 = {version="0.15", features=["abi3"], optional=true} libc = {version="0.2",optional=true}