diff --git a/ROADMAP.md b/ROADMAP.md index 9409f1ce0..12b4e5fd5 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -91,7 +91,7 @@ * [ ] Android * [x] Linux * [x] Windows -* [ ] Mac Os +* [x] Mac Os * [ ] iOS * [ ] WatchOS * [x] FreeBSD diff --git a/doc/release-notes/iceoryx2-unreleased.md b/doc/release-notes/iceoryx2-unreleased.md index 35437eea1..5653380bd 100644 --- a/doc/release-notes/iceoryx2-unreleased.md +++ b/doc/release-notes/iceoryx2-unreleased.md @@ -11,7 +11,7 @@ ### Bugfixes - * Example [#1](https://github.com/eclipse-iceoryx/iceoryx2/issues/1) + * Fix suffix of static config [#66](https://github.com/eclipse-iceoryx/iceoryx2/issues/66) ### Refactoring @@ -25,6 +25,7 @@ * Add `FixedSizeByteString::from_bytes_truncated` [#56](https://github.com/eclipse-iceoryx/iceoryx2/issues/56) * Add `Deref`, `DerefMut`, `Clone`, `Eq`, `PartialEq` and `extend_from_slice` to (FixedSize)Vec [#58](https://github.com/eclipse-iceoryx/iceoryx2/issues/58) + * `MessagingPattern` implements `Display` [#64](https://github.com/eclipse-iceoryx/iceoryx2/issues/64) ### API Breaking Changes diff --git a/iceoryx2-bb/posix/tests/udp_socket_tests.rs b/iceoryx2-bb/posix/tests/udp_socket_tests.rs index 3e1fc9b94..2aacccfdc 100644 --- a/iceoryx2-bb/posix/tests/udp_socket_tests.rs +++ b/iceoryx2-bb/posix/tests/udp_socket_tests.rs @@ -107,12 +107,12 @@ fn udp_socket_when_socket_goes_out_of_scope_address_is_free_again() { fn udp_socket_server_has_correct_address() { let sut_server = UdpServerBuilder::new() .address(ipv4_address::LOCALHOST) - .port(Port::new(65111)) + .port(Port::new(55223)) .listen() .unwrap(); assert_that!(sut_server.address(), eq ipv4_address::LOCALHOST); - assert_that!(sut_server.port(), eq Port::new(65111)); + assert_that!(sut_server.port(), eq Port::new(55223)); } #[test] diff --git a/iceoryx2/src/service/config_scheme.rs b/iceoryx2/src/service/config_scheme.rs index c00e87a83..0d516ff05 100644 --- a/iceoryx2/src/service/config_scheme.rs +++ b/iceoryx2/src/service/config_scheme.rs @@ -73,7 +73,7 @@ pub(crate) fn static_config_storage_config<'config, Service: crate::service::Det generate_default_config::<::Configuration>( "static_config_storage_config", &global_config.global.prefix, - &global_config.global.service.dynamic_config_storage_suffix, + &global_config.global.service.static_config_storage_suffix, &path_hint, ) } diff --git a/iceoryx2/src/service/messaging_pattern.rs b/iceoryx2/src/service/messaging_pattern.rs index 9114b52e3..3ff417ded 100644 --- a/iceoryx2/src/service/messaging_pattern.rs +++ b/iceoryx2/src/service/messaging_pattern.rs @@ -31,6 +31,8 @@ //! [`Listener`](crate::port::listener::Listener)s. //! //! **Note:** This does **not** send or receive POSIX signals nor is it based on them. +use std::fmt::Display; + use crate::service::static_config::event; use crate::service::static_config::publish_subscribe; use serde::{Deserialize, Serialize}; @@ -44,6 +46,15 @@ pub enum MessagingPattern { Event(event::StaticConfig), } +impl Display for MessagingPattern { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + MessagingPattern::Event(_) => write!(f, "Event"), + MessagingPattern::PublishSubscribe(_) => write!(f, "PublishSubscribe"), + } + } +} + impl From for u32 { fn from(value: MessagingPattern) -> Self { match value {