diff --git a/Cargo.lock b/Cargo.lock index dbc54b576..e5271dee7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -404,29 +404,6 @@ dependencies = [ "regex-syntax 0.8.5", ] -[[package]] -name = "arrow_convert" -version = "0.7.3" -source = "git+/~https://github.com/jackkleeman/arrow-convert?rev=9878358dd38cf4a2a6c8367541be3cd374fbb2c6#9878358dd38cf4a2a6c8367541be3cd374fbb2c6" -dependencies = [ - "arrow", - "arrow_convert_derive", - "chrono", - "err-derive", - "half", -] - -[[package]] -name = "arrow_convert_derive" -version = "0.7.3" -source = "git+/~https://github.com/jackkleeman/arrow-convert?rev=9878358dd38cf4a2a6c8367541be3cd374fbb2c6#9878358dd38cf4a2a6c8367541be3cd374fbb2c6" -dependencies = [ - "proc-macro-error2", - "proc-macro2", - "quote", - "syn 2.0.90", -] - [[package]] name = "assert-json-diff" version = "2.0.2" @@ -2679,20 +2656,6 @@ version = "1.0.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "err-derive" -version = "0.3.1" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", - "synstructure 0.12.6", -] - [[package]] name = "errno" version = "0.3.10" @@ -4330,15 +4293,16 @@ dependencies = [ [[package]] name = "mlua" -version = "0.9.9" +version = "0.10.2" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "d111deb18a9c9bd33e1541309f4742523bfab01d276bfa9a27519f6de9c11dc7" +checksum = "9ea43c3ffac2d0798bd7128815212dd78c98316b299b7a902dabef13dc7b6b8d" dependencies = [ "bstr", + "either", "mlua-sys", "mlua_derive", "num-traits", - "once_cell", + "parking_lot", "rustc-hash 2.1.0", ] @@ -4355,13 +4319,13 @@ dependencies = [ [[package]] name = "mlua_derive" -version = "0.9.3" +version = "0.10.1" source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "09697a6cec88e7f58a02c7ab5c18c611c6907c8654613df9cc0192658a4fb859" +checksum = "870d71c172fcf491c6b5fb4c04160619a2ee3e5a42a1402269c66bcbf1dd4deb" dependencies = [ - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "regex", @@ -5403,30 +5367,6 @@ dependencies = [ "toml_edit 0.22.22", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-error-attr2" version = "2.0.0" @@ -6139,7 +6079,6 @@ dependencies = [ "anyhow", "arc-swap", "arrow", - "arrow_convert", "axum", "base62", "base64 0.22.1", @@ -8198,18 +8137,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+/~https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "synstructure" version = "0.13.1" @@ -9775,7 +9702,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.90", - "synstructure 0.13.1", + "synstructure", ] [[package]] @@ -9817,7 +9744,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.90", - "synstructure 0.13.1", + "synstructure", ] [[package]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 3f2548350..b1b4bdc9a 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -25,7 +25,6 @@ restate-types = { workspace = true } anyhow = { workspace = true } arc-swap = { workspace = true } arrow = { version = "53.1.0", features = ["ipc", "prettyprint", "json"] } -arrow_convert = {git = "/~https://github.com/jackkleeman/arrow-convert", rev = "9878358dd38cf4a2a6c8367541be3cd374fbb2c6"} axum = { workspace = true, default-features = false, features = ["http1", "http2", "query", "tokio"] } bytes = { workspace = true } base62 = { version = "2.0.2" } diff --git a/deny.toml b/deny.toml index e185bd853..2db5276fd 100644 --- a/deny.toml +++ b/deny.toml @@ -5,7 +5,6 @@ db-urls = ["/~https://github.com/rustsec/advisory-db"] version = 2 yanked = "deny" ignore = [ - { id = "RUSTSEC-2024-0370", reason = "crate is unmaintained. This needs `arrow_convert` to use an alternative to `err-derive`" }, { id = "RUSTSEC-2024-0384", reason = "`instant` crate is unmaintained. The dependency comes from datafusion" }, ] @@ -171,7 +170,6 @@ allow-registry = ["/~https://github.com/rust-lang/crates.io-index"] allow-git = [ "/~https://github.com/restatedev/rust-rocksdb.git", "/~https://github.com/apache/arrow-rs.git", - "/~https://github.com/jackkleeman/arrow-convert", ] [sources.allow-org] diff --git a/tools/service-protocol-wireshark-dissector/Cargo.toml b/tools/service-protocol-wireshark-dissector/Cargo.toml index d92efaf6a..5d59020d3 100644 --- a/tools/service-protocol-wireshark-dissector/Cargo.toml +++ b/tools/service-protocol-wireshark-dissector/Cargo.toml @@ -28,4 +28,4 @@ bytes = { workspace = true } thiserror = { workspace = true } # Lua -mlua = { version = "0.9.9", features = ["module", "macros"] } +mlua = { version = "0.10.2", features = ["module", "macros"] } diff --git a/tools/service-protocol-wireshark-dissector/src/lib.rs b/tools/service-protocol-wireshark-dissector/src/lib.rs index 735dcf238..e3a18ed7f 100644 --- a/tools/service-protocol-wireshark-dissector/src/lib.rs +++ b/tools/service-protocol-wireshark-dissector/src/lib.rs @@ -26,7 +26,7 @@ macro_rules! set_table_values { }; } -fn decode_packages<'lua>(lua: &'lua Lua, buf_lua: Value<'lua>) -> LuaResult> { +fn decode_packages(lua: &Lua, buf_lua: Value) -> LuaResult { let result_messages = lua.create_table()?; // We should store it somewhere, but right now wireshark doesn't support conversations in lua api diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index f5fe67b8a..590f4ed5a 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -199,7 +199,7 @@ serde_with = { version = "3", features = ["hex"] } smallvec = { version = "1", default-features = false, features = ["const_new", "serde"] } stable_deref_trait = { version = "1" } strum = { version = "0.26", features = ["derive"] } -syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit"] } +syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["full"] } syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } sync_wrapper = { version = "1", default-features = false, features = ["futures"] } time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] }