From 4099c8d0acb2f80ce8b50dd64d3081404d6ac6b8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 06:21:52 +0200
Subject: [PATCH] chore(deps): update ros2_rust digest to e485b1c (#351)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Milan Vukov <milan@otiv.ai>
---
 .../patches/ros2_rust_no_msg_vendoring.patch  | 71 ++++++++++++++++---
 repositories/rust_setup_stage_1.bzl           |  6 +-
 2 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/repositories/patches/ros2_rust_no_msg_vendoring.patch b/repositories/patches/ros2_rust_no_msg_vendoring.patch
index d025b8d1..4c7b68c6 100644
--- a/repositories/patches/ros2_rust_no_msg_vendoring.patch
+++ b/repositories/patches/ros2_rust_no_msg_vendoring.patch
@@ -10,20 +10,69 @@ index 4924b36..6e618c0 100644
  mod wait;
  
  #[cfg(test)]
+diff --git a/rclrs/src/parameter.rs b/rclrs/src/parameter.rs
+index c8a710e..43e9447 100644
+--- a/rclrs/src/parameter.rs
++++ b/rclrs/src/parameter.rs
+@@ -8,7 +8,7 @@ pub use range::*;
+ use service::*;
+ pub use value::*;
+ 
+-use crate::vendor::rcl_interfaces::msg::rmw::{ParameterType, ParameterValue as RmwParameterValue};
++use rcl_interfaces::msg::rmw::{ParameterType, ParameterValue as RmwParameterValue};
+ 
+ use crate::{call_string_getter_with_rcl_node, rcl_bindings::*, Node, RclrsError};
+ use std::{
+diff --git a/rclrs/src/parameter/range.rs b/rclrs/src/parameter/range.rs
+index 96f66d6..fb7dede 100644
+--- a/rclrs/src/parameter/range.rs
++++ b/rclrs/src/parameter/range.rs
+@@ -1,7 +1,7 @@
+ use crate::{
+-    vendor::rcl_interfaces::msg::rmw::{FloatingPointRange, IntegerRange},
+     DeclarationError, ParameterValue, ParameterVariant,
+ };
++use rcl_interfaces::msg::rmw::{FloatingPointRange, IntegerRange};
+ use rosidl_runtime_rs::{seq, BoundedSequence};
+ 
+ impl From<ParameterRange<f64>> for ParameterRanges {
 diff --git a/rclrs/src/parameter/service.rs b/rclrs/src/parameter/service.rs
-index bcbe24b..1d240b0 100644
+index 7c8ffe6..d1d95b0 100644
 --- a/rclrs/src/parameter/service.rs
 +++ b/rclrs/src/parameter/service.rs
-@@ -1,7 +1,7 @@
- use std::sync::{Arc, Weak, Mutex};
+@@ -3,7 +3,7 @@ use std::{
+     sync::{Arc, Mutex},
+ };
+ 
+-use crate::vendor::rcl_interfaces::{msg::rmw::*, srv::rmw::*};
++use rcl_interfaces::{msg::rmw::*, srv::rmw::*};
+ use rosidl_runtime_rs::Sequence;
  
--use crate::vendor::rcl_interfaces::srv::rmw::*;
--use crate::vendor::rcl_interfaces::msg::rmw::*;
-+use rcl_interfaces::srv::rmw::*;
-+use rcl_interfaces::msg::rmw::*;
- use rosidl_runtime_rs::{Sequence, seq};
+ use super::ParameterMap;
+@@ -306,7 +306,7 @@ impl ParameterService {
+ #[cfg(test)]
+ mod tests {
+     use crate::{
+-        vendor::rcl_interfaces::{
++        rcl_interfaces::{
+             msg::rmw::{
+                 Parameter as RmwParameter, ParameterType, ParameterValue as RmwParameterValue,
+             },
+diff --git a/rclrs/src/parameter/value.rs b/rclrs/src/parameter/value.rs
+index 9d431c0..627c406 100644
+--- a/rclrs/src/parameter/value.rs
++++ b/rclrs/src/parameter/value.rs
+@@ -3,9 +3,9 @@ use std::{ffi::CStr, sync::Arc};
+ use crate::{
+     parameter::{ParameterRange, ParameterRanges},
+     rcl_bindings::*,
+-    vendor::rcl_interfaces::msg::rmw::{ParameterType, ParameterValue as RmwParameterValue},
+     ParameterValueError,
+ };
++use rcl_interfaces::msg::rmw::{ParameterType, ParameterValue as RmwParameterValue};
  
- use crate::{rmw_request_id_t, Node, RclrsError, Service, ServiceBase};
+ /// A parameter value.
+ ///
 diff --git a/rclrs/src/time.rs b/rclrs/src/time.rs
 index 540c624..4d64234 100644
 --- a/rclrs/src/time.rs
@@ -36,14 +85,14 @@ index 540c624..4d64234 100644
      num::TryFromIntError,
      ops::{Add, Sub},
 diff --git a/rclrs/src/time_source.rs b/rclrs/src/time_source.rs
-index 143adf0..b04ee06 100644
+index a6b6008..577643f 100644
 --- a/rclrs/src/time_source.rs
 +++ b/rclrs/src/time_source.rs
 @@ -1,8 +1,8 @@
  use crate::{
      clock::{Clock, ClockSource, ClockType},
 -    vendor::rosgraph_msgs::msg::Clock as ClockMsg,
-     MandatoryParameter, Node, QoSProfile, Subscription, QOS_PROFILE_CLOCK,
+     Node, QoSProfile, ReadOnlyParameter, Subscription, QOS_PROFILE_CLOCK,
  };
 +use rosgraph_msgs::msg::Clock as ClockMsg;
  use std::sync::{Arc, Mutex, RwLock, Weak};
diff --git a/repositories/rust_setup_stage_1.bzl b/repositories/rust_setup_stage_1.bzl
index d46bb831..b3512dc8 100644
--- a/repositories/rust_setup_stage_1.bzl
+++ b/repositories/rust_setup_stage_1.bzl
@@ -13,9 +13,9 @@ def rust_setup_stage_1():
         http_archive,
         name = "ros2_rust",
         build_file = "@com_github_mvukov_rules_ros2//repositories:ros2_rust.BUILD.bazel",
-        sha256 = "ec3ebfb177f0ecfc2c6ecb47f2fffe701f6ebeb2b29ab482b57b53dd2c260da2",
-        strip_prefix = "ros2_rust-2e746d6e0d2cbeed811132310c3a8dc2da4f9975",
-        urls = ["https://github.com/ros2-rust/ros2_rust/archive/2e746d6e0d2cbeed811132310c3a8dc2da4f9975.zip"],
+        sha256 = "b5ce6dc04e2bced77cf90ac346da46e9f6a1c04c400fb5589cc8228cddffdea3",
+        strip_prefix = "ros2_rust-e485b1c90893bedab32ee9e54ff5e47c4f6bd004",
+        urls = ["https://github.com/ros2-rust/ros2_rust/archive/e485b1c90893bedab32ee9e54ff5e47c4f6bd004.zip"],
         patch_args = ["-p1"],
         patches = [
             "@com_github_mvukov_rules_ros2//repositories/patches:ros2_rust_fix_rcl_bindings.patch",