1
1
use crate :: rcl_bindings:: * ;
2
- use crate :: { Node , NodeBuilder , RclReturnCode , ToResult } ;
2
+ use crate :: { Node , NodeBuilder , RclrsError , ToResult } ;
3
3
4
4
use std:: ffi:: CString ;
5
5
use std:: os:: raw:: c_char;
@@ -58,7 +58,7 @@ impl Context {
58
58
///
59
59
/// # Panics
60
60
/// When there is an interior null byte in any of the args.
61
- pub fn new ( args : impl IntoIterator < Item = String > ) -> Result < Self , RclReturnCode > {
61
+ pub fn new ( args : impl IntoIterator < Item = String > ) -> Result < Self , RclrsError > {
62
62
// SAFETY: Getting a zero-initialized value is always safe
63
63
let mut rcl_context = unsafe { rcl_get_zero_initialized_context ( ) } ;
64
64
let cstring_args: Vec < CString > = args
@@ -108,41 +108,16 @@ impl Context {
108
108
///
109
109
/// # Example
110
110
/// ```
111
- /// # use rclrs::{Context, RclReturnCode };
111
+ /// # use rclrs::{Context, RclrsError };
112
112
/// let ctx = Context::new([])?;
113
113
/// let node = ctx.create_node("my_node");
114
114
/// assert!(node.is_ok());
115
- /// # Ok::<(), RclReturnCode >(())
115
+ /// # Ok::<(), RclrsError >(())
116
116
/// ```
117
- pub fn create_node ( & self , node_name : & str ) -> Result < Node , RclReturnCode > {
117
+ pub fn create_node ( & self , node_name : & str ) -> Result < Node , RclrsError > {
118
118
NodeBuilder :: new ( node_name, self ) . build ( )
119
119
}
120
120
121
- /// Creates a new node in a namespace.
122
- ///
123
- /// Convenience function equivalent to [`Node::new_with_namespace`][1].
124
- /// Please see that function's documentation.
125
- ///
126
- /// [1]: crate::Node::new_with_namespace
127
- ///
128
- /// # Example
129
- /// ```
130
- /// # use rclrs::{Context, RclReturnCode};
131
- /// let ctx = Context::new([])?;
132
- /// let node = ctx.create_node_with_namespace("/my/nested/namespace", "my_node");
133
- /// assert!(node.is_ok());
134
- /// # Ok::<(), RclReturnCode>(())
135
- /// ```
136
- pub fn create_node_with_namespace (
137
- & self ,
138
- node_namespace : & str ,
139
- node_name : & str ,
140
- ) -> Result < Node , RclReturnCode > {
141
- NodeBuilder :: new ( node_name, self )
142
- . namespace ( node_namespace)
143
- . build ( )
144
- }
145
-
146
121
/// Creates a [`NodeBuilder`][1].
147
122
///
148
123
/// Convenience function equivalent to [`NodeBuilder::new`][2].
@@ -153,12 +128,12 @@ impl Context {
153
128
///
154
129
/// # Example
155
130
/// ```
156
- /// # use rclrs::{Context, RclReturnCode };
131
+ /// # use rclrs::{Context, RclrsError };
157
132
/// let context = Context::new([])?;
158
133
/// let node_builder = context.create_node_builder("foo_node");
159
134
/// let node = node_builder.build()?;
160
135
/// assert_eq!(node.name(), "foo_node");
161
- /// # Ok::<(), RclReturnCode >(())
136
+ /// # Ok::<(), RclrsError >(())
162
137
/// ```
163
138
pub fn create_node_builder ( & self , node_name : & str ) -> NodeBuilder {
164
139
NodeBuilder :: new ( node_name, self )
0 commit comments