Skip to content

Commit 3d699ef

Browse files
committed
Fix clippy warnings
1 parent ed0b2ed commit 3d699ef

File tree

7 files changed

+12
-7
lines changed

7 files changed

+12
-7
lines changed

rclrs/src/dynamic_message.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fn get_type_support_library(
7272
let ament = ament_rs::Ament::new().map_err(|_| RequiredPrefixNotSourced {
7373
package: package_name.to_owned(),
7474
})?;
75-
let prefix = PathBuf::from(ament.find_package(&package_name).ok_or(
75+
let prefix = PathBuf::from(ament.find_package(package_name).ok_or(
7676
RequiredPrefixNotSourced {
7777
package: package_name.to_owned(),
7878
},

rclrs/src/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,6 @@ pub(crate) trait ToResult {
347347

348348
impl ToResult for rcl_ret_t {
349349
fn ok(&self) -> Result<(), RclrsError> {
350-
to_rclrs_result(*self as i32)
350+
to_rclrs_result(*self)
351351
}
352352
}

rclrs/src/node.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl Node {
173173
&self,
174174
getter: unsafe extern "C" fn(*const rcl_node_t) -> *const c_char,
175175
) -> String {
176-
unsafe { call_string_getter_with_handle(&*self.rcl_node_mtx.lock().unwrap(), getter) }
176+
unsafe { call_string_getter_with_handle(&self.rcl_node_mtx.lock().unwrap(), getter) }
177177
}
178178

179179
/// Creates a [`Client`][1].

rclrs/src/parameter/value.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ mod tests {
163163
assert!(!rcl_params.is_null());
164164
assert_eq!(unsafe { (*rcl_params).num_nodes }, 1);
165165
let rcl_node_params = unsafe { &(*(*rcl_params).params) };
166-
assert_eq!((*rcl_node_params).num_params, 1);
167-
let rcl_variant = unsafe { &(*(*rcl_node_params).parameter_values) };
166+
assert_eq!(rcl_node_params.num_params, 1);
167+
let rcl_variant = unsafe { &(*rcl_node_params.parameter_values) };
168168
let param_value = unsafe { ParameterValue::from_rcl_variant(rcl_variant) };
169169
assert_eq!(param_value, pair.1);
170170
unsafe { rcl_yaml_node_struct_fini(rcl_params) };

rclrs/src/subscription.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ where
183183
///
184184
/// This can be more efficient for messages containing large arrays.
185185
pub fn take_boxed(&self) -> Result<(Box<T>, MessageInfo), RclrsError> {
186-
let mut rmw_message = Box::new(<T as Message>::RmwMsg::default());
186+
let mut rmw_message = Box::<<T as Message>::RmwMsg>::default();
187187
let message_info = self.take_inner(&mut *rmw_message)?;
188188
// TODO: This will still use the stack in general. Change signature of
189189
// from_rmw_message to allow placing the result in a Box directly.

rclrs/src/vendor/rcl_interfaces/msg.rs

+5
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ pub mod rmw {
404404
pub description: rosidl_runtime_rs::String,
405405
pub additional_constraints: rosidl_runtime_rs::String,
406406
pub read_only: bool,
407+
pub dynamic_typing: bool,
407408
pub floating_point_range: rosidl_runtime_rs::BoundedSequence<
408409
crate::vendor::rcl_interfaces::msg::rmw::FloatingPointRange,
409410
1,
@@ -1269,6 +1270,7 @@ pub struct ParameterDescriptor {
12691270
pub description: std::string::String,
12701271
pub additional_constraints: std::string::String,
12711272
pub read_only: bool,
1273+
pub dynamic_typing: bool,
12721274
pub floating_point_range: rosidl_runtime_rs::BoundedSequence<
12731275
crate::vendor::rcl_interfaces::msg::rmw::FloatingPointRange,
12741276
1,
@@ -1298,6 +1300,7 @@ impl rosidl_runtime_rs::Message for ParameterDescriptor {
12981300
description: msg.description.as_str().into(),
12991301
additional_constraints: msg.additional_constraints.as_str().into(),
13001302
read_only: msg.read_only,
1303+
dynamic_typing: msg.dynamic_typing,
13011304
floating_point_range: msg.floating_point_range,
13021305
integer_range: msg.integer_range,
13031306
}),
@@ -1307,6 +1310,7 @@ impl rosidl_runtime_rs::Message for ParameterDescriptor {
13071310
description: msg.description.as_str().into(),
13081311
additional_constraints: msg.additional_constraints.as_str().into(),
13091312
read_only: msg.read_only,
1313+
dynamic_typing: msg.dynamic_typing,
13101314
floating_point_range: msg.floating_point_range.clone(),
13111315
integer_range: msg.integer_range.clone(),
13121316
}),
@@ -1320,6 +1324,7 @@ impl rosidl_runtime_rs::Message for ParameterDescriptor {
13201324
description: msg.description.to_string(),
13211325
additional_constraints: msg.additional_constraints.to_string(),
13221326
read_only: msg.read_only,
1327+
dynamic_typing: msg.dynamic_typing,
13231328
floating_point_range: msg.floating_point_range,
13241329
integer_range: msg.integer_range,
13251330
}

rclrs/vendor_interfaces.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ def main():
5858

5959

6060
if __name__ == '__main__':
61-
main()
61+
main()

0 commit comments

Comments
 (0)