You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iggy.apache.org by gk...@apache.org on 2025/09/05 10:11:01 UTC
(iggy) 02/02: merge master
This is an automated email from the ASF dual-hosted git repository.
gkoszyk pushed a commit to branch merge_master_io_uring
in repository https://gitbox.apache.org/repos/asf/iggy.git
commit 5528c9dde9f1b4dc548e6ea7f0d04756dccf9054
Author: numminex <g....@gmail.com>
AuthorDate: Fri Sep 5 12:10:45 2025 +0200
merge master
---
Cargo.lock | 390 +++++++++++++++++--------------------
Cargo.toml | 14 ++
DEPENDENCIES.md | 176 -----------------
core/connectors/runtime/Dockerfile | 32 ---
core/server/Cargo.toml | 4 -
5 files changed, 198 insertions(+), 418 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 2e4c6100..2e85a476 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,7 +8,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"bytes",
"futures-core",
"futures-sink",
@@ -44,7 +44,7 @@ dependencies = [
"actix-service",
"actix-utils",
"actix-web",
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"bytes",
"derive_more 2.0.1",
"futures-core",
@@ -68,7 +68,7 @@ dependencies = [
"actix-service",
"actix-utils",
"base64 0.22.1",
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"brotli",
"bytes",
"bytestring",
@@ -472,6 +472,18 @@ dependencies = [
"pin-project-lite",
]
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
[[package]]
name = "async-compression"
version = "0.4.30"
@@ -772,7 +784,7 @@ checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.106",
]
[[package]]
@@ -957,7 +969,7 @@ version = "0.69.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"cexpr",
"clang-sys",
"itertools 0.12.1",
@@ -982,9 +994,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.9.3"
+version = "2.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
dependencies = [
"serde",
]
@@ -1035,9 +1047,9 @@ dependencies = [
[[package]]
name = "bon"
-version = "3.7.1"
+version = "3.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537c317ddf588aab15c695bf92cf55dec159b93221c074180ca3e0e5a94da415"
+checksum = "c2529c31017402be841eb45892278a6c21a000c0a17643af326c73a73f83f0fb"
dependencies = [
"bon-macros",
"rustversion",
@@ -1045,9 +1057,9 @@ dependencies = [
[[package]]
name = "bon-macros"
-version = "3.7.1"
+version = "3.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5abbf2d4a4c6896197c9de13d6d7cb7eff438c63dacde1dde980569cb00248"
+checksum = "d82020dadcb845a345591863adb65d74fa8dc5c18a0b6d408470e13b7adc7005"
dependencies = [
"darling 0.21.3",
"ident_case",
@@ -1232,21 +1244,13 @@ dependencies = [
"thiserror 2.0.16",
]
-[[package]]
-name = "castaway"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
-dependencies = [
- "rustversion",
-]
-
[[package]]
name = "cc"
-version = "1.2.34"
+version = "1.2.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
+checksum = "590f9024a68a8c40351881787f1934dc11afd69090f5edb6831464694d836ea3"
dependencies = [
+ "find-msvc-tools",
"jobserver",
"libc",
"shlex",
@@ -1319,7 +1323,7 @@ dependencies = [
"num-traits",
"serde",
"wasm-bindgen",
- "windows-link",
+ "windows-link 0.1.3",
]
[[package]]
@@ -1345,9 +1349,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.46"
+version = "4.5.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57"
+checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931"
dependencies = [
"clap_builder",
"clap_derive",
@@ -1355,9 +1359,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.46"
+version = "4.5.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41"
+checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6"
dependencies = [
"anstream",
"anstyle",
@@ -1377,9 +1381,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.45"
+version = "4.5.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
+checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -1550,7 +1554,7 @@ dependencies = [
"proc-macro-crate 3.3.0",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.106",
]
[[package]]
@@ -1588,7 +1592,7 @@ dependencies = [
"quinn-proto",
"rustc-hash 2.1.1",
"rustls",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
"windows-sys 0.60.2",
]
@@ -1934,7 +1938,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"crossterm_winapi",
"document-features",
"parking_lot 0.12.4",
@@ -2081,7 +2085,7 @@ dependencies = [
"send_wrapper",
"serde",
"serde_urlencoded",
- "thiserror 2.0.12",
+ "thiserror 2.0.16",
"url",
]
@@ -2116,7 +2120,7 @@ dependencies = [
"futures-util",
"hyper",
"hyper-util",
- "rustls-platform-verifier 0.6.1",
+ "rustls-platform-verifier",
"send_wrapper",
"tower-service",
]
@@ -2169,20 +2173,6 @@ dependencies = [
"syn 2.0.106",
]
-[[package]]
-name = "darling_core"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b44ad32f92b75fb438b04b68547e521a548be8acc339a6dacc4a7121488f53e6"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.104",
-]
-
[[package]]
name = "darling_macro"
version = "0.20.11"
@@ -2260,9 +2250,9 @@ dependencies = [
[[package]]
name = "deranged"
-version = "0.4.0"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
dependencies = [
"powerfmt",
"serde",
@@ -2401,7 +2391,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
]
[[package]]
@@ -2758,13 +2748,19 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e178e4fba8a2726903f6ba98a6d221e76f9c12c650d5dc0e6afdc50677b49650"
+
[[package]]
name = "flatbuffers"
version = "25.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1045398c1bfd89168b5fd3f1fc11f6e70b34f6f66300c87d44d3de849463abf1"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"rustc_version",
]
@@ -3082,7 +3078,7 @@ version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"libc",
"libgit2-sys",
"log",
@@ -3114,7 +3110,7 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"ignore",
"walkdir",
]
@@ -3751,7 +3747,7 @@ checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
dependencies = [
"cfg-if",
"libc",
- "windows-link",
+ "windows-link 0.1.3",
]
[[package]]
@@ -4469,7 +4465,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"inotify-sys",
"libc",
]
@@ -4556,11 +4552,22 @@ version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"cfg-if",
"libc",
]
+[[package]]
+name = "io_uring_buf_ring"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a8867874ff5758b47c1dac069e6e86541432f9da8be9111c5e94154134f07d0"
+dependencies = [
+ "bytes",
+ "io-uring",
+ "rustix 1.0.8",
+]
+
[[package]]
name = "ipnet"
version = "2.11.0"
@@ -4674,9 +4681,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.77"
+version = "0.3.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738"
dependencies = [
"once_cell",
"wasm-bindgen",
@@ -4905,7 +4912,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"libc",
"redox_syscall 0.5.17",
]
@@ -4932,9 +4939,9 @@ dependencies = [
[[package]]
name = "libz-rs-sys"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
+checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd"
dependencies = [
"zlib-rs",
]
@@ -5010,9 +5017,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.27"
+version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
[[package]]
name = "logos"
@@ -5104,17 +5111,6 @@ version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
-[[package]]
-name = "md-5"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
[[package]]
name = "md-5"
version = "0.10.6"
@@ -5291,7 +5287,7 @@ version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"cfg-if",
"cfg_aliases",
"libc",
@@ -5342,7 +5338,7 @@ version = "8.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"fsevent-sys",
"inotify",
"kqueue",
@@ -5502,7 +5498,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
]
[[package]]
@@ -5588,7 +5584,7 @@ version = "0.10.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"cfg-if",
"foreign-types",
"libc",
@@ -5747,6 +5743,26 @@ dependencies = [
"hashbrown 0.14.5",
]
+[[package]]
+name = "os_pipe"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "papaya"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f"
+dependencies = [
+ "equivalent",
+ "seize",
+]
+
[[package]]
name = "parking"
version = "2.2.1"
@@ -6315,31 +6331,6 @@ dependencies = [
"prost-types 0.14.1",
]
-[[package]]
-name = "prost-derive"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
-dependencies = [
- "anyhow",
- "itertools 0.14.0",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "prost-reflect"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c9ae1e4084d9737646934f5ac36a8d77f9a82f962f43e267a382fde4f2a903d"
-dependencies = [
- "logos",
- "miette",
- "prost 0.14.1",
- "prost-types 0.14.1",
-]
-
[[package]]
name = "prost-types"
version = "0.13.5"
@@ -6465,7 +6456,7 @@ dependencies = [
"rustc-hash 2.1.1",
"rustls",
"rustls-pki-types",
- "rustls-platform-verifier 0.5.3",
+ "rustls-platform-verifier",
"slab",
"thiserror 2.0.16",
"tinyvec",
@@ -6569,11 +6560,11 @@ dependencies = [
[[package]]
name = "raw-cpuid"
-version = "11.5.0"
+version = "11.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146"
+checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
]
[[package]]
@@ -6624,7 +6615,7 @@ version = "0.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
]
[[package]]
@@ -6847,9 +6838,9 @@ dependencies = [
[[package]]
name = "rmcp"
-version = "0.6.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f521fbd040eba82684b17d787d423f43afb6e97974029b51f679157a589592a"
+checksum = "c7dd163d26e254725137b7933e4ba042ea6bf2d756a4260559aaea8b6ad4c27e"
dependencies = [
"axum 0.8.4",
"base64 0.22.1",
@@ -6879,9 +6870,9 @@ dependencies = [
[[package]]
name = "rmcp-macros"
-version = "0.6.1"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c162bf8a2846f70464ded6dda6430b60d1e2fb4b0e371f0906e39f63916641b9"
+checksum = "a43bb4c90a0d4b12f7315eb681a73115d335a2cee81322eca96f3467fe4cd06f"
dependencies = [
"darling 0.21.3",
"proc-macro2",
@@ -6897,7 +6888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
dependencies = [
"base64 0.21.7",
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"serde",
"serde_derive",
]
@@ -6938,16 +6929,6 @@ dependencies = [
"ordered-multimap",
]
-[[package]]
-name = "rust-ini"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7295b7ce3bf4806b419dc3420745998b447178b7005e2011947b38fc5aa6791"
-dependencies = [
- "cfg-if",
- "ordered-multimap",
-]
-
[[package]]
name = "rust_decimal"
version = "1.37.2"
@@ -6997,7 +6978,7 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"errno",
"libc",
"linux-raw-sys 0.4.15",
@@ -7010,7 +6991,7 @@ version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"errno",
"libc",
"linux-raw-sys 0.9.4",
@@ -7085,27 +7066,6 @@ dependencies = [
"windows-sys 0.59.0",
]
-[[package]]
-name = "rustls-platform-verifier"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be59af91596cac372a6942530653ad0c3a246cdd491aaa9dcaee47f88d67d5a0"
-dependencies = [
- "core-foundation 0.10.1",
- "core-foundation-sys",
- "jni",
- "log",
- "once_cell",
- "rustls",
- "rustls-native-certs",
- "rustls-platform-verifier-android",
- "rustls-webpki",
- "security-framework 3.3.0",
- "security-framework-sys",
- "webpki-root-certs 1.0.2",
- "windows-sys 0.59.0",
-]
-
[[package]]
name = "rustls-platform-verifier-android"
version = "0.1.1"
@@ -7265,14 +7225,27 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.9.4",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
[[package]]
name = "security-framework"
version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c"
dependencies = [
- "bitflags 2.9.3",
- "core-foundation",
+ "bitflags 2.9.4",
+ "core-foundation 0.10.1",
"core-foundation-sys",
"libc",
"security-framework-sys",
@@ -7574,6 +7547,7 @@ dependencies = [
"strum",
"sysinfo 0.37.0",
"tempfile",
+ "test-case",
"thiserror 2.0.16",
"tokio",
"tokio-rustls",
@@ -7734,18 +7708,18 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
[[package]]
name = "snafu"
-version = "0.8.8"
+version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4800ae0e2ebdfaea32ffb9745642acdc378740dcbd74d3fb3cd87572a34810c6"
+checksum = "6e84b3f4eacbf3a1ce05eac6763b4d629d60cbc94d632e4092c54ade71f1e1a2"
dependencies = [
"snafu-derive",
]
[[package]]
name = "snafu-derive"
-version = "0.8.8"
+version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186f5ba9999528053fb497fdf0dd330efcc69cfe4ad03776c9d704bc54fee10f"
+checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -7898,7 +7872,7 @@ checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
dependencies = [
"atoi",
"base64 0.22.1",
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"byteorder",
"bytes",
"chrono",
@@ -7942,7 +7916,7 @@ checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
dependencies = [
"atoi",
"base64 0.22.1",
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"byteorder",
"chrono",
"crc",
@@ -8043,17 +8017,6 @@ dependencies = [
"unicode-properties",
]
-[[package]]
-name = "stringprep"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
- "unicode-properties",
-]
-
[[package]]
name = "strsim"
version = "0.11.1"
@@ -8325,12 +8288,11 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.41"
+version = "0.3.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
+checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
dependencies = [
"deranged",
- "itoa",
"libc",
"num-conv",
"num_threads",
@@ -8342,15 +8304,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.4"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
[[package]]
name = "time-macros"
-version = "0.2.22"
+version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
dependencies = [
"num-conv",
"time-core",
@@ -8662,7 +8624,7 @@ version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
dependencies = [
- "bitflags 2.9.3",
+ "bitflags 2.9.4",
"bytes",
"futures-util",
"http 1.3.1",
@@ -8798,9 +8760,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "twox-hash"
-version = "2.1.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b907da542cbced5261bd3256de1b3a1bf340a3d37f93425a07362a1d687de56"
+checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
dependencies = [
"rand 0.9.2",
]
@@ -8985,9 +8947,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
-version = "1.18.0"
+version = "1.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
dependencies = [
"getrandom 0.3.3",
"js-sys",
@@ -9133,21 +9095,22 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
[[package]]
name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b"
dependencies = [
"cfg-if",
"once_cell",
"rustversion",
"wasm-bindgen-macro",
+ "wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.100"
+version = "0.2.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb"
dependencies = [
"bumpalo",
"log",
@@ -9159,9 +9122,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "0ca85039a9b469b38336411d6d6ced91f3fc87109a2a27b0c197663f5144dffe"
dependencies = [
"cfg-if",
"js-sys",
@@ -9172,9 +9135,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -9182,9 +9145,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa"
dependencies = [
"proc-macro2",
"quote",
@@ -9195,9 +9158,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1"
dependencies = [
"unicode-ident",
]
@@ -9232,9 +9195,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.77"
+version = "0.3.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "77e4b637749ff0d92b8fad63aa1f7cff3cbe125fd49c175cd6345e7272638b12"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -9356,7 +9319,7 @@ dependencies = [
"windows-collections",
"windows-core 0.61.2",
"windows-future",
- "windows-link",
+ "windows-link 0.1.3",
"windows-numerics",
]
@@ -9389,7 +9352,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
dependencies = [
"windows-implement 0.60.0",
"windows-interface 0.59.1",
- "windows-link",
+ "windows-link 0.1.3",
"windows-result 0.3.4",
"windows-strings",
]
@@ -9401,7 +9364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
dependencies = [
"windows-core 0.61.2",
- "windows-link",
+ "windows-link 0.1.3",
"windows-threading",
]
@@ -9455,6 +9418,12 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+[[package]]
+name = "windows-link"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+
[[package]]
name = "windows-numerics"
version = "0.2.0"
@@ -9462,7 +9431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
dependencies = [
"windows-core 0.61.2",
- "windows-link",
+ "windows-link 0.1.3",
]
[[package]]
@@ -9480,7 +9449,7 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
]
[[package]]
@@ -9489,7 +9458,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
]
[[package]]
@@ -9537,6 +9506,15 @@ dependencies = [
"windows-targets 0.53.3",
]
+[[package]]
+name = "windows-sys"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
+dependencies = [
+ "windows-link 0.2.0",
+]
+
[[package]]
name = "windows-targets"
version = "0.42.2"
@@ -9589,7 +9567,7 @@ version = "0.53.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
"windows_aarch64_gnullvm 0.53.0",
"windows_aarch64_msvc 0.53.0",
"windows_i686_gnu 0.53.0",
@@ -9606,7 +9584,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
]
[[package]]
@@ -10060,9 +10038,9 @@ dependencies = [
[[package]]
name = "zip"
-version = "4.6.0"
+version = "4.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c034aa6c54f654df20e7dc3713bc51705c12f280748fb6d7f40f87c696623e34"
+checksum = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1"
dependencies = [
"aes",
"arbitrary",
@@ -10087,9 +10065,9 @@ dependencies = [
[[package]]
name = "zlib-rs"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
+checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2"
[[package]]
name = "zopfli"
@@ -10123,9 +10101,9 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "2.0.15+zstd.1.5.7"
+version = "2.0.16+zstd.1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
dependencies = [
"cc",
"pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index b54ef43d..cedd6609 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -145,6 +145,20 @@ tempfile = "3.21.0"
test-case = "3.3.1"
thiserror = "2.0.16"
tokio = { version = "1.47.1", features = ["full"] }
+compio = { git = "https://github.com/compio-rs/compio.git", rev = "fe4243f0b6811ebc325afd081c9b087b4d9817be", features = [
+ "runtime",
+ "macros",
+ "io-uring",
+ "time",
+ "rustls",
+] }
+cyper = { git = "https://github.com/krishvishal/cyper.git", rev = "cd75e266df6ab0a9b9474eb7dda1735650d17db6", features = [
+ "rustls",
+], default-features = false }
+cyper-axum = { git = "https://github.com/krishvishal/cyper", rev = "cd75e266df6ab0a9b9474eb7dda1735650d17db6" }
+compio-net = { git = "https://github.com/compio-rs/compio.git", rev = "fe4243f0b6811ebc325afd081c9b087b4d9817be" }
+compio-quic = { git = "https://github.com/compio-rs/compio.git", rev = "fe4243f0b6811ebc325afd081c9b087b4d9817be" }
+compio-tls = { git = "https://github.com/compio-rs/compio.git", rev = "fe4243f0b6811ebc325afd081c9b087b4d9817be", features = ["rustls"] }
tokio-rustls = "0.26.2"
tokio-util = { version = "0.7.16", features = ["compat"] }
toml = "0.9.5"
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
index eac1adf8..b1d61de5 100644
--- a/DEPENDENCIES.md
+++ b/DEPENDENCIES.md
@@ -39,11 +39,7 @@ arrayref: 0.3.9, "BSD-2-Clause",
arrayvec: 0.7.6, "Apache-2.0 OR MIT",
assert_cmd: 2.0.17, "Apache-2.0 OR MIT",
async-broadcast: 0.7.2, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-async-compression: 0.4.27, "Apache-2.0 OR MIT",
-=======
async-compression: 0.4.30, "Apache-2.0 OR MIT",
->>>>>>> master
async-dropper: 0.3.1, "MIT",
async-dropper-derive: 0.3.1, "MIT",
async-dropper-simple: 0.2.6, "MIT",
@@ -51,14 +47,8 @@ async-lock: 3.4.1, "Apache-2.0 OR MIT",
async-scoped: 0.9.0, "Apache-2.0 OR MIT",
async-stream: 0.3.6, "MIT",
async-stream-impl: 0.3.6, "MIT",
-<<<<<<< HEAD
-async-trait: 0.1.88, "Apache-2.0 OR MIT",
-async_zip: 0.0.17, "MIT",
-atoi: 2.0.0, "MIT",
-=======
async-trait: 0.1.89, "Apache-2.0 OR MIT",
async_zip: 0.0.18, "MIT",
->>>>>>> master
atoi: 2.0.0, "MIT",
atomic: 0.6.1, "Apache-2.0 OR MIT",
atomic-polyfill: 1.0.3, "Apache-2.0 OR MIT",
@@ -78,11 +68,7 @@ backtrace: 0.3.75, "Apache-2.0 OR MIT",
base64: 0.21.7, "Apache-2.0 OR MIT",
base64: 0.22.1, "Apache-2.0 OR MIT",
base64ct: 1.8.0, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-bcrypt: 0.17.0, "MIT",
-=======
bcrypt: 0.17.1, "MIT",
->>>>>>> master
bdd: 0.0.1, "Apache-2.0",
beef: 0.5.2, "Apache-2.0 OR MIT",
bench-dashboard-frontend: 0.4.1, "Apache-2.0",
@@ -99,13 +85,8 @@ bitvec: 1.0.1, "MIT",
blake3: 1.8.2, "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR CC0-1.0",
block-buffer: 0.10.4, "Apache-2.0 OR MIT",
blowfish: 0.9.1, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-bon: 3.6.5, "Apache-2.0 OR MIT",
-bon-macros: 3.6.5, "Apache-2.0 OR MIT",
-=======
bon: 3.7.1, "Apache-2.0 OR MIT",
bon-macros: 3.7.1, "Apache-2.0 OR MIT",
->>>>>>> master
boolinator: 2.4.0, "Apache-2.0 OR MIT",
borsh: 1.5.7, "Apache-2.0 OR MIT",
borsh-derive: 1.5.7, "Apache-2.0",
@@ -122,19 +103,11 @@ byteorder: 1.5.0, "MIT OR Unlicense",
bytes: 1.10.1, "MIT",
bytestring: 1.4.0, "Apache-2.0 OR MIT",
bzip2: 0.6.0, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-camino: 1.1.10, "Apache-2.0 OR MIT",
-cargo-platform: 0.1.9, "Apache-2.0 OR MIT",
-cargo_metadata: 0.19.2, "MIT",
-castaway: 0.2.4, "MIT",
-cc: 1.2.31, "Apache-2.0 OR MIT",
-=======
camino: 1.1.12, "Apache-2.0 OR MIT",
cargo-platform: 0.1.9, "Apache-2.0 OR MIT",
cargo_metadata: 0.19.2, "MIT",
castaway: 0.2.4, "MIT",
cc: 1.2.34, "Apache-2.0 OR MIT",
->>>>>>> master
cesu8: 1.1.0, "Apache-2.0 OR MIT",
cexpr: 0.6.0, "Apache-2.0 OR MIT",
cfg-if: 1.0.3, "Apache-2.0 OR MIT",
@@ -144,17 +117,10 @@ charming_macros: 0.1.0, "Apache-2.0 OR MIT",
chrono: 0.4.41, "Apache-2.0 OR MIT",
cipher: 0.4.4, "Apache-2.0 OR MIT",
clang-sys: 1.8.1, "Apache-2.0",
-<<<<<<< HEAD
-clap: 4.5.41, "Apache-2.0 OR MIT",
-clap_builder: 4.5.41, "Apache-2.0 OR MIT",
-clap_complete: 4.5.55, "Apache-2.0 OR MIT",
-clap_derive: 4.5.41, "Apache-2.0 OR MIT",
-=======
clap: 4.5.46, "Apache-2.0 OR MIT",
clap_builder: 4.5.46, "Apache-2.0 OR MIT",
clap_complete: 4.5.57, "Apache-2.0 OR MIT",
clap_derive: 4.5.45, "Apache-2.0 OR MIT",
->>>>>>> master
clap_lex: 0.7.5, "Apache-2.0 OR MIT",
cmake: 0.1.54, "Apache-2.0 OR MIT",
cobs: 0.3.0, "Apache-2.0 OR MIT",
@@ -166,20 +132,12 @@ compact_str: 0.7.1, "MIT",
compression-codecs: 0.4.30, "Apache-2.0 OR MIT",
compression-core: 0.4.29, "Apache-2.0 OR MIT",
concurrent-queue: 2.5.0, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-config: 0.15.13, "Apache-2.0 OR MIT",
-=======
config: 0.15.15, "Apache-2.0 OR MIT",
->>>>>>> master
console: 0.15.11, "MIT",
console-api: 0.8.1, "MIT",
console-subscriber: 0.4.1, "MIT",
console_error_panic_hook: 0.1.7, "Apache-2.0 OR MIT",
const-oid: 0.9.6, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-const-oid: 0.9.6, "Apache-2.0 OR MIT",
-=======
->>>>>>> master
const-random: 0.1.18, "Apache-2.0 OR MIT",
const-random-macro: 0.1.16, "Apache-2.0 OR MIT",
constant_time_eq: 0.3.1, "Apache-2.0 OR CC0-1.0 OR MIT-0",
@@ -203,30 +161,18 @@ crossterm: 0.29.0, "MIT",
crossterm_winapi: 0.9.1, "MIT",
crunchy: 0.2.4, "MIT",
crypto-common: 0.1.6, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-ctor: 0.4.3, "Apache-2.0 OR MIT",
-=======
ctor: 0.5.0, "Apache-2.0 OR MIT",
->>>>>>> master
ctor-proc-macro: 0.0.6, "Apache-2.0 OR MIT",
ctr: 0.9.2, "Apache-2.0 OR MIT",
cucumber: 0.21.1, "Apache-2.0 OR MIT",
cucumber-codegen: 0.21.1, "Apache-2.0 OR MIT",
cucumber-expressions: 0.3.0, "Apache-2.0 OR MIT",
darling: 0.20.11, "MIT",
-<<<<<<< HEAD
-darling: 0.21.0, "MIT",
-darling_core: 0.20.11, "MIT",
-darling_core: 0.21.0, "MIT",
-darling_macro: 0.20.11, "MIT",
-darling_macro: 0.21.0, "MIT",
-=======
darling: 0.21.3, "MIT",
darling_core: 0.20.11, "MIT",
darling_core: 0.21.3, "MIT",
darling_macro: 0.20.11, "MIT",
darling_macro: 0.21.3, "MIT",
->>>>>>> master
dashmap: 6.1.0, "MIT",
dbus: 0.9.9, "Apache-2.0 OR MIT",
dbus-secret-service: 4.1.0, "Apache-2.0 OR MIT",
@@ -274,10 +220,7 @@ err_trail: 0.8.5, "Apache-2.0",
errno: 0.3.13, "Apache-2.0 OR MIT",
error_set: 0.8.5, "Apache-2.0",
error_set_impl: 0.8.5, "Apache-2.0",
-<<<<<<< HEAD
-=======
etcetera: 0.8.0, "Apache-2.0 OR MIT",
->>>>>>> master
event-listener: 5.4.1, "Apache-2.0 OR MIT",
event-listener-strategy: 0.5.4, "Apache-2.0 OR MIT",
ext-trait: 1.0.1, "Apache-2.0 OR MIT OR Zlib",
@@ -287,10 +230,7 @@ fast-async-mutex: 0.6.7, "Apache-2.0 OR MIT",
fastbloom: 0.14.0, "Apache-2.0 OR MIT",
fastrand: 2.3.0, "Apache-2.0 OR MIT",
figlet-rs: 0.1.5, "Apache-2.0",
-<<<<<<< HEAD
-=======
figment: 0.10.19, "Apache-2.0 OR MIT",
->>>>>>> master
file-operation: 0.8.4, "MIT",
flatbuffers: 25.2.10, "Apache-2.0",
flate2: 1.1.2, "Apache-2.0 OR MIT",
@@ -357,15 +297,9 @@ gloo-worker: 0.2.1, "Apache-2.0 OR MIT",
gloo-worker: 0.4.0, "Apache-2.0 OR MIT",
gloo-worker: 0.5.0, "Apache-2.0 OR MIT",
gloo-worker-macros: 0.1.0, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-governor: 0.10.0, "MIT",
-h2: 0.3.27, "MIT",
-h2: 0.4.11, "MIT",
-=======
governor: 0.10.1, "MIT",
h2: 0.3.27, "MIT",
h2: 0.4.12, "MIT",
->>>>>>> master
halfbrown: 0.3.0, "Apache-2.0 OR MIT",
handlebars: 6.3.2, "MIT",
hash32: 0.2.1, "Apache-2.0 OR MIT",
@@ -410,13 +344,9 @@ idna: 1.1.0, "Apache-2.0 OR MIT",
idna_adapter: 1.2.1, "Apache-2.0 OR MIT",
iggy: 0.7.0, "Apache-2.0",
iggy-bench: 0.2.4, "Apache-2.0",
-<<<<<<< HEAD
-iggy-cli: 0.9.0, "Apache-2.0",
-=======
iggy-bench-dashboard-server: 0.4.0, "Apache-2.0",
iggy-cli: 0.9.1, "Apache-2.0",
iggy-connectors: 0.1.0, "Apache-2.0",
->>>>>>> master
iggy-mcp: 0.1.0, "Apache-2.0",
iggy_binary_protocol: 0.7.0, "Apache-2.0",
iggy_common: 0.7.0, "Apache-2.0",
@@ -432,11 +362,7 @@ impl-more: 0.1.9, "Apache-2.0 OR MIT",
implicit-clone: 0.4.9, "Apache-2.0 OR MIT",
implicit-clone-derive: 0.1.2, "Apache-2.0 OR MIT",
indexmap: 1.9.3, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-indexmap: 2.10.0, "Apache-2.0 OR MIT",
-=======
indexmap: 2.11.0, "Apache-2.0 OR MIT",
->>>>>>> master
indices: 0.3.6, "Apache-2.0",
inflections: 1.1.1, "MIT",
inlinable_string: 0.1.15, "Apache-2.0 OR MIT",
@@ -445,13 +371,8 @@ inotify-sys: 0.1.5, "ISC",
inout: 0.1.4, "Apache-2.0 OR MIT",
instant: 0.1.13, "BSD-3-Clause",
integration: 0.0.1, "Apache-2.0",
-<<<<<<< HEAD
-inventory: 0.3.20, "Apache-2.0 OR MIT",
-io-uring: 0.7.9, "Apache-2.0 OR MIT",
-=======
inventory: 0.3.21, "Apache-2.0 OR MIT",
io-uring: 0.7.10, "Apache-2.0 OR MIT",
->>>>>>> master
ipnet: 2.11.0, "Apache-2.0 OR MIT",
iri-string: 0.7.8, "Apache-2.0 OR MIT",
is_terminal_polyfill: 1.70.1, "Apache-2.0 OR MIT",
@@ -486,11 +407,8 @@ libloading: 0.8.8, "ISC",
liblzma: 0.4.4, "Apache-2.0 OR MIT",
liblzma-sys: 0.4.4, "Apache-2.0 OR MIT",
libm: 0.2.15, "MIT",
-<<<<<<< HEAD
-=======
libmimalloc-sys: 0.1.44, "MIT",
libredox: 0.1.9, "MIT",
->>>>>>> master
libsqlite3-sys: 0.30.1, "MIT",
libyml: 0.0.5, "MIT",
libz-rs-sys: 0.5.1, "Zlib",
@@ -504,24 +422,14 @@ local-channel: 0.1.5, "Apache-2.0 OR MIT",
local-waker: 0.1.4, "Apache-2.0 OR MIT",
lock_api: 0.4.13, "Apache-2.0 OR MIT",
log: 0.4.27, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-logos: 0.15.0, "Apache-2.0 OR MIT",
-logos-codegen: 0.15.0, "Apache-2.0 OR MIT",
-logos-derive: 0.15.0, "Apache-2.0 OR MIT",
-=======
logos: 0.15.1, "Apache-2.0 OR MIT",
logos-codegen: 0.15.1, "Apache-2.0 OR MIT",
logos-derive: 0.15.1, "Apache-2.0 OR MIT",
->>>>>>> master
loom: 0.7.2, "MIT",
lru-slab: 0.1.2, "Apache-2.0 OR MIT OR Zlib",
macro_rules_attribute: 0.1.3, "MIT",
macro_rules_attribute-proc_macro: 0.1.3, "MIT",
-<<<<<<< HEAD
-matchers: 0.1.0, "MIT",
-=======
matchers: 0.2.0, "MIT",
->>>>>>> master
matchit: 0.7.3, "BSD-3-Clause AND MIT",
matchit: 0.8.4, "BSD-3-Clause AND MIT",
maybe-async: 0.2.10, "MIT",
@@ -530,11 +438,7 @@ md5: 0.7.0, "Apache-2.0 OR MIT",
memchr: 2.7.5, "MIT OR Unlicense",
miette: 7.6.0, "Apache-2.0",
miette-derive: 7.6.0, "Apache-2.0",
-<<<<<<< HEAD
-mimalloc: 0.1.47, "MIT",
-=======
mimalloc: 0.1.48, "MIT",
->>>>>>> master
mime: 0.3.17, "Apache-2.0 OR MIT",
mime_guess: 2.0.5, "MIT",
minidom: 0.16.0, "MPL-2.0",
@@ -560,10 +464,6 @@ ntapi: 0.4.1, "Apache-2.0 OR MIT",
nu-ansi-term: 0.50.1, "MIT",
num-bigint: 0.4.6, "Apache-2.0 OR MIT",
num-bigint-dig: 0.8.4, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-num-complex: 0.4.6, "Apache-2.0 OR MIT",
-=======
->>>>>>> master
num-conv: 0.1.0, "Apache-2.0 OR MIT",
num-integer: 0.1.46, "Apache-2.0 OR MIT",
num-iter: 0.1.45, "Apache-2.0 OR MIT",
@@ -582,11 +482,7 @@ opaque-debug: 0.3.1, "Apache-2.0 OR MIT",
openssl: 0.10.73, "Apache-2.0",
openssl-macros: 0.1.1, "Apache-2.0 OR MIT",
openssl-probe: 0.1.6, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-openssl-src: 300.5.1+3.5.1, "Apache-2.0 OR MIT",
-=======
openssl-src: 300.5.2+3.5.2, "Apache-2.0 OR MIT",
->>>>>>> master
openssl-sys: 0.9.109, "MIT",
opentelemetry: 0.30.0, "Apache-2.0",
opentelemetry-appender-tracing: 0.30.1, "Apache-2.0",
@@ -613,11 +509,7 @@ peg-macros: 0.6.3, "MIT",
peg-runtime: 0.6.3, "MIT",
pem: 3.0.5, "MIT",
pem-rfc7468: 0.7.0, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-percent-encoding: 2.3.1, "Apache-2.0 OR MIT",
-=======
percent-encoding: 2.3.2, "Apache-2.0 OR MIT",
->>>>>>> master
pest: 2.8.1, "Apache-2.0 OR MIT",
pest_derive: 2.8.1, "Apache-2.0 OR MIT",
pest_generator: 2.8.1, "Apache-2.0 OR MIT",
@@ -635,22 +527,14 @@ polyval: 0.6.2, "Apache-2.0 OR MIT",
portable-atomic: 1.11.1, "Apache-2.0 OR MIT",
portable-atomic-util: 0.2.4, "Apache-2.0 OR MIT",
postcard: 1.1.3, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-potential_utf: 0.1.2, "Unicode-3.0",
-=======
potential_utf: 0.1.3, "Unicode-3.0",
->>>>>>> master
powerfmt: 0.2.0, "Apache-2.0 OR MIT",
ppmd-rust: 1.2.1, "CC0-1.0",
ppv-lite86: 0.2.21, "Apache-2.0 OR MIT",
predicates: 3.1.3, "Apache-2.0 OR MIT",
predicates-core: 1.0.9, "Apache-2.0 OR MIT",
predicates-tree: 1.0.12, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-prettyplease: 0.2.36, "Apache-2.0 OR MIT",
-=======
prettyplease: 0.2.37, "Apache-2.0 OR MIT",
->>>>>>> master
proc-macro-crate: 1.3.1, "Apache-2.0 OR MIT",
proc-macro-crate: 3.3.0, "Apache-2.0 OR MIT",
proc-macro-error: 1.0.4, "Apache-2.0 OR MIT",
@@ -687,13 +571,8 @@ rand_chacha: 0.9.0, "Apache-2.0 OR MIT",
rand_core: 0.6.4, "Apache-2.0 OR MIT",
rand_core: 0.9.3, "Apache-2.0 OR MIT",
raw-cpuid: 11.5.0, "MIT",
-<<<<<<< HEAD
-rayon: 1.10.0, "Apache-2.0 OR MIT",
-rayon-core: 1.12.1, "Apache-2.0 OR MIT",
-=======
rayon: 1.11.0, "Apache-2.0 OR MIT",
rayon-core: 1.13.0, "Apache-2.0 OR MIT",
->>>>>>> master
rcgen: 0.14.3, "Apache-2.0 OR MIT",
redox_syscall: 0.2.16, "MIT",
redox_syscall: 0.5.17, "MIT",
@@ -706,32 +585,19 @@ regex-lite: 0.1.7, "Apache-2.0 OR MIT",
regex-syntax: 0.7.5, "Apache-2.0 OR MIT",
regex-syntax: 0.8.6, "Apache-2.0 OR MIT",
rend: 0.4.2, "MIT",
-<<<<<<< HEAD
-reqwest: 0.12.22, "Apache-2.0 OR MIT",
-=======
reqwest: 0.12.23, "Apache-2.0 OR MIT",
->>>>>>> master
reqwest-middleware: 0.4.2, "Apache-2.0 OR MIT",
reqwest-retry: 0.7.0, "Apache-2.0 OR MIT",
retry-policies: 0.4.0, "Apache-2.0 OR MIT",
ring: 0.17.14, "Apache-2.0 AND ISC",
rkyv: 0.7.45, "MIT",
rkyv_derive: 0.7.45, "MIT",
-<<<<<<< HEAD
-rmcp: 0.3.2, "Apache-2.0 OR MIT",
-rmcp-macros: 0.3.2, "Apache-2.0 OR MIT",
-ron: 0.8.1, "Apache-2.0 OR MIT",
-route-recognizer: 0.3.1, "MIT",
-rsa: 0.9.8, "Apache-2.0 OR MIT",
-rust-ini: 0.21.2, "MIT",
-=======
rmcp: 0.6.1, "MIT",
rmcp-macros: 0.6.1, "MIT",
ron: 0.8.1, "Apache-2.0 OR MIT",
route-recognizer: 0.3.1, "MIT",
rsa: 0.9.8, "Apache-2.0 OR MIT",
rust-ini: 0.21.3, "MIT",
->>>>>>> master
rust-s3: 0.36.0-beta.2, "MIT",
rust_decimal: 1.37.2, "MIT",
rustc-demangle: 0.1.26, "Apache-2.0 OR MIT",
@@ -747,11 +613,7 @@ rustls-pki-types: 1.12.0, "Apache-2.0 OR MIT",
rustls-platform-verifier: 0.6.1, "Apache-2.0 OR MIT",
rustls-platform-verifier-android: 0.1.1, "Apache-2.0 OR MIT",
rustls-webpki: 0.103.4, "ISC",
-<<<<<<< HEAD
-rustversion: 1.0.21, "Apache-2.0 OR MIT",
-=======
rustversion: 1.0.22, "Apache-2.0 OR MIT",
->>>>>>> master
rxml: 0.11.1, "MIT",
rxml_validation: 0.11.0, "MIT",
ryu: 1.0.20, "Apache-2.0 OR BSL-1.0",
@@ -776,11 +638,7 @@ serde-wasm-bindgen: 0.5.0, "MIT",
serde-wasm-bindgen: 0.6.5, "MIT",
serde_derive: 1.0.219, "Apache-2.0 OR MIT",
serde_derive_internals: 0.29.1, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-serde_json: 1.0.142, "Apache-2.0 OR MIT",
-=======
serde_json: 1.0.143, "Apache-2.0 OR MIT",
->>>>>>> master
serde_path_to_error: 0.1.17, "Apache-2.0 OR MIT",
serde_spanned: 0.6.9, "Apache-2.0 OR MIT",
serde_spanned: 1.0.0, "Apache-2.0 OR MIT",
@@ -837,11 +695,7 @@ synthez: 0.3.1, "BlueOak-1.0.0",
synthez-codegen: 0.3.1, "BlueOak-1.0.0",
synthez-core: 0.3.1, "BlueOak-1.0.0",
sysinfo: 0.34.2, "MIT",
-<<<<<<< HEAD
-sysinfo: 0.36.1, "MIT",
-=======
sysinfo: 0.37.0, "MIT",
->>>>>>> master
tagptr: 0.2.0, "Apache-2.0 OR MIT",
tap: 1.0.1, "MIT",
tempfile: 3.21.0, "Apache-2.0 OR MIT",
@@ -869,20 +723,12 @@ tokio-rustls: 0.26.2, "Apache-2.0 OR MIT",
tokio-stream: 0.1.17, "MIT",
tokio-util: 0.7.16, "MIT",
toml: 0.8.23, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-toml: 0.9.4, "Apache-2.0 OR MIT",
-=======
toml: 0.9.5, "Apache-2.0 OR MIT",
->>>>>>> master
toml_datetime: 0.6.11, "Apache-2.0 OR MIT",
toml_datetime: 0.7.0, "Apache-2.0 OR MIT",
toml_edit: 0.19.15, "Apache-2.0 OR MIT",
toml_edit: 0.22.27, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-toml_parser: 1.0.1, "Apache-2.0 OR MIT",
-=======
toml_parser: 1.0.2, "Apache-2.0 OR MIT",
->>>>>>> master
toml_write: 0.1.2, "Apache-2.0 OR MIT",
toml_writer: 1.0.2, "Apache-2.0 OR MIT",
tonic: 0.12.3, "MIT",
@@ -942,11 +788,7 @@ wait-timeout: 0.2.1, "Apache-2.0 OR MIT",
walkdir: 2.5.0, "MIT OR Unlicense",
want: 0.3.1, "MIT",
wasi: 0.11.1+wasi-snapshot-preview1, "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT",
-<<<<<<< HEAD
-wasi: 0.14.2+wasi-0.2.4, "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT",
-=======
wasi: 0.14.3+wasi-0.2.4, "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT",
->>>>>>> master
wasite: 0.1.0, "Apache-2.0 OR BSL-1.0 OR MIT",
wasm-bindgen: 0.2.100, "Apache-2.0 OR MIT",
wasm-bindgen-backend: 0.2.100, "Apache-2.0 OR MIT",
@@ -958,20 +800,11 @@ wasm-streams: 0.4.2, "Apache-2.0 OR MIT",
wasm-timer: 0.2.5, "MIT",
web-sys: 0.3.77, "Apache-2.0 OR MIT",
web-time: 1.1.0, "Apache-2.0 OR MIT",
-<<<<<<< HEAD
-webpki-root-certs: 0.26.11, "CDLA-Permissive-2.0",
-=======
->>>>>>> master
webpki-root-certs: 1.0.2, "CDLA-Permissive-2.0",
webpki-roots: 0.26.11, "CDLA-Permissive-2.0",
webpki-roots: 1.0.2, "CDLA-Permissive-2.0",
which: 4.4.2, "MIT",
-<<<<<<< HEAD
-whoami: 1.6.0, "Apache-2.0 OR BSL-1.0 OR MIT",
-wide: 0.7.33, "Apache-2.0 OR MIT OR Zlib",
-=======
whoami: 1.6.1, "Apache-2.0 OR BSL-1.0 OR MIT",
->>>>>>> master
winapi: 0.3.9, "Apache-2.0 OR MIT",
winapi-i686-pc-windows-gnu: 0.4.0, "Apache-2.0 OR MIT",
winapi-util: 0.1.10, "MIT OR Unlicense",
@@ -1032,13 +865,8 @@ windows_x86_64_msvc: 0.48.5, "Apache-2.0 OR MIT",
windows_x86_64_msvc: 0.52.6, "Apache-2.0 OR MIT",
windows_x86_64_msvc: 0.53.0, "Apache-2.0 OR MIT",
winnow: 0.5.40, "MIT",
-<<<<<<< HEAD
-winnow: 0.7.12, "MIT",
-wit-bindgen-rt: 0.39.0, "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT",
-=======
winnow: 0.7.13, "MIT",
wit-bindgen: 0.45.0, "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT",
->>>>>>> master
writeable: 0.6.1, "Unicode-3.0",
wyz: 0.5.1, "MIT",
yaml-rust2: 0.10.3, "Apache-2.0 OR MIT",
@@ -1060,11 +888,7 @@ zeroize_derive: 1.4.2, "Apache-2.0 OR MIT",
zerotrie: 0.2.2, "Unicode-3.0",
zerovec: 0.11.4, "Unicode-3.0",
zerovec-derive: 0.11.1, "Unicode-3.0",
-<<<<<<< HEAD
-zip: 4.3.0, "MIT",
-=======
zip: 4.6.0, "MIT",
->>>>>>> master
zlib-rs: 0.5.1, "Zlib",
zopfli: 0.8.2, "Apache-2.0",
zstd: 0.13.3, "MIT",
diff --git a/core/connectors/runtime/Dockerfile b/core/connectors/runtime/Dockerfile
index 2d62aa9e..c03fba96 100644
--- a/core/connectors/runtime/Dockerfile
+++ b/core/connectors/runtime/Dockerfile
@@ -1,14 +1,4 @@
# Licensed to the Apache Software Foundation (ASF) under one
-<<<<<<< HEAD
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-=======
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
@@ -17,31 +7,10 @@
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
->>>>>>> master
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-<<<<<<< HEAD
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-FROM rust:latest AS builder
-WORKDIR /build
-COPY . /build
-RUN cargo build --bin iggy-connectors --release
-
-FROM debian:bookworm-slim
-RUN apt-get update && apt-get install -y \
- ca-certificates \
- liblzma5 \
- && rm -rf /var/lib/apt/lists/*
-COPY ./core/connectors/runtime/config.toml ./config.toml
-COPY --from=builder /build/target/release/iggy-connectors .
-
-CMD ["/iggy-connectors"]
-=======
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
@@ -124,4 +93,3 @@ WORKDIR /app
COPY --from=builder /app/iggy-connectors /usr/local/bin/iggy-connectors
ENTRYPOINT ["iggy-connectors"]
->>>>>>> master
diff --git a/core/server/Cargo.toml b/core/server/Cargo.toml
index 6e2d0a4a..4e371d66 100644
--- a/core/server/Cargo.toml
+++ b/core/server/Cargo.toml
@@ -146,7 +146,3 @@ vergen-git2 = { version = "1.0.7", features = [
[dev-dependencies]
mockall = { workspace = true }
serial_test = { workspace = true }
-
-[[bin]]
-name = "iggy-server"
-path = "src/main.rs"