Clear warnings

Signed-off-by: Luca Della Vedova <[email protected]>

Author: luca-della-vedova

rclrs/src/dynamic_message.rs

@@ -5,10 +5,8 @@
 //!
 //! The central type of this module is [`DynamicMessage`].
 
-
 use std::{
     fmt::{self, Display},
-    ops::Deref,
     path::PathBuf,
     sync::Arc,
 };

rclrs/src/dynamic_message/message_structure.rs

@@ -114,6 +114,10 @@ impl BaseType {
         string_upper_bound: Option<NonZeroUsize>,
         inner: *const rosidl_message_type_support_t,
     ) -> Self {
+<<<<<<< HEAD
+=======
+        use rosidl_typesupport_introspection_c_field_types::*;
+>>>>>>> 4e1c0be (Clear warnings)
         match u32::from(type_id) {
             x if x == rosidl_typesupport_introspection_c__ROS_TYPE_FLOAT as u32 => Self::Float,
             x if x == rosidl_typesupport_introspection_c__ROS_TYPE_DOUBLE as u32 => Self::Double,