From d6eb4946907e17251cf65de9a7d7afe7b34f9981 Mon Sep 17 00:00:00 2001 From: Scott Schenkein Date: Mon, 30 Mar 2026 19:23:51 -0400 Subject: [PATCH 1/2] Fix broken [dependencies] block in quickwit-common Cargo.toml The [package.metadata.cargo-machete] section was inserted in the middle of the [dependencies] block, causing tonic, tower, and tracing to be parsed as metadata rather than dependencies. Move the metadata section below the dependency declarations. Co-Authored-By: Claude Sonnet 4.6 --- quickwit/quickwit-common/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickwit/quickwit-common/Cargo.toml b/quickwit/quickwit-common/Cargo.toml index 72b8a9ed8f8..64490f49166 100644 --- a/quickwit/quickwit-common/Cargo.toml +++ b/quickwit/quickwit-common/Cargo.toml @@ -45,9 +45,6 @@ tikv-jemallocator = { workspace = true, optional = true } tokio = { workspace = true } tokio-metrics = { workspace = true } tokio-stream = { workspace = true } - -[package.metadata.cargo-machete] -ignored = ["tokio-metrics"] tonic = { workspace = true, features = [ "tls-native-roots", "server", @@ -56,6 +53,9 @@ tonic = { workspace = true, features = [ tower = { workspace = true } tracing = { workspace = true } +[package.metadata.cargo-machete] +ignored = ["tokio-metrics"] + [features] testsuite = ["hyper-util"] named_tasks = ["tokio/tracing"] From d9a7443415a1c0f376a88f894f11f1b364fa3eb7 Mon Sep 17 00:00:00 2001 From: Scott Schenkein Date: Mon, 30 Mar 2026 19:27:54 -0400 Subject: [PATCH 2/2] Bump quickwit workspace tantivy to merged main rev (d491895f) Update tantivy rev to match the merged indextables/tantivy main so that the quickwit workspace and tantivy4java use the same tantivy version, avoiding duplicate crates in the dependency graph. Co-Authored-By: Claude Sonnet 4.6 --- quickwit/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index 6662193192a..45904949c84 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -372,7 +372,7 @@ quickwit-serve = { path = "quickwit-serve" } quickwit-storage = { path = "quickwit-storage" } quickwit-telemetry = { path = "quickwit-telemetry" } -tantivy = { git = "https://github.com/indextables/tantivy/", rev = "ffe408f49bb1f605d8eb28de9d18edd29c5245d5", default-features = false, features = [ +tantivy = { git = "https://github.com/indextables/tantivy/", rev = "d491895f1cd54d166c8010469d4625ae81c636f3", default-features = false, features = [ "lz4-compression", "mmap", "quickwit",