@@ -49,12 +49,12 @@ pub struct Node {
49
49
///
50
50
/// # Example
51
51
/// ```
52
- /// # use rclrs::{Context, Node, NodeBuilder, RclReturnCode };
52
+ /// # use rclrs::{Context, Node, NodeBuilder, RclrsError };
53
53
/// let context = Context::new([])?;
54
54
/// let node = NodeBuilder::new("foo_node", &context).namespace("/bar").build()?;
55
55
/// assert_eq!(node.name(), "foo_node");
56
56
/// assert_eq!(node.namespace(), "/bar");
57
- /// # Ok::<(), RclReturnCode >(())
57
+ /// # Ok::<(), RclrsError >(())
58
58
/// ```
59
59
pub struct NodeBuilder {
60
60
context : Arc < Mutex < rcl_context_t > > ,
@@ -226,14 +226,14 @@ impl Node {
226
226
///
227
227
/// # Example
228
228
/// ```
229
- /// # use rclrs::{Context, RclReturnCode };
229
+ /// # use rclrs::{Context, RclrsError };
230
230
/// // set default ROS domain ID to 10 here
231
231
/// std::env::set_var("ROS_DOMAIN_ID", "10");
232
232
/// let context = Context::new([])?;
233
233
/// let node = context.create_node("domain_id_node")?;
234
234
/// let domain_id = node.domain_id();
235
235
/// assert_eq!(domain_id, 10);
236
- /// # Ok::<(), RclReturnCode >(())
236
+ /// # Ok::<(), RclrsError >(())
237
237
/// ```
238
238
// TODO: If node option is supported,
239
239
// add description about this function is for getting actual domain_id
@@ -274,18 +274,18 @@ impl NodeBuilder {
274
274
///
275
275
/// # Example
276
276
/// ```
277
- /// # use rclrs::{Context, Node, NodeBuilder, RclReturnCode, NodeErrorCode};
277
+ /// # use rclrs::{Context, Node, NodeBuilder, RclrsError, RclReturnCode, NodeErrorCode};
278
278
/// let context = Context::new([])?;
279
279
/// let builder = NodeBuilder::new("foo_node", &context);
280
280
/// let node = builder.build()?;
281
281
/// assert_eq!(node.name(), "foo_node");
282
282
/// // invalid node name
283
283
/// let builder = NodeBuilder::new("123abc", &context);
284
284
/// assert_eq!(
285
- /// builder.build(),
286
- /// Err( RclReturnCode::NodeError(NodeErrorCode::NodeInvalidName) )
285
+ /// builder.build().unwrap_err().code ,
286
+ /// RclReturnCode::NodeError(NodeErrorCode::NodeInvalidName)
287
287
/// );
288
- /// # Ok::<(), RclReturnCode >(())
288
+ /// # Ok::<(), RclrsError >(())
289
289
/// ```
290
290
///
291
291
/// [1]: NodeBuilder::build
@@ -323,18 +323,18 @@ impl NodeBuilder {
323
323
///
324
324
/// # Example
325
325
/// ```
326
- /// # use rclrs::{Context, Node, NodeBuilder, RclReturnCode, NodeErrorCode};
326
+ /// # use rclrs::{Context, Node, NodeBuilder, RclrsError, RclReturnCode, NodeErrorCode};
327
327
/// let context = Context::new([])?;
328
328
/// let builder = NodeBuilder::new("node_name", &context);
329
329
/// let node = builder.namespace("/foo/bar").build()?;
330
330
/// assert_eq!(node.fully_qualified_name(), "/foo/bar/node_name");
331
331
/// // invalid namespace
332
332
/// let builder = NodeBuilder::new("node_name", &context);
333
333
/// assert_eq!(
334
- /// builder.namespace("123abc").build(),
335
- /// Err( RclReturnCode::NodeError(NodeErrorCode::NodeInvalidNamespace) )
334
+ /// builder.namespace("123abc").build().unwrap_err().code ,
335
+ /// RclReturnCode::NodeError(NodeErrorCode::NodeInvalidNamespace)
336
336
/// );
337
- /// # Ok::<(), RclReturnCode >(())
337
+ /// # Ok::<(), RclrsError >(())
338
338
/// ```
339
339
pub fn namespace ( mut self , namespace : & str ) -> Self {
340
340
self . namespace = namespace. to_string ( ) ;
@@ -345,11 +345,11 @@ impl NodeBuilder {
345
345
///
346
346
/// Node name and namespace validation is performed in this method.
347
347
/// If invalid name and/or namespace are specified to builder,
348
- /// this method will return RclReturnCode as error.
348
+ /// this method will return RclRsError as error.
349
349
///
350
350
/// # Example
351
351
/// ```
352
- /// # use rclrs::{Context, Node, NodeBuilder, RclReturnCode, NodeErrorCode};
352
+ /// # use rclrs::{Context, Node, NodeBuilder, RclrsError, RclReturnCode, NodeErrorCode};
353
353
/// let context = Context::new([])?;
354
354
///
355
355
/// let builder = NodeBuilder::new("node_name", &context);
@@ -359,19 +359,19 @@ impl NodeBuilder {
359
359
/// let builder = NodeBuilder::new("123abc", &context);
360
360
/// let result = builder.namespace("/foo/bar").build();
361
361
/// assert_eq!(
362
- /// result,
363
- /// Err( RclReturnCode::NodeError(NodeErrorCode::NodeInvalidName) )
362
+ /// result.unwrap_err().code ,
363
+ /// RclReturnCode::NodeError(NodeErrorCode::NodeInvalidName)
364
364
/// );
365
365
/// // invalid namespace
366
366
/// let builder = NodeBuilder::new("node_name", &context);
367
367
/// let result = builder.namespace("123abc").build();
368
368
/// assert_eq!(
369
- /// result,
370
- /// Err( RclReturnCode::NodeError(NodeErrorCode::NodeInvalidNamespace) )
369
+ /// result.unwrap_err().code ,
370
+ /// RclReturnCode::NodeError(NodeErrorCode::NodeInvalidNamespace)
371
371
/// );
372
- /// # Ok::<(), RclReturnCode >(())
372
+ /// # Ok::<(), RclrsError >(())
373
373
/// ```
374
- pub fn build ( & self ) -> Result < Node , RclReturnCode > {
374
+ pub fn build ( & self ) -> Result < Node , RclrsError > {
375
375
let node_name = CString :: new ( self . name . as_str ( ) ) . unwrap ( ) ;
376
376
let node_namespace = CString :: new ( self . namespace . as_str ( ) ) . unwrap ( ) ;
377
377
0 commit comments