From a52a241852465c80fff51269a00324c5e8df1d78 Mon Sep 17 00:00:00 2001 From: Jack May Date: Thu, 4 Feb 2021 20:23:01 -0800 Subject: [PATCH] nit: cleanup feature status display (#15113) * nit: cleanup feature status display * nudge --- ci/test-bench.sh | 4 ++++ cli/src/feature.rs | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ci/test-bench.sh b/ci/test-bench.sh index 50d0e6bab..b4bbea929 100755 --- a/ci/test-bench.sh +++ b/ci/test-bench.sh @@ -23,6 +23,10 @@ fi BENCH_FILE=bench_output.log BENCH_ARTIFACT=current_bench_results.log +# solana-keygen required when building C programs +_ "$cargo" build --manifest-path=keygen/Cargo.toml +export PATH="$PWD/target/debug":$PATH + # Clear the C dependency files, if dependeny moves these files are not regenerated test -d target/debug/bpf && find target/debug/bpf -name '*.d' -delete test -d target/release/bpf && find target/release/bpf -name '*.d' -delete diff --git a/cli/src/feature.rs b/cli/src/feature.rs index 89ceabb75..b7c77ba11 100644 --- a/cli/src/feature.rs +++ b/cli/src/feature.rs @@ -70,8 +70,8 @@ impl fmt::Display for CliFeatures { f, "{}", style(format!( - "{:<44} {:<40} {}", - "Feature", "Description", "Status" + "{:<44} {:<28} {}", + "Feature", "Status", "Description" )) .bold() )?; @@ -79,15 +79,15 @@ impl fmt::Display for CliFeatures { for feature in &self.features { writeln!( f, - "{:<44} {:<40} {}", + "{:<44} {:<28} {}", feature.id, - feature.description, match feature.status { CliFeatureStatus::Inactive => style("inactive".to_string()).red(), CliFeatureStatus::Pending => style("activation pending".to_string()).yellow(), CliFeatureStatus::Active(activation_slot) => style(format!("active since slot {}", activation_slot)).green(), - } + }, + feature.description, )?; } if self.inactive && !self.feature_activation_allowed {