Skip to content

Commit 5274cf5

Browse files
committed
Fix style
Signed-off-by: Michael X. Grey <[email protected]>
1 parent 5cddd54 commit 5274cf5

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

rclrs/src/node/graph.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,8 @@ impl Node {
379379
}
380380

381381
// SAFETY: The previous call returned successfully, so the data is valid
382-
let topic_endpoint_infos_slice = unsafe {
383-
rcl_from_raw_parts(rcl_publishers_info.info_array, rcl_publishers_info.size)
384-
};
382+
let topic_endpoint_infos_slice =
383+
unsafe { rcl_from_raw_parts(rcl_publishers_info.info_array, rcl_publishers_info.size) };
385384

386385
// SAFETY: Because the rcl call returned successfully, each element of the slice points
387386
// to a valid topic_endpoint_info object, which contains valid C strings

rclrs/src/parameter/override_map.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ impl RclParamsIter<'_> {
5050
} else {
5151
let node_name_ptrs =
5252
rcl_from_raw_parts((*rcl_params).node_names, (*rcl_params).num_nodes);
53-
let rcl_node_params =
54-
rcl_from_raw_parts((*rcl_params).params, (*rcl_params).num_nodes);
53+
let rcl_node_params = rcl_from_raw_parts((*rcl_params).params, (*rcl_params).num_nodes);
5554
Self {
5655
node_name_ptrs,
5756
rcl_node_params,
@@ -84,10 +83,8 @@ impl<'a> RclNodeParamsIter<'a> {
8483
pub unsafe fn new(rcl_node_params: &'a rcl_node_params_t) -> Self {
8584
let param_name_ptrs =
8685
rcl_from_raw_parts(rcl_node_params.parameter_names, rcl_node_params.num_params);
87-
let rcl_variants = rcl_from_raw_parts(
88-
rcl_node_params.parameter_values,
89-
rcl_node_params.num_params,
90-
);
86+
let rcl_variants =
87+
rcl_from_raw_parts(rcl_node_params.parameter_values, rcl_node_params.num_params);
9188
Self {
9289
param_name_ptrs,
9390
rcl_variants,

rclrs/src/parameter/value.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,17 +468,15 @@ impl ParameterValue {
468468
ParameterValue::BoolArray(slice.into())
469469
} else if !var.integer_array_value.is_null() {
470470
let rcl_integer_array = &*var.integer_array_value;
471-
let slice =
472-
rcl_from_raw_parts(rcl_integer_array.values, rcl_integer_array.size);
471+
let slice = rcl_from_raw_parts(rcl_integer_array.values, rcl_integer_array.size);
473472
ParameterValue::IntegerArray(slice.into())
474473
} else if !var.double_array_value.is_null() {
475474
let rcl_double_array = &*var.double_array_value;
476475
let slice = rcl_from_raw_parts(rcl_double_array.values, rcl_double_array.size);
477476
ParameterValue::DoubleArray(slice.into())
478477
} else if !var.string_array_value.is_null() {
479478
let rcutils_string_array = &*var.string_array_value;
480-
let slice =
481-
rcl_from_raw_parts(rcutils_string_array.data, rcutils_string_array.size);
479+
let slice = rcl_from_raw_parts(rcutils_string_array.data, rcutils_string_array.size);
482480
let strings = slice
483481
.iter()
484482
.map(|&ptr| {

rclrs/src/rcl_bindings.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ pub(crate) unsafe fn rcl_from_raw_parts<'a, T>(data: *const T, len: usize) -> &'
165165
// SAFETY: The user of this function is instructed to abide by all the
166166
// safety requirements of slice::from_raw_parts except for null pointer
167167
// values, which are checked above.
168-
unsafe {
169-
std::slice::from_raw_parts(data, len)
170-
}
168+
unsafe { std::slice::from_raw_parts(data, len) }
171169
}
172170
}

0 commit comments

Comments
 (0)