From ae20d3c33b6d8d0d9a7b18df20012ba5a5a3f806 Mon Sep 17 00:00:00 2001
From: Martin Dahl <martin.dahl@gmail.com>
Date: Thu, 5 Oct 2023 11:30:54 +0200
Subject: [PATCH] Re-export RosParams macro.

---
 r2r/Cargo.toml                    | 2 +-
 r2r/examples/parameters_derive.rs | 2 +-
 r2r/src/lib.rs                    | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/r2r/Cargo.toml b/r2r/Cargo.toml
index a65ae4ad7..eaf809d39 100644
--- a/r2r/Cargo.toml
+++ b/r2r/Cargo.toml
@@ -22,6 +22,7 @@ r2r_common = { path = "../r2r_common", version = "0.3.8" }
 r2r_rcl = { path = "../r2r_rcl", version = "0.3.9" }
 r2r_msg_gen = { path = "../r2r_msg_gen", version = "0.3.13" }
 r2r_actions = { path = "../r2r_actions", version = "0.3.12" }
+r2r_macros = { path = "../r2r_macros", version = "0.1.0" }
 uuid = { version = "1.2.2", features = ["serde", "v4"] }
 futures = "0.3.25"
 log = "0.4.18"
@@ -31,7 +32,6 @@ phf = "0.11.1"
 serde_json = "1.0.89"
 futures = "0.3.25"
 tokio = { version = "1.22.0", features = ["rt-multi-thread", "macros"] }
-r2r_macros = { path = "../r2r_macros", version = "0.1.0" }
 rand = "0.8.5"
 
 [build-dependencies]
diff --git a/r2r/examples/parameters_derive.rs b/r2r/examples/parameters_derive.rs
index 30c965bce..e0825702a 100644
--- a/r2r/examples/parameters_derive.rs
+++ b/r2r/examples/parameters_derive.rs
@@ -1,7 +1,7 @@
 use futures::executor::LocalPool;
 use futures::prelude::*;
 use futures::task::LocalSpawnExt;
-use r2r_macros::RosParams;
+use r2r::RosParams;
 use std::sync::{Arc, Mutex};
 
 // try to run like this
diff --git a/r2r/src/lib.rs b/r2r/src/lib.rs
index f9e128ab6..3bb5a52e9 100644
--- a/r2r/src/lib.rs
+++ b/r2r/src/lib.rs
@@ -114,6 +114,8 @@ pub use context::Context;
 mod parameters;
 pub use parameters::{Parameter, ParameterValue, RosParams};
 
+pub use r2r_macros::RosParams;
+
 mod clocks;
 pub use clocks::{Clock, ClockType};