mirror
/
r2r
mirror of https://github.com/sequenceplanner/r2r.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary casts

This commit is contained in:
Martin Dahl 2020-10-14 23:53:29 +02:00
parent e5a17ee232
commit f7fba64d76
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rcl/src/lib.rs
View File

@ -43,15 +43,14 @@ impl Default for rmw_qos_profile_t {
// ros strings are owned by ros, assignment is a copy // ros strings are owned by ros, assignment is a copy
impl rosidl_runtime_c__String { impl rosidl_runtime_c__String {
pub fn to_str(&self) -> &str { pub fn to_str(&self) -> &str {
let s = unsafe { CStr::from_ptr(self.data as *mut i8) }; let s = unsafe { CStr::from_ptr(self.data) };
s.to_str().unwrap_or("") s.to_str().unwrap_or("")
} }
pub fn assign(&mut self, other: &str) -> () { pub fn assign(&mut self, other: &str) -> () {
let q = CString::new(other).unwrap(); let q = CString::new(other).unwrap();
let to_send_ptr = q.as_ptr() as *const i8;
unsafe { unsafe {
rosidl_runtime_c__String__assign(self as *mut _, to_send_ptr); rosidl_runtime_c__String__assign(self as *mut _, q.as_ptr());
} }
} }
} }

14
src/lib.rs
View File

@ -523,7 +523,7 @@ impl ParameterValue {
} else if v.double_value != std::ptr::null_mut() { } else if v.double_value != std::ptr::null_mut() {
ParameterValue::Double(unsafe { *v.double_value }) ParameterValue::Double(unsafe { *v.double_value })
} else if v.string_value != std::ptr::null_mut() { } else if v.string_value != std::ptr::null_mut() {
let s = unsafe { CStr::from_ptr(v.string_value as *mut i8) }; let s = unsafe { CStr::from_ptr(v.string_value) };
let string = s.to_str().unwrap_or("").to_owned(); let string = s.to_str().unwrap_or("").to_owned();
ParameterValue::String(string) ParameterValue::String(string)
} else if v.byte_array_value != std::ptr::null_mut() { } else if v.byte_array_value != std::ptr::null_mut() {
@ -565,7 +565,7 @@ impl ParameterValue {
(*v.string_array_value).size) (*v.string_array_value).size)
}; };
let s = vals.iter().map(|cs| { let s = vals.iter().map(|cs| {
let s = unsafe { CStr::from_ptr(*cs as *mut i8) }; let s = unsafe { CStr::from_ptr(*cs) };
s.to_str().unwrap_or("").to_owned() s.to_str().unwrap_or("").to_owned()
}).collect(); }).collect();
ParameterValue::StringArray(s) ParameterValue::StringArray(s)
@ -599,7 +599,7 @@ impl Node {
if cstr == std::ptr::null() { if cstr == std::ptr::null() {
return Err(Error::RCL_RET_NODE_INVALID); return Err(Error::RCL_RET_NODE_INVALID);
} }
let s = unsafe { CStr::from_ptr(cstr as *const i8) }; let s = unsafe { CStr::from_ptr(cstr) };
Ok(s.to_str().unwrap_or("").to_owned()) Ok(s.to_str().unwrap_or("").to_owned())
} }
@ -608,7 +608,7 @@ impl Node {
if cstr == std::ptr::null() { if cstr == std::ptr::null() {
return Err(Error::RCL_RET_NODE_INVALID); return Err(Error::RCL_RET_NODE_INVALID);
} }
let s = unsafe { CStr::from_ptr(cstr as *const i8) }; let s = unsafe { CStr::from_ptr(cstr) };
Ok(s.to_str().unwrap_or("").to_owned()) Ok(s.to_str().unwrap_or("").to_owned())
} }
@ -617,7 +617,7 @@ impl Node {
if cstr == std::ptr::null() { if cstr == std::ptr::null() {
return Err(Error::RCL_RET_NODE_INVALID); return Err(Error::RCL_RET_NODE_INVALID);
} }
let s = unsafe { CStr::from_ptr(cstr as *const i8) }; let s = unsafe { CStr::from_ptr(cstr) };
Ok(s.to_str().unwrap_or("").to_owned()) Ok(s.to_str().unwrap_or("").to_owned())
} }
@ -651,7 +651,7 @@ impl Node {
let name = self.name()?; let name = self.name()?;
for (nn, np) in node_names.iter().zip(node_params) { for (nn, np) in node_names.iter().zip(node_params) {
let node_name_cstr = unsafe { CStr::from_ptr(*nn as *mut i8) }; let node_name_cstr = unsafe { CStr::from_ptr(*nn) };
let node_name = node_name_cstr.to_str().unwrap_or(""); let node_name = node_name_cstr.to_str().unwrap_or("");
// This is copied from rclcpp, but there is a comment there suggesting // This is copied from rclcpp, but there is a comment there suggesting
@ -676,7 +676,7 @@ impl Node {
}; };
for (s,v) in param_names.iter().zip(param_values) { for (s,v) in param_names.iter().zip(param_values) {
let s = unsafe { CStr::from_ptr(*s as *mut i8) }; let s = unsafe { CStr::from_ptr(*s) };
let key = s.to_str().unwrap_or(""); let key = s.to_str().unwrap_or("");
let val = ParameterValue::from_rcl(&*v); let val = ParameterValue::from_rcl(&*v);
self.params.insert(key.to_owned(), val); self.params.insert(key.to_owned(), val);