From b8308356a45924f7bb8da03bbeac53eb67aa8db4 Mon Sep 17 00:00:00 2001 From: Devdutt Shenoi Date: Sat, 8 Feb 2025 17:54:06 +0530 Subject: [PATCH 1/3] chore: remove unused deps --- Cargo.lock | 18 ------------------ Cargo.toml | 5 +---- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 34da482d7..afe419a7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3041,12 +3041,6 @@ dependencies = [ "unicase", ] -[[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.8.3" @@ -3068,16 +3062,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[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 = "ntapi" version = "0.4.1" @@ -3495,7 +3479,6 @@ dependencies = [ "humantime-serde", "itertools 0.14.0", "lazy_static", - "nom", "num_cpus", "object_store", "once_cell", @@ -3513,7 +3496,6 @@ dependencies = [ "rstest", "rustls 0.22.4", "rustls-pemfile 2.2.0", - "sasl2-sys", "semver", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 4f789ba04..2e6018966 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,6 @@ url = "2.4.0" # Connectors dependencies rdkafka = { version = "0.37", optional = true, features = ["cmake-build", "tracing", "libz-static"] } -sasl2-sys = { version = "0.1.22", optional = true, features = ["vendored"] } # Authentication and Security argon2 = "0.5.0" @@ -107,7 +106,6 @@ clokwerk = "0.4" derive_more = { version = "1", features = ["full"] } itertools = "0.14" lazy_static = "1.4" -nom = "7.1.3" once_cell = "1.20" rand = "0.8.5" regex = "1.7.3" @@ -118,7 +116,6 @@ reqwest = { version = "0.11.27", default-features = false, features = [ "brotli", ] } # cannot update cause rustls is not latest `see rustls` semver = "1.0" -static-files = "0.2" thiserror = "2.0" ulid = { version = "1.0", features = ["serde"] } xxhash-rust = { version = "0.8", features = ["xxh3"] } @@ -145,7 +142,7 @@ assets-sha1 = "4516db38c8e556707b29b33569f9b1e53d5165f2" [features] debug = [] -kafka = ["rdkafka", "sasl2-sys", "sasl2-sys/vendored", "rdkafka/ssl-vendored", "rdkafka/ssl", "rdkafka/sasl"] +kafka = ["rdkafka", "rdkafka/ssl-vendored", "rdkafka/ssl", "rdkafka/sasl"] [profile.release-lto] inherits = "release" From 2d40bdbce551193cbf77823a40949949eb8df83f Mon Sep 17 00:00:00 2001 From: Devdutt Shenoi Date: Sat, 8 Feb 2025 20:02:42 +0530 Subject: [PATCH 2/3] undo static-files removal --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 2e6018966..fb8702f00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,6 +116,7 @@ reqwest = { version = "0.11.27", default-features = false, features = [ "brotli", ] } # cannot update cause rustls is not latest `see rustls` semver = "1.0" +static-files = "0.2" thiserror = "2.0" ulid = { version = "1.0", features = ["serde"] } xxhash-rust = { version = "0.8", features = ["xxh3"] } From f32b5d96e55fec8c6218238736b8b42a4ca77136 Mon Sep 17 00:00:00 2001 From: Devdutt Shenoi Date: Sat, 8 Feb 2025 22:30:29 +0530 Subject: [PATCH 3/3] required for building with sasl vendored --- Cargo.lock | 1 + Cargo.toml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index afe419a7a..0eaa3e55e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3496,6 +3496,7 @@ dependencies = [ "rstest", "rustls 0.22.4", "rustls-pemfile 2.2.0", + "sasl2-sys", "semver", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index fb8702f00..a8e4e9a56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,6 +34,7 @@ url = "2.4.0" # Connectors dependencies rdkafka = { version = "0.37", optional = true, features = ["cmake-build", "tracing", "libz-static"] } +sasl2-sys = { version = "0.1.22", optional = true, features = ["vendored"] } # Authentication and Security argon2 = "0.5.0" @@ -143,7 +144,7 @@ assets-sha1 = "4516db38c8e556707b29b33569f9b1e53d5165f2" [features] debug = [] -kafka = ["rdkafka", "rdkafka/ssl-vendored", "rdkafka/ssl", "rdkafka/sasl"] +kafka = ["rdkafka", "rdkafka/ssl-vendored", "rdkafka/ssl", "rdkafka/sasl", "sasl2-sys", "sasl2-sys/vendored"] [profile.release-lto] inherits = "release"