🏷️ Update argument type of FieldMap::set_field

arthurlm · Jan 12, 2024 · 5e9a53a · 5e9a53a
1 parent 3e182c5
commit 5e9a53a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/quickfix/src/group.rs b/quickfix/src/group.rs
@@ -37,8 +37,8 @@ impl FieldMap for Group {
         unsafe { FixGroup_getField(self.0, tag) }.map(read_checked_cstr)
     }
 
-    fn set_field(&mut self, tag: i32, value: &str) -> Result<(), QuickFixError> {
-        let ffi_value = CString::new(value)?;
+    fn set_field<V: AsRef<str>>(&mut self, tag: i32, value: V) -> Result<(), QuickFixError> {
+        let ffi_value = CString::new(value.as_ref())?;
         ffi_code_to_result(unsafe { FixGroup_setField(self.0, tag, ffi_value.as_ptr()) })
     }
 

diff --git a/quickfix/src/header.rs b/quickfix/src/header.rs
@@ -25,8 +25,8 @@ impl FieldMap for Header {
         unsafe { FixHeader_getField(self.0, tag) }.map(read_checked_cstr)
     }
 
-    fn set_field(&mut self, tag: i32, value: &str) -> Result<(), QuickFixError> {
-        let ffi_value = CString::new(value)?;
+    fn set_field<V: AsRef<str>>(&mut self, tag: i32, value: V) -> Result<(), QuickFixError> {
+        let ffi_value = CString::new(value.as_ref())?;
         ffi_code_to_result(unsafe { FixHeader_setField(self.0, tag, ffi_value.as_ptr()) })
     }
 

diff --git a/quickfix/src/lib.rs b/quickfix/src/lib.rs
@@ -157,7 +157,7 @@ pub trait FieldMap {
     fn get_field(&self, tag: i32) -> Option<String>;
 
     /// Set field value for a given tag number.
-    fn set_field(&mut self, tag: i32, value: &str) -> Result<(), QuickFixError>;
+    fn set_field<V: AsRef<str>>(&mut self, tag: i32, value: V) -> Result<(), QuickFixError>;
 
     /// Remove a field from  collection.
     fn remove_field(&mut self, tag: i32) -> Result<(), QuickFixError>;

diff --git a/quickfix/src/message.rs b/quickfix/src/message.rs
@@ -180,8 +180,8 @@ impl FieldMap for Message {
         unsafe { FixMessage_getField(self.0, tag) }.map(read_checked_cstr)
     }
 
-    fn set_field(&mut self, tag: i32, value: &str) -> Result<(), QuickFixError> {
-        let ffi_value = CString::new(value)?;
+    fn set_field<V: AsRef<str>>(&mut self, tag: i32, value: V) -> Result<(), QuickFixError> {
+        let ffi_value = CString::new(value.as_ref())?;
         ffi_code_to_result(unsafe { FixMessage_setField(self.0, tag, ffi_value.as_ptr()) })
     }
 

diff --git a/quickfix/src/trailer.rs b/quickfix/src/trailer.rs
@@ -25,8 +25,8 @@ impl FieldMap for Trailer {
         unsafe { FixTrailer_getField(self.0, tag) }.map(read_checked_cstr)
     }
 
-    fn set_field(&mut self, tag: i32, value: &str) -> Result<(), QuickFixError> {
-        let ffi_value = CString::new(value)?;
+    fn set_field<V: AsRef<str>>(&mut self, tag: i32, value: V) -> Result<(), QuickFixError> {
+        let ffi_value = CString::new(value.as_ref())?;
         ffi_code_to_result(unsafe { FixTrailer_setField(self.0, tag, ffi_value.as_ptr()) })
     }
 

diff --git a/quickfix/tests/utils/msg_const.rs b/quickfix/tests/utils/msg_const.rs
@@ -17,11 +17,11 @@ pub fn build_news(headline: &str, lines: &[&str]) -> Result<Message, QuickFixErr
     msg.with_header_mut(|h| h.set_field(MSG_TYPE, "B"))?;
 
     msg.set_field(MSG_HEADLINE, headline)?;
-    msg.set_field(MSG_NO_LINES_OF_TEXT, &lines.len().to_string())?; // Not required but always nice
+    msg.set_field(MSG_NO_LINES_OF_TEXT, lines.len().to_string())?; // Not required but always nice
 
     for line in lines {
         let mut group = Group::try_new(MSG_NO_LINES_OF_TEXT, MSG_TEXT)?;
-        group.set_field(MSG_TEXT, &line)?;
+        group.set_field(MSG_TEXT, line)?;
         msg.add_group(&group)?;
     }