Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 2 additions & 78 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ cc = { version = "1.0.98" }
clap = { version = "4.6.1", features = ["derive"] }
enum-iterator = { version = "2.1.0" }
better-panic = { version = "0.3.0" }
colored = { version = "2.1" }
# NOTE: keep in sync with MODULE.bazel and Iceoryx2Flatbuffers.cmake
flatbuffers = { version = "25.12.19", default-features = false }
generic-tests = { version = "0.1.2" }
Expand All @@ -229,7 +228,6 @@ tempfile = { version = "3.12.0" }
tiny-fn = { version = "0.1.6" }
toml = { version = "0.9.8", default-features = false, features = ["serde", "parse", "display"] }
tracing = { version = "0.1.40" }
dirs = { version = "5.0" }
dialoguer = { version = "0.8.0" }
windows-sys = { version = "0.48.0", features = [
"Win32_Security",
Expand Down
1 change: 1 addition & 0 deletions doc/release-notes/iceoryx2-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
* [#1845](https://github.com/eclipse-iceoryx/iceoryx2/issues/1845) Reduce imports for usage of the `semantic_string` macro
* [#1853](https://github.com/eclipse-iceoryx/iceoryx2/issues/1853) Improve error message in static asserts
* [#1891](https://github.com/eclipse-iceoryx/iceoryx2/issues/1891) Rename the tunnel to gateway and move its crates from `iceoryx2-services/` to a top-level `iceoryx2-gateway/` directory
* [#1931](https://github.com/eclipse-iceoryx/iceoryx2/issues/1931) Use ANSI escape sequences in iceoryx2-cli

### Workflow

Expand Down
23 changes: 23 additions & 0 deletions iceoryx2-bb/print/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,29 @@

pub use iceoryx2_pal_print::IsTerminal;

// keep this in sync with iceoryx2-pal/print/lib.rs
pub use iceoryx2_pal_print::RESET;

// Styles
pub use iceoryx2_pal_print::BOLD;
Comment thread
dkroenke marked this conversation as resolved.
pub use iceoryx2_pal_print::DIM;
pub use iceoryx2_pal_print::ITALIC;
pub use iceoryx2_pal_print::UNDERLINE;

// Standard colors
pub use iceoryx2_pal_print::BLUE;
pub use iceoryx2_pal_print::GREEN;
pub use iceoryx2_pal_print::RED;
pub use iceoryx2_pal_print::WHITE;
pub use iceoryx2_pal_print::YELLOW;

// Bright colors
pub use iceoryx2_pal_print::BRIGHT_BLUE;
pub use iceoryx2_pal_print::BRIGHT_GREEN;
pub use iceoryx2_pal_print::BRIGHT_RED;
pub use iceoryx2_pal_print::BRIGHT_WHITE;
pub use iceoryx2_pal_print::BRIGHT_YELLOW;

pub use iceoryx2_pal_print::stderr;
pub use iceoryx2_pal_print::stdout;

Expand Down
6 changes: 3 additions & 3 deletions iceoryx2-cli/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ rust_library(
"//iceoryx2:iceoryx2",
"//iceoryx2-log/log:iceoryx2-log",
"//iceoryx2-bb/loggers:iceoryx2-bb-loggers",
"//iceoryx2-bb/print:iceoryx2-bb-print",
"//iceoryx2-pal/posix:iceoryx2-pal-posix",
"@crate_index//:anyhow",
"@crate_index//:cargo_metadata",
"@crate_index//:clap",
"@crate_index//:colored",
"@crate_index//:serde",
"@crate_index//:yaml_serde",
"@crate_index//:serde_json",
Expand All @@ -58,10 +58,10 @@ rust_binary(
"//iceoryx2:iceoryx2",
"//iceoryx2-log/log:iceoryx2-log",
"//iceoryx2-bb/loggers:iceoryx2-bb-loggers",
"//iceoryx2-bb/print:iceoryx2-bb-print",
"@crate_index//:anyhow",
"@crate_index//:better-panic",
"@crate_index//:clap",
"@crate_index//:colored",
"@crate_index//:human-panic",
],
)
Expand Down Expand Up @@ -128,12 +128,12 @@ rust_binary(
"//iceoryx2-bb/elementary:iceoryx2-bb-elementary",
"//iceoryx2-log/log:iceoryx2-log",
"//iceoryx2-bb/loggers:iceoryx2-bb-loggers",
"//iceoryx2-bb/print:iceoryx2-bb-print",
"//iceoryx2-bb/posix:iceoryx2-bb-posix",
"//iceoryx2-bb/system-types:iceoryx2-bb-system-types",
"@crate_index//:anyhow",
"@crate_index//:better-panic",
"@crate_index//:clap",
"@crate_index//:colored",
"@crate_index//:dialoguer",
"@crate_index//:enum-iterator",
"@crate_index//:human-panic",
Expand Down
9 changes: 7 additions & 2 deletions iceoryx2-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ version = { workspace = true }
[package.metadata]
default-run = "iox2"

[features]
default = []
std = [
"iceoryx2-bb-print/std",
]

[[bin]]
name = "iox2"
path = "iox2/src/main.rs"
Expand Down Expand Up @@ -45,6 +51,7 @@ iceoryx2-services-discovery = { workspace = true, features = ["std"] }
iceoryx2 = { workspace = true, features = ["std"] }
iceoryx2-cal = { workspace = true, features = ["std"] }
iceoryx2-bb-loggers = { workspace = true, features = ["std", "console"] }
iceoryx2-bb-print = { workspace = true }
iceoryx2-bb-posix = { workspace = true, features = ["std"] }
iceoryx2-bb-system-types = { workspace = true, features = ["std"] }
iceoryx2-bb-container = { workspace = true, features = ["std"] }
Expand All @@ -55,15 +62,13 @@ anyhow = { workspace = true }
better-panic = { workspace = true }
cargo_metadata = { workspace = true }
clap = { workspace = true }
colored = { workspace = true }
enum-iterator = { workspace = true }
human-panic = { workspace = true }
serde = { workspace = true }
yaml_serde = { workspace = true }
serde_json = { workspace = true }
ron = { workspace = true }
toml = { workspace = true }
dirs = { workspace = true }
dialoguer = { workspace = true }

[dev-dependencies]
Expand Down
16 changes: 8 additions & 8 deletions iceoryx2-cli/iox2-config/src/command/explain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// SPDX-License-Identifier: Apache-2.0 OR MIT

use anyhow::Result;
use colored::Colorize;
use iceoryx2_bb_print::*;

use iceoryx2::config::Config;

Expand Down Expand Up @@ -604,19 +604,19 @@ pub(crate) fn describe_schema(config: &Config) -> Vec<Section> {
pub fn explain() -> Result<()> {
let schema = describe_schema(&Config::default());
for section in schema {
println!("\n{}", format!("== {} ==", section.name).bright_green());
println!("\n{GREEN}== {} =={RESET}", section.name);

for entry in section.fields {
println!(
"-> {} [{}]",
entry.key.bright_blue(),
entry.value_type.bright_red()
"-> {BRIGHT_BLUE}{} {BRIGHT_WHITE}[{BRIGHT_RED}{}{BRIGHT_WHITE}]{RESET}",
entry.key, entry.value_type
);
println!(
" {}",
format!("(Default value: {})", entry.default_value.bright_white()).bright_yellow()
" {BRIGHT_YELLOW}(Default value: {BRIGHT_WHITE}{}{BRIGHT_YELLOW}){RESET}",
entry.default_value
);
println!(" {}", entry.description.italic());

println!(" {ITALIC}{}{RESET}", entry.description);
}
}

Expand Down
Loading
Loading