This is an automated email from the ASF dual-hosted git repository.
hgruszecki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iggy.git
The following commit(s) were added to refs/heads/master by this push:
new afd328fcb fix(ci): fix comfy table problem when building WASM targets
(#3107)
afd328fcb is described below
commit afd328fcbe5be8133a460b202f927578ccb1872f
Author: Tung To <[email protected]>
AuthorDate: Mon Apr 13 17:30:34 2026 +0700
fix(ci): fix comfy table problem when building WASM targets (#3107)
---
Cargo.lock | 39 ----------------------------------
Cargo.toml | 2 +-
DEPENDENCIES.md | 4 ----
core/bench/report/src/prints.rs | 46 +++++++++++++++++++----------------------
4 files changed, 22 insertions(+), 69 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 74d0febb2..0f72de0fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1978,7 +1978,6 @@ version = "7.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "958c5d6ecf1f214b4c2bbbbf6ab9523a864bd136dcf71a7e8904799acfe1ad47"
dependencies = [
- "crossterm",
"unicode-segmentation",
"unicode-width 0.2.2",
]
@@ -2526,29 +2525,6 @@ dependencies = [
"smallvec",
]
-[[package]]
-name = "crossterm"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
-dependencies = [
- "bitflags 2.11.0",
- "crossterm_winapi",
- "document-features",
- "parking_lot",
- "rustix 1.1.4",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "crunchy"
version = "0.2.4"
@@ -3332,15 +3308,6 @@ dependencies = [
"serde_json",
]
-[[package]]
-name = "document-features"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
-dependencies = [
- "litrs",
-]
-
[[package]]
name = "dotenvy"
version = "0.15.7"
@@ -6812,12 +6779,6 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
-[[package]]
-name = "litrs"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
-
[[package]]
name = "local-channel"
version = "0.1.5"
diff --git a/Cargo.toml b/Cargo.toml
index 5aa73608a..d453e6d18 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -102,7 +102,7 @@ clap = { version = "4.6.0", features = ["derive",
"wrap_help"] }
clap_complete = "4.6.0"
clock = { path = "core/clock" }
colored = "3.1.1"
-comfy-table = "7.2.2"
+comfy-table = { version = "7.2.2", default-features = false }
compio = { version = "0.18.0", features = [
"runtime",
"macros",
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
index 739266563..58b90185c 100644
--- a/DEPENDENCIES.md
+++ b/DEPENDENCIES.md
@@ -219,8 +219,6 @@ crossbeam-epoch: 0.9.18, "Apache-2.0 OR MIT",
crossbeam-queue: 0.3.12, "Apache-2.0 OR MIT",
crossbeam-utils: 0.8.21, "Apache-2.0 OR MIT",
crossfire: 3.1.7, "Apache-2.0",
-crossterm: 0.29.0, "MIT",
-crossterm_winapi: 0.9.1, "MIT",
crunchy: 0.2.4, "MIT",
crypto-bigint: 0.5.5, "Apache-2.0 OR MIT",
crypto-common: 0.1.7, "Apache-2.0 OR MIT",
@@ -287,7 +285,6 @@ dlopen2: 0.8.2, "MIT",
dlopen2_derive: 0.4.3, "MIT",
dlv-list: 0.5.2, "Apache-2.0 OR MIT",
docker_credential: 1.3.2, "Apache-2.0 OR MIT",
-document-features: 0.2.12, "Apache-2.0 OR MIT",
dotenvy: 0.15.7, "MIT",
downcast: 0.11.0, "MIT",
dtoa: 1.0.11, "Apache-2.0 OR MIT",
@@ -574,7 +571,6 @@ linked-hash-map: 0.5.6, "Apache-2.0 OR MIT",
linux-raw-sys: 0.4.15, "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT",
linux-raw-sys: 0.12.1, "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT",
litemap: 0.8.2, "Unicode-3.0",
-litrs: 1.0.0, "Apache-2.0 OR MIT",
local-channel: 0.1.5, "Apache-2.0 OR MIT",
local-waker: 0.1.4, "Apache-2.0 OR MIT",
lock_api: 0.4.14, "Apache-2.0 OR MIT",
diff --git a/core/bench/report/src/prints.rs b/core/bench/report/src/prints.rs
index b6fbb8ac4..8350ff139 100644
--- a/core/bench/report/src/prints.rs
+++ b/core/bench/report/src/prints.rs
@@ -17,7 +17,7 @@
*/
use colored::{Color, Colorize};
-use comfy_table::{Cell, Color as TableColor, ContentArrangement, Table,
presets::UTF8_FULL};
+use comfy_table::{ContentArrangement, Table, presets::UTF8_FULL};
use human_repr::HumanCount;
use tracing::info;
@@ -195,11 +195,11 @@ impl BenchmarkGroupMetrics {
}
fn format_wide_layout(&self) -> String {
- let (prefix, color) = match self.summary.kind {
- GroupMetricsKind::Producers => ("Producers Results",
TableColor::Green),
- GroupMetricsKind::Consumers => ("Consumers Results",
TableColor::Green),
- GroupMetricsKind::ProducersAndConsumers => ("Aggregate Results",
TableColor::Red),
- GroupMetricsKind::ProducingConsumers => ("Producing Consumer
Results", TableColor::Red),
+ let prefix = match self.summary.kind {
+ GroupMetricsKind::Producers => "Producers Results",
+ GroupMetricsKind::Consumers => "Consumers Results",
+ GroupMetricsKind::ProducersAndConsumers => "Aggregate Results",
+ GroupMetricsKind::ProducingConsumers => "Producing Consumer
Results",
};
let actor = self.summary.kind.actor();
@@ -209,27 +209,23 @@ impl BenchmarkGroupMetrics {
.set_content_arrangement(ContentArrangement::Dynamic);
summary_table.add_row(vec![
- Cell::new(prefix).fg(color),
- Cell::new(format!(
+ prefix.to_string(),
+ format!(
"{:.2} s",
self.avg_throughput_mb_ts.points.last().unwrap().time_s
- ))
- .fg(color),
- Cell::new(format!(
+ ),
+ format!(
"{:.2} MB/s",
self.summary.total_throughput_megabytes_per_second
- ))
- .fg(color),
- Cell::new(format!(
+ ),
+ format!(
"{:.0} msg/s",
self.summary.total_throughput_messages_per_second
- ))
- .fg(color),
- Cell::new(format!(
+ ),
+ format!(
"{:.2} MB/s per {}",
self.summary.average_throughput_megabytes_per_second, actor
- ))
- .fg(color),
+ ),
]);
let mut latency_table = Table::new();
@@ -260,11 +256,11 @@ impl BenchmarkGroupMetrics {
}
fn format_narrow_layout(&self) -> String {
- let (prefix, color) = match self.summary.kind {
- GroupMetricsKind::Producers => ("Producers Results",
TableColor::Green),
- GroupMetricsKind::Consumers => ("Consumers Results",
TableColor::Green),
- GroupMetricsKind::ProducersAndConsumers => ("Aggregate Results",
TableColor::Red),
- GroupMetricsKind::ProducingConsumers => ("Producing Consumer
Results", TableColor::Red),
+ let prefix = match self.summary.kind {
+ GroupMetricsKind::Producers => "Producers Results",
+ GroupMetricsKind::Consumers => "Consumers Results",
+ GroupMetricsKind::ProducersAndConsumers => "Aggregate Results",
+ GroupMetricsKind::ProducingConsumers => "Producing Consumer
Results",
};
let actor = self.summary.kind.actor();
@@ -274,7 +270,7 @@ impl BenchmarkGroupMetrics {
.set_content_arrangement(ContentArrangement::Dynamic)
.set_width(60);
- table.add_row(vec![Cell::new(prefix).fg(color),
Cell::new("").fg(color)]);
+ table.add_row(vec![prefix.to_string(), String::new()]);
table.add_row(vec!["Summary", ""]);
table.add_row(vec