Remove arrow-convert and update mlua to remove a cargo deny exception

restatedev · Jan 20, 2025 · 9b352f0 · 9b352f0
1 parent 185295a
commit 9b352f0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 89 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -26,7 +26,7 @@ macro_rules! set_table_values {
     };
 }
 
-fn decode_packages<'lua>(lua: &'lua Lua, buf_lua: Value<'lua>) -> LuaResult<Table<'lua>> {
+fn decode_packages(lua: &Lua, buf_lua: Value) -> LuaResult<Table> {
     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
@@ -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"] }