From 4875f809c5aa389fab0d0140ff41d26ba560c82e Mon Sep 17 00:00:00 2001 From: "Michael X. Grey" Date: Fri, 10 Oct 2025 16:20:26 +0800 Subject: [PATCH 1/2] Fix use of serde Signed-off-by: Michael X. Grey --- .github/workflows/rust-minimal.yml | 6 +- .github/workflows/rust-stable.yml | 6 +- rclrs/src/client.rs | 3 +- rclrs/src/publisher.rs | 3 +- rclrs/src/publisher/loaned_message.rs | 3 +- rclrs/src/service.rs | 3 +- rclrs/src/subscription.rs | 6 +- .../subscription/readonly_loaned_message.rs | 3 +- rclrs/src/vendor/example_interfaces/action.rs | 105 +++------ rclrs/src/vendor/test_msgs/action.rs | 220 +++++++----------- rclrs/src/worker.rs | 10 +- 11 files changed, 141 insertions(+), 227 deletions(-) diff --git a/.github/workflows/rust-minimal.yml b/.github/workflows/rust-minimal.yml index 3c3e03105..51b598b5a 100644 --- a/.github/workflows/rust-minimal.yml +++ b/.github/workflows/rust-minimal.yml @@ -68,7 +68,7 @@ jobs: components: clippy, rustfmt # Colcon can not be run in a venv which is required in Ubuntu Noble - # Removing the externally managed file + # Removing the externally managed file - name: Install colcon-cargo and colcon-ros-cargo run: | sudo rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED @@ -117,9 +117,7 @@ jobs: echo "Running cargo test in $path" # Run cargo test for all features except use_ros_shim (needed for docs.rs) if [ "$(basename $path)" = "rclrs" ]; then - cargo test -F default,dyn_msg - elif [ "$(basename $path)" = "rosidl_runtime_rs" ]; then - cargo test -F default + cargo test -F default,dyn_msg,serde else cargo test --all-features fi diff --git a/.github/workflows/rust-stable.yml b/.github/workflows/rust-stable.yml index 65fe8b2a2..ed67407f6 100644 --- a/.github/workflows/rust-stable.yml +++ b/.github/workflows/rust-stable.yml @@ -68,7 +68,7 @@ jobs: components: clippy, rustfmt # Colcon can not be run in a venv which is required in Ubuntu Noble - # Removing the externally managed file + # Removing the externally managed file - name: Install colcon-cargo and colcon-ros-cargo run: | sudo rm -f /usr/lib/python3.12/EXTERNALLY-MANAGED @@ -117,9 +117,7 @@ jobs: echo "Running cargo test in $path" # Run cargo test for all features except use_ros_shim (needed for docs.rs) if [ "$(basename $path)" = "rclrs" ]; then - cargo test -F default,dyn_msg - elif [ "$(basename $path)" = "rosidl_runtime_rs" ]; then - cargo test -F default + cargo test -F default,dyn_msg,serde else cargo test --all-features fi diff --git a/rclrs/src/client.rs b/rclrs/src/client.rs index de79b5b5f..b31aeb2ed 100644 --- a/rclrs/src/client.rs +++ b/rclrs/src/client.rs @@ -567,8 +567,7 @@ unsafe impl Send for rcl_client_t {} #[cfg(test)] mod tests { use super::*; - use crate::test_helpers::*; - use crate::vendor::test_msgs; + use crate::{test_helpers::*, vendor::test_msgs}; #[test] fn traits() { diff --git a/rclrs/src/publisher.rs b/rclrs/src/publisher.rs index a447f3b50..f5540957d 100644 --- a/rclrs/src/publisher.rs +++ b/rclrs/src/publisher.rs @@ -344,8 +344,7 @@ mod tests { #[test] fn test_publishers() -> Result<(), RclrsError> { - use crate::vendor::test_msgs::msg; - use crate::TopicEndpointInfo; + use crate::{vendor::test_msgs::msg, TopicEndpointInfo}; let namespace = "/test_publishers_graph"; let graph = construct_test_graph(namespace)?; diff --git a/rclrs/src/publisher/loaned_message.rs b/rclrs/src/publisher/loaned_message.rs index e8911ce9b..4a39d7001 100644 --- a/rclrs/src/publisher/loaned_message.rs +++ b/rclrs/src/publisher/loaned_message.rs @@ -98,8 +98,7 @@ mod tests { #[test] fn traits() { - use crate::test_helpers::*; - use crate::vendor::test_msgs; + use crate::{test_helpers::*, vendor::test_msgs}; assert_send::>(); assert_sync::>(); diff --git a/rclrs/src/service.rs b/rclrs/src/service.rs index 4537d7b6e..9adf00997 100644 --- a/rclrs/src/service.rs +++ b/rclrs/src/service.rs @@ -400,8 +400,7 @@ mod tests { #[test] fn test_services() -> Result<(), RclrsError> { - use crate::vendor::test_msgs::srv; - use crate::TopicNamesAndTypes; + use crate::{vendor::test_msgs::srv, TopicNamesAndTypes}; let namespace = "/test_services_graph"; let graph = construct_test_graph(namespace)?; diff --git a/rclrs/src/subscription.rs b/rclrs/src/subscription.rs index f8c119366..37dd6140c 100644 --- a/rclrs/src/subscription.rs +++ b/rclrs/src/subscription.rs @@ -411,8 +411,7 @@ impl Drop for SubscriptionHandle { #[cfg(test)] mod tests { use super::*; - use crate::test_helpers::*; - use crate::vendor::test_msgs::msg; + use crate::{test_helpers::*, vendor::test_msgs::msg}; #[test] fn traits() { @@ -523,8 +522,7 @@ mod tests { #[test] fn test_delayed_subscription() { - use crate::vendor::example_interfaces::msg::Empty; - use crate::*; + use crate::{vendor::example_interfaces::msg::Empty, *}; use futures::{ channel::{mpsc, oneshot}, StreamExt, diff --git a/rclrs/src/subscription/readonly_loaned_message.rs b/rclrs/src/subscription/readonly_loaned_message.rs index adeab0df7..5de250a6d 100644 --- a/rclrs/src/subscription/readonly_loaned_message.rs +++ b/rclrs/src/subscription/readonly_loaned_message.rs @@ -60,8 +60,7 @@ mod tests { #[test] fn traits() { - use crate::test_helpers::*; - use crate::vendor::test_msgs; + use crate::{test_helpers::*, vendor::test_msgs}; assert_send::>(); assert_sync::>(); diff --git a/rclrs/src/vendor/example_interfaces/action.rs b/rclrs/src/vendor/example_interfaces/action.rs index a038e53e2..745c4ca81 100644 --- a/rclrs/src/vendor/example_interfaces/action.rs +++ b/rclrs/src/vendor/example_interfaces/action.rs @@ -381,9 +381,6 @@ pub mod rmw { } } - #[cfg(feature = "serde")] - use serde::{Deserialize, Serialize}; - #[link(name = "example_interfaces__rosidl_typesupport_c")] extern "C" { fn rosidl_typesupport_c__get_message_type_support_handle__example_interfaces__action__Fibonacci_SendGoal_Request( @@ -830,8 +827,7 @@ pub mod rmw { impl rosidl_runtime_rs::Service for Fibonacci_GetResult { type Request = crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Request; - type Response = - crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response; + type Response = crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response; fn get_type_support() -> *const std::ffi::c_void { // SAFETY: No preconditions for this function. @@ -973,42 +969,32 @@ impl rosidl_runtime_rs::Message for Fibonacci_FeedbackMessage { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - feedback: - crate::vendor::example_interfaces::action::Fibonacci_Feedback::into_rmw_message( - std::borrow::Cow::Owned(msg.feedback), - ) - .into_owned(), + feedback: crate::vendor::example_interfaces::action::Fibonacci_Feedback::into_rmw_message( + std::borrow::Cow::Owned(msg.feedback), + ) + .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::into_rmw_message( std::borrow::Cow::Borrowed(&msg.goal_id), ) .into_owned(), - feedback: - crate::vendor::example_interfaces::action::Fibonacci_Feedback::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.feedback), - ) - .into_owned(), + feedback: crate::vendor::example_interfaces::action::Fibonacci_Feedback::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.feedback), + ) + .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( - msg.goal_id, - ), - feedback: - crate::vendor::example_interfaces::action::Fibonacci_Feedback::from_rmw_message( - msg.feedback, - ), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), + feedback: crate::vendor::example_interfaces::action::Fibonacci_Feedback::from_rmw_message(msg.feedback), } } } -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; - #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))] #[derive(Clone, Debug, PartialEq, PartialOrd)] pub struct Fibonacci_SendGoal_Request { @@ -1034,9 +1020,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::into_rmw_message( - std::borrow::Cow::Owned(msg.goal), - ) + goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::into_rmw_message(std::borrow::Cow::Owned( + msg.goal, + )) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { @@ -1044,9 +1030,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { std::borrow::Cow::Borrowed(&msg.goal_id), ) .into_owned(), - goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.goal), - ) + goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::into_rmw_message(std::borrow::Cow::Borrowed( + &msg.goal, + )) .into_owned(), }), } @@ -1054,12 +1040,8 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( - msg.goal_id, - ), - goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::from_rmw_message( - msg.goal, - ), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), + goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::from_rmw_message(msg.goal), } } } @@ -1086,16 +1068,16 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Owned(msg.stamp), - ) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Owned( + msg.stamp, + )) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.stamp), - ) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Borrowed( + &msg.stamp, + )) .into_owned(), }), } @@ -1145,9 +1127,7 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( - msg.goal_id, - ), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), } } } @@ -1174,19 +1154,17 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { status: msg.status, - result: - crate::vendor::example_interfaces::action::Fibonacci_Result::into_rmw_message( - std::borrow::Cow::Owned(msg.result), - ) - .into_owned(), + result: crate::vendor::example_interfaces::action::Fibonacci_Result::into_rmw_message(std::borrow::Cow::Owned( + msg.result, + )) + .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { status: msg.status, - result: - crate::vendor::example_interfaces::action::Fibonacci_Result::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.result), - ) - .into_owned(), + result: crate::vendor::example_interfaces::action::Fibonacci_Result::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.result), + ) + .into_owned(), }), } } @@ -1194,9 +1172,7 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Response { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { status: msg.status, - result: crate::vendor::example_interfaces::action::Fibonacci_Result::from_rmw_message( - msg.result, - ), + result: crate::vendor::example_interfaces::action::Fibonacci_Result::from_rmw_message(msg.result), } } } @@ -1267,8 +1243,7 @@ impl rosidl_runtime_rs::Action for Fibonacci { impl rosidl_runtime_rs::ActionImpl for Fibonacci { type GoalStatusMessage = crate::vendor::action_msgs::msg::rmw::GoalStatusArray; - type FeedbackMessage = - crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage; + type FeedbackMessage = crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage; type SendGoalService = crate::vendor::example_interfaces::action::rmw::Fibonacci_SendGoal; type CancelGoalService = crate::vendor::action_msgs::srv::rmw::CancelGoal; @@ -1319,8 +1294,7 @@ impl rosidl_runtime_rs::ActionImpl for Fibonacci { goal_id: &[u8; 16], feedback: crate::vendor::example_interfaces::action::rmw::Fibonacci_Feedback, ) -> crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage { - let mut message = - crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage::default(); + let mut message = crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage::default(); message.goal_id.uuid = *goal_id; message.feedback = feedback; message @@ -1356,10 +1330,7 @@ impl rosidl_runtime_rs::ActionImpl for Fibonacci { status: i8, result: crate::vendor::example_interfaces::action::rmw::Fibonacci_Result, ) -> crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response { - crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response { - status, - result, - } + crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response { status, result } } fn get_result_response_result( diff --git a/rclrs/src/vendor/test_msgs/action.rs b/rclrs/src/vendor/test_msgs/action.rs index b5008a2ac..867da4139 100644 --- a/rclrs/src/vendor/test_msgs/action.rs +++ b/rclrs/src/vendor/test_msgs/action.rs @@ -729,9 +729,6 @@ pub mod rmw { } } - #[cfg(feature = "serde")] - use serde::{Deserialize, Serialize}; - #[link(name = "test_msgs__rosidl_typesupport_c")] extern "C" { fn rosidl_typesupport_c__get_message_type_support_handle__test_msgs__action__Fibonacci_SendGoal_Request( @@ -1756,12 +1753,8 @@ impl rosidl_runtime_rs::Message for Fibonacci_FeedbackMessage { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( - msg.goal_id, - ), - feedback: crate::vendor::test_msgs::action::Fibonacci_Feedback::from_rmw_message( - msg.feedback, - ), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), + feedback: crate::vendor::test_msgs::action::Fibonacci_Feedback::from_rmw_message(msg.feedback), } } } @@ -1792,42 +1785,36 @@ impl rosidl_runtime_rs::Message for NestedMessage_Goal { std::borrow::Cow::Owned(msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( - std::borrow::Cow::Owned(msg.nested_field), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Owned( + msg.nested_field, + )) + .into_owned(), + nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Owned(msg.nested_different_pkg), ) .into_owned(), - nested_different_pkg: - crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Owned(msg.nested_different_pkg), - ) - .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::into_rmw_message( std::borrow::Cow::Borrowed(&msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.nested_field), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Borrowed( + &msg.nested_field, + )) + .into_owned(), + nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.nested_different_pkg), ) .into_owned(), - nested_different_pkg: - crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.nested_different_pkg), - ) - .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message( - msg.nested_field_no_pkg, - ), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message( - msg.nested_field, - ), + nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message(msg.nested_field_no_pkg), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message(msg.nested_field), nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::from_rmw_message( msg.nested_different_pkg, ), @@ -1861,42 +1848,36 @@ impl rosidl_runtime_rs::Message for NestedMessage_Result { std::borrow::Cow::Owned(msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( - std::borrow::Cow::Owned(msg.nested_field), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Owned( + msg.nested_field, + )) + .into_owned(), + nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Owned(msg.nested_different_pkg), ) .into_owned(), - nested_different_pkg: - crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Owned(msg.nested_different_pkg), - ) - .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::into_rmw_message( std::borrow::Cow::Borrowed(&msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.nested_field), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Borrowed( + &msg.nested_field, + )) + .into_owned(), + nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.nested_different_pkg), ) .into_owned(), - nested_different_pkg: - crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.nested_different_pkg), - ) - .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message( - msg.nested_field_no_pkg, - ), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message( - msg.nested_field, - ), + nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message(msg.nested_field_no_pkg), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message(msg.nested_field), nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::from_rmw_message( msg.nested_different_pkg, ), @@ -1930,42 +1911,36 @@ impl rosidl_runtime_rs::Message for NestedMessage_Feedback { std::borrow::Cow::Owned(msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( - std::borrow::Cow::Owned(msg.nested_field), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Owned( + msg.nested_field, + )) + .into_owned(), + nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Owned(msg.nested_different_pkg), ) .into_owned(), - nested_different_pkg: - crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Owned(msg.nested_different_pkg), - ) - .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::into_rmw_message( std::borrow::Cow::Borrowed(&msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.nested_field), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Borrowed( + &msg.nested_field, + )) + .into_owned(), + nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.nested_different_pkg), ) .into_owned(), - nested_different_pkg: - crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.nested_different_pkg), - ) - .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message( - msg.nested_field_no_pkg, - ), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message( - msg.nested_field, - ), + nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message(msg.nested_field_no_pkg), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message(msg.nested_field), nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::from_rmw_message( msg.nested_different_pkg, ), @@ -1998,41 +1973,32 @@ impl rosidl_runtime_rs::Message for NestedMessage_FeedbackMessage { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - feedback: - crate::vendor::test_msgs::action::NestedMessage_Feedback::into_rmw_message( - std::borrow::Cow::Owned(msg.feedback), - ) - .into_owned(), + feedback: crate::vendor::test_msgs::action::NestedMessage_Feedback::into_rmw_message( + std::borrow::Cow::Owned(msg.feedback), + ) + .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::into_rmw_message( std::borrow::Cow::Borrowed(&msg.goal_id), ) .into_owned(), - feedback: - crate::vendor::test_msgs::action::NestedMessage_Feedback::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.feedback), - ) - .into_owned(), + feedback: crate::vendor::test_msgs::action::NestedMessage_Feedback::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.feedback), + ) + .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( - msg.goal_id, - ), - feedback: crate::vendor::test_msgs::action::NestedMessage_Feedback::from_rmw_message( - msg.feedback, - ), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), + feedback: crate::vendor::test_msgs::action::NestedMessage_Feedback::from_rmw_message(msg.feedback), } } } -#[cfg(feature = "serde")] -use serde::{Deserialize, Serialize}; - #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))] #[derive(Clone, Debug, PartialEq, PartialOrd)] pub struct Fibonacci_SendGoal_Request { @@ -2058,9 +2024,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - goal: crate::vendor::test_msgs::action::Fibonacci_Goal::into_rmw_message( - std::borrow::Cow::Owned(msg.goal), - ) + goal: crate::vendor::test_msgs::action::Fibonacci_Goal::into_rmw_message(std::borrow::Cow::Owned( + msg.goal, + )) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { @@ -2068,9 +2034,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { std::borrow::Cow::Borrowed(&msg.goal_id), ) .into_owned(), - goal: crate::vendor::test_msgs::action::Fibonacci_Goal::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.goal), - ) + goal: crate::vendor::test_msgs::action::Fibonacci_Goal::into_rmw_message(std::borrow::Cow::Borrowed( + &msg.goal, + )) .into_owned(), }), } @@ -2078,9 +2044,7 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( - msg.goal_id, - ), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), goal: crate::vendor::test_msgs::action::Fibonacci_Goal::from_rmw_message(msg.goal), } } @@ -2108,16 +2072,16 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Owned(msg.stamp), - ) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Owned( + msg.stamp, + )) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.stamp), - ) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Borrowed( + &msg.stamp, + )) .into_owned(), }), } @@ -2167,9 +2131,7 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( - msg.goal_id, - ), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), } } } @@ -2196,9 +2158,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { status: msg.status, - result: crate::vendor::test_msgs::action::Fibonacci_Result::into_rmw_message( - std::borrow::Cow::Owned(msg.result), - ) + result: crate::vendor::test_msgs::action::Fibonacci_Result::into_rmw_message(std::borrow::Cow::Owned( + msg.result, + )) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { @@ -2214,9 +2176,7 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Response { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { status: msg.status, - result: crate::vendor::test_msgs::action::Fibonacci_Result::from_rmw_message( - msg.result, - ), + result: crate::vendor::test_msgs::action::Fibonacci_Result::from_rmw_message(msg.result), } } } @@ -2246,9 +2206,9 @@ impl rosidl_runtime_rs::Message for NestedMessage_SendGoal_Request { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - goal: crate::vendor::test_msgs::action::NestedMessage_Goal::into_rmw_message( - std::borrow::Cow::Owned(msg.goal), - ) + goal: crate::vendor::test_msgs::action::NestedMessage_Goal::into_rmw_message(std::borrow::Cow::Owned( + msg.goal, + )) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { @@ -2266,9 +2226,7 @@ impl rosidl_runtime_rs::Message for NestedMessage_SendGoal_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( - msg.goal_id, - ), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), goal: crate::vendor::test_msgs::action::NestedMessage_Goal::from_rmw_message(msg.goal), } } @@ -2296,16 +2254,16 @@ impl rosidl_runtime_rs::Message for NestedMessage_SendGoal_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Owned(msg.stamp), - ) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Owned( + msg.stamp, + )) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.stamp), - ) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Borrowed( + &msg.stamp, + )) .into_owned(), }), } @@ -2355,9 +2313,7 @@ impl rosidl_runtime_rs::Message for NestedMessage_GetResult_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( - msg.goal_id, - ), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), } } } @@ -2402,9 +2358,7 @@ impl rosidl_runtime_rs::Message for NestedMessage_GetResult_Response { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { status: msg.status, - result: crate::vendor::test_msgs::action::NestedMessage_Result::from_rmw_message( - msg.result, - ), + result: crate::vendor::test_msgs::action::NestedMessage_Result::from_rmw_message(msg.result), } } } @@ -2568,8 +2522,7 @@ impl rosidl_runtime_rs::ActionImpl for Fibonacci { goal_id: &[u8; 16], feedback: crate::vendor::test_msgs::action::rmw::Fibonacci_Feedback, ) -> crate::vendor::test_msgs::action::rmw::Fibonacci_FeedbackMessage { - let mut message = - crate::vendor::test_msgs::action::rmw::Fibonacci_FeedbackMessage::default(); + let mut message = crate::vendor::test_msgs::action::rmw::Fibonacci_FeedbackMessage::default(); message.goal_id.uuid = *goal_id; message.feedback = feedback; message @@ -2696,8 +2649,7 @@ impl rosidl_runtime_rs::ActionImpl for NestedMessage { goal_id: &[u8; 16], feedback: crate::vendor::test_msgs::action::rmw::NestedMessage_Feedback, ) -> crate::vendor::test_msgs::action::rmw::NestedMessage_FeedbackMessage { - let mut message = - crate::vendor::test_msgs::action::rmw::NestedMessage_FeedbackMessage::default(); + let mut message = crate::vendor::test_msgs::action::rmw::NestedMessage_FeedbackMessage::default(); message.goal_id.uuid = *goal_id; message.feedback = feedback; message diff --git a/rclrs/src/worker.rs b/rclrs/src/worker.rs index 261240ec7..5194df73a 100644 --- a/rclrs/src/worker.rs +++ b/rclrs/src/worker.rs @@ -501,11 +501,13 @@ impl WorkScope for Worker { #[cfg(test)] mod tests { - use crate::vendor::test_msgs::{ - msg::Empty as EmptyMsg, - srv::{Empty as EmptySrv, Empty_Request, Empty_Response}, + use crate::{ + vendor::test_msgs::{ + msg::Empty as EmptyMsg, + srv::{Empty as EmptySrv, Empty_Request, Empty_Response}, + }, + *, }; - use crate::*; use std::time::Duration; #[derive(Default, Clone, Copy, Debug)] From 9e8f0996e530c15716811acf36e225b3d32d6fb5 Mon Sep 17 00:00:00 2001 From: "Michael X. Grey" Date: Fri, 10 Oct 2025 16:36:18 +0800 Subject: [PATCH 2/2] Apply cargo fmt without nightly Signed-off-by: Michael X. Grey --- rclrs/src/vendor/example_interfaces/action.rs | 99 ++++---- rclrs/src/vendor/test_msgs/action.rs | 214 +++++++++++------- 2 files changed, 189 insertions(+), 124 deletions(-) diff --git a/rclrs/src/vendor/example_interfaces/action.rs b/rclrs/src/vendor/example_interfaces/action.rs index 745c4ca81..8c94dd1fa 100644 --- a/rclrs/src/vendor/example_interfaces/action.rs +++ b/rclrs/src/vendor/example_interfaces/action.rs @@ -827,7 +827,8 @@ pub mod rmw { impl rosidl_runtime_rs::Service for Fibonacci_GetResult { type Request = crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Request; - type Response = crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response; + type Response = + crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response; fn get_type_support() -> *const std::ffi::c_void { // SAFETY: No preconditions for this function. @@ -969,28 +970,35 @@ impl rosidl_runtime_rs::Message for Fibonacci_FeedbackMessage { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - feedback: crate::vendor::example_interfaces::action::Fibonacci_Feedback::into_rmw_message( - std::borrow::Cow::Owned(msg.feedback), - ) - .into_owned(), + feedback: + crate::vendor::example_interfaces::action::Fibonacci_Feedback::into_rmw_message( + std::borrow::Cow::Owned(msg.feedback), + ) + .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::into_rmw_message( std::borrow::Cow::Borrowed(&msg.goal_id), ) .into_owned(), - feedback: crate::vendor::example_interfaces::action::Fibonacci_Feedback::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.feedback), - ) - .into_owned(), + feedback: + crate::vendor::example_interfaces::action::Fibonacci_Feedback::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.feedback), + ) + .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), - feedback: crate::vendor::example_interfaces::action::Fibonacci_Feedback::from_rmw_message(msg.feedback), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( + msg.goal_id, + ), + feedback: + crate::vendor::example_interfaces::action::Fibonacci_Feedback::from_rmw_message( + msg.feedback, + ), } } } @@ -1020,9 +1028,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::into_rmw_message(std::borrow::Cow::Owned( - msg.goal, - )) + goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::into_rmw_message( + std::borrow::Cow::Owned(msg.goal), + ) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { @@ -1030,9 +1038,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { std::borrow::Cow::Borrowed(&msg.goal_id), ) .into_owned(), - goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::into_rmw_message(std::borrow::Cow::Borrowed( - &msg.goal, - )) + goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.goal), + ) .into_owned(), }), } @@ -1040,8 +1048,12 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), - goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::from_rmw_message(msg.goal), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( + msg.goal_id, + ), + goal: crate::vendor::example_interfaces::action::Fibonacci_Goal::from_rmw_message( + msg.goal, + ), } } } @@ -1068,16 +1080,16 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Owned( - msg.stamp, - )) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Owned(msg.stamp), + ) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Borrowed( - &msg.stamp, - )) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.stamp), + ) .into_owned(), }), } @@ -1127,7 +1139,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( + msg.goal_id, + ), } } } @@ -1154,17 +1168,19 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { status: msg.status, - result: crate::vendor::example_interfaces::action::Fibonacci_Result::into_rmw_message(std::borrow::Cow::Owned( - msg.result, - )) - .into_owned(), + result: + crate::vendor::example_interfaces::action::Fibonacci_Result::into_rmw_message( + std::borrow::Cow::Owned(msg.result), + ) + .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { status: msg.status, - result: crate::vendor::example_interfaces::action::Fibonacci_Result::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.result), - ) - .into_owned(), + result: + crate::vendor::example_interfaces::action::Fibonacci_Result::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.result), + ) + .into_owned(), }), } } @@ -1172,7 +1188,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Response { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { status: msg.status, - result: crate::vendor::example_interfaces::action::Fibonacci_Result::from_rmw_message(msg.result), + result: crate::vendor::example_interfaces::action::Fibonacci_Result::from_rmw_message( + msg.result, + ), } } } @@ -1243,7 +1261,8 @@ impl rosidl_runtime_rs::Action for Fibonacci { impl rosidl_runtime_rs::ActionImpl for Fibonacci { type GoalStatusMessage = crate::vendor::action_msgs::msg::rmw::GoalStatusArray; - type FeedbackMessage = crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage; + type FeedbackMessage = + crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage; type SendGoalService = crate::vendor::example_interfaces::action::rmw::Fibonacci_SendGoal; type CancelGoalService = crate::vendor::action_msgs::srv::rmw::CancelGoal; @@ -1294,7 +1313,8 @@ impl rosidl_runtime_rs::ActionImpl for Fibonacci { goal_id: &[u8; 16], feedback: crate::vendor::example_interfaces::action::rmw::Fibonacci_Feedback, ) -> crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage { - let mut message = crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage::default(); + let mut message = + crate::vendor::example_interfaces::action::rmw::Fibonacci_FeedbackMessage::default(); message.goal_id.uuid = *goal_id; message.feedback = feedback; message @@ -1330,7 +1350,10 @@ impl rosidl_runtime_rs::ActionImpl for Fibonacci { status: i8, result: crate::vendor::example_interfaces::action::rmw::Fibonacci_Result, ) -> crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response { - crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response { status, result } + crate::vendor::example_interfaces::action::rmw::Fibonacci_GetResult_Response { + status, + result, + } } fn get_result_response_result( diff --git a/rclrs/src/vendor/test_msgs/action.rs b/rclrs/src/vendor/test_msgs/action.rs index 867da4139..0ef37280c 100644 --- a/rclrs/src/vendor/test_msgs/action.rs +++ b/rclrs/src/vendor/test_msgs/action.rs @@ -1753,8 +1753,12 @@ impl rosidl_runtime_rs::Message for Fibonacci_FeedbackMessage { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), - feedback: crate::vendor::test_msgs::action::Fibonacci_Feedback::from_rmw_message(msg.feedback), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( + msg.goal_id, + ), + feedback: crate::vendor::test_msgs::action::Fibonacci_Feedback::from_rmw_message( + msg.feedback, + ), } } } @@ -1785,36 +1789,42 @@ impl rosidl_runtime_rs::Message for NestedMessage_Goal { std::borrow::Cow::Owned(msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Owned( - msg.nested_field, - )) - .into_owned(), - nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Owned(msg.nested_different_pkg), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( + std::borrow::Cow::Owned(msg.nested_field), ) .into_owned(), + nested_different_pkg: + crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Owned(msg.nested_different_pkg), + ) + .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::into_rmw_message( std::borrow::Cow::Borrowed(&msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Borrowed( - &msg.nested_field, - )) - .into_owned(), - nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.nested_different_pkg), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.nested_field), ) .into_owned(), + nested_different_pkg: + crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.nested_different_pkg), + ) + .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message(msg.nested_field_no_pkg), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message(msg.nested_field), + nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message( + msg.nested_field_no_pkg, + ), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message( + msg.nested_field, + ), nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::from_rmw_message( msg.nested_different_pkg, ), @@ -1848,36 +1858,42 @@ impl rosidl_runtime_rs::Message for NestedMessage_Result { std::borrow::Cow::Owned(msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Owned( - msg.nested_field, - )) - .into_owned(), - nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Owned(msg.nested_different_pkg), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( + std::borrow::Cow::Owned(msg.nested_field), ) .into_owned(), + nested_different_pkg: + crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Owned(msg.nested_different_pkg), + ) + .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::into_rmw_message( std::borrow::Cow::Borrowed(&msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Borrowed( - &msg.nested_field, - )) - .into_owned(), - nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.nested_different_pkg), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.nested_field), ) .into_owned(), + nested_different_pkg: + crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.nested_different_pkg), + ) + .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message(msg.nested_field_no_pkg), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message(msg.nested_field), + nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message( + msg.nested_field_no_pkg, + ), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message( + msg.nested_field, + ), nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::from_rmw_message( msg.nested_different_pkg, ), @@ -1911,36 +1927,42 @@ impl rosidl_runtime_rs::Message for NestedMessage_Feedback { std::borrow::Cow::Owned(msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Owned( - msg.nested_field, - )) - .into_owned(), - nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Owned(msg.nested_different_pkg), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( + std::borrow::Cow::Owned(msg.nested_field), ) .into_owned(), + nested_different_pkg: + crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Owned(msg.nested_different_pkg), + ) + .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::into_rmw_message( std::borrow::Cow::Borrowed(&msg.nested_field_no_pkg), ) .into_owned(), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message(std::borrow::Cow::Borrowed( - &msg.nested_field, - )) - .into_owned(), - nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.nested_different_pkg), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.nested_field), ) .into_owned(), + nested_different_pkg: + crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.nested_different_pkg), + ) + .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message(msg.nested_field_no_pkg), - nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message(msg.nested_field), + nested_field_no_pkg: crate::vendor::test_msgs::msg::Builtins::from_rmw_message( + msg.nested_field_no_pkg, + ), + nested_field: crate::vendor::test_msgs::msg::BasicTypes::from_rmw_message( + msg.nested_field, + ), nested_different_pkg: crate::vendor::builtin_interfaces::msg::Time::from_rmw_message( msg.nested_different_pkg, ), @@ -1973,28 +1995,34 @@ impl rosidl_runtime_rs::Message for NestedMessage_FeedbackMessage { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - feedback: crate::vendor::test_msgs::action::NestedMessage_Feedback::into_rmw_message( - std::borrow::Cow::Owned(msg.feedback), - ) - .into_owned(), + feedback: + crate::vendor::test_msgs::action::NestedMessage_Feedback::into_rmw_message( + std::borrow::Cow::Owned(msg.feedback), + ) + .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::into_rmw_message( std::borrow::Cow::Borrowed(&msg.goal_id), ) .into_owned(), - feedback: crate::vendor::test_msgs::action::NestedMessage_Feedback::into_rmw_message( - std::borrow::Cow::Borrowed(&msg.feedback), - ) - .into_owned(), + feedback: + crate::vendor::test_msgs::action::NestedMessage_Feedback::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.feedback), + ) + .into_owned(), }), } } fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), - feedback: crate::vendor::test_msgs::action::NestedMessage_Feedback::from_rmw_message(msg.feedback), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( + msg.goal_id, + ), + feedback: crate::vendor::test_msgs::action::NestedMessage_Feedback::from_rmw_message( + msg.feedback, + ), } } } @@ -2024,9 +2052,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - goal: crate::vendor::test_msgs::action::Fibonacci_Goal::into_rmw_message(std::borrow::Cow::Owned( - msg.goal, - )) + goal: crate::vendor::test_msgs::action::Fibonacci_Goal::into_rmw_message( + std::borrow::Cow::Owned(msg.goal), + ) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { @@ -2034,9 +2062,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { std::borrow::Cow::Borrowed(&msg.goal_id), ) .into_owned(), - goal: crate::vendor::test_msgs::action::Fibonacci_Goal::into_rmw_message(std::borrow::Cow::Borrowed( - &msg.goal, - )) + goal: crate::vendor::test_msgs::action::Fibonacci_Goal::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.goal), + ) .into_owned(), }), } @@ -2044,7 +2072,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( + msg.goal_id, + ), goal: crate::vendor::test_msgs::action::Fibonacci_Goal::from_rmw_message(msg.goal), } } @@ -2072,16 +2102,16 @@ impl rosidl_runtime_rs::Message for Fibonacci_SendGoal_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Owned( - msg.stamp, - )) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Owned(msg.stamp), + ) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Borrowed( - &msg.stamp, - )) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.stamp), + ) .into_owned(), }), } @@ -2131,7 +2161,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( + msg.goal_id, + ), } } } @@ -2158,9 +2190,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { status: msg.status, - result: crate::vendor::test_msgs::action::Fibonacci_Result::into_rmw_message(std::borrow::Cow::Owned( - msg.result, - )) + result: crate::vendor::test_msgs::action::Fibonacci_Result::into_rmw_message( + std::borrow::Cow::Owned(msg.result), + ) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { @@ -2176,7 +2208,9 @@ impl rosidl_runtime_rs::Message for Fibonacci_GetResult_Response { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { status: msg.status, - result: crate::vendor::test_msgs::action::Fibonacci_Result::from_rmw_message(msg.result), + result: crate::vendor::test_msgs::action::Fibonacci_Result::from_rmw_message( + msg.result, + ), } } } @@ -2206,9 +2240,9 @@ impl rosidl_runtime_rs::Message for NestedMessage_SendGoal_Request { std::borrow::Cow::Owned(msg.goal_id), ) .into_owned(), - goal: crate::vendor::test_msgs::action::NestedMessage_Goal::into_rmw_message(std::borrow::Cow::Owned( - msg.goal, - )) + goal: crate::vendor::test_msgs::action::NestedMessage_Goal::into_rmw_message( + std::borrow::Cow::Owned(msg.goal), + ) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { @@ -2226,7 +2260,9 @@ impl rosidl_runtime_rs::Message for NestedMessage_SendGoal_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( + msg.goal_id, + ), goal: crate::vendor::test_msgs::action::NestedMessage_Goal::from_rmw_message(msg.goal), } } @@ -2254,16 +2290,16 @@ impl rosidl_runtime_rs::Message for NestedMessage_SendGoal_Response { match msg_cow { std::borrow::Cow::Owned(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Owned( - msg.stamp, - )) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Owned(msg.stamp), + ) .into_owned(), }), std::borrow::Cow::Borrowed(msg) => std::borrow::Cow::Owned(Self::RmwMsg { accepted: msg.accepted, - stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message(std::borrow::Cow::Borrowed( - &msg.stamp, - )) + stamp: crate::vendor::builtin_interfaces::msg::Time::into_rmw_message( + std::borrow::Cow::Borrowed(&msg.stamp), + ) .into_owned(), }), } @@ -2313,7 +2349,9 @@ impl rosidl_runtime_rs::Message for NestedMessage_GetResult_Request { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { - goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message(msg.goal_id), + goal_id: crate::vendor::unique_identifier_msgs::msg::UUID::from_rmw_message( + msg.goal_id, + ), } } } @@ -2358,7 +2396,9 @@ impl rosidl_runtime_rs::Message for NestedMessage_GetResult_Response { fn from_rmw_message(msg: Self::RmwMsg) -> Self { Self { status: msg.status, - result: crate::vendor::test_msgs::action::NestedMessage_Result::from_rmw_message(msg.result), + result: crate::vendor::test_msgs::action::NestedMessage_Result::from_rmw_message( + msg.result, + ), } } } @@ -2522,7 +2562,8 @@ impl rosidl_runtime_rs::ActionImpl for Fibonacci { goal_id: &[u8; 16], feedback: crate::vendor::test_msgs::action::rmw::Fibonacci_Feedback, ) -> crate::vendor::test_msgs::action::rmw::Fibonacci_FeedbackMessage { - let mut message = crate::vendor::test_msgs::action::rmw::Fibonacci_FeedbackMessage::default(); + let mut message = + crate::vendor::test_msgs::action::rmw::Fibonacci_FeedbackMessage::default(); message.goal_id.uuid = *goal_id; message.feedback = feedback; message @@ -2649,7 +2690,8 @@ impl rosidl_runtime_rs::ActionImpl for NestedMessage { goal_id: &[u8; 16], feedback: crate::vendor::test_msgs::action::rmw::NestedMessage_Feedback, ) -> crate::vendor::test_msgs::action::rmw::NestedMessage_FeedbackMessage { - let mut message = crate::vendor::test_msgs::action::rmw::NestedMessage_FeedbackMessage::default(); + let mut message = + crate::vendor::test_msgs::action::rmw::NestedMessage_FeedbackMessage::default(); message.goal_id.uuid = *goal_id; message.feedback = feedback; message