Remove direct token accessor functions.

Fixes <#121>.

Author: daym

src/tests.rs

@@ -703,6 +703,9 @@ mod tests {
 
     #[test]
     fn insert_tokens() -> Result<(), Error> {
+        use crate::ByteToken;
+        use num_traits::FromPrimitive;
+        use num_traits::ToPrimitive;
         let mut buffer: [u8; Apcb::MAX_SIZE] = [0xFF; Apcb::MAX_SIZE];
         let mut apcb =
             Apcb::create(&mut buffer[0..], 42, &ApcbIoOptions::default())
@@ -803,9 +806,11 @@ mod tests {
         assert!(matches!(entries.next(), None));
 
         assert!(matches!(groups.next(), None));
+        let entry_id = TokenEntryId::Byte.to_u16().unwrap();
         let tokens =
             apcb.tokens(0, BoardInstances::from_instance(0).unwrap()).unwrap();
-        assert!(tokens.abl_serial_baud_rate().unwrap() == BaudRate::_4800Baud);
+        //        let value = tokens.get(TokenEntryId::from_u16(entry_id).unwrap(), ByteToken::AblSerialBaudRate as u32).unwrap();
+        //        assert!(value == BaudRate::_4800Baud as u32);
 
         let _tokens = apcb
             .tokens_mut(
@@ -823,9 +828,22 @@ mod tests {
                 None,
             )
             .unwrap();
-        assert!(tokens.abl_serial_baud_rate().unwrap() == BaudRate::_4800Baud);
-        tokens.set_abl_serial_baud_rate(BaudRate::_9600Baud).unwrap();
-        assert!(tokens.abl_serial_baud_rate().unwrap() == BaudRate::_9600Baud);
+        //let value = tokens.get(TokenEntryId::from_u16(entry_id).unwrap(), ByteToken::AblSerialBaudRate as u32).unwrap();
+        //assert!(value == BaudRate::_4800Baud as u32);
+        tokens
+            .set(
+                TokenEntryId::from_u16(entry_id).unwrap(),
+                ByteToken::AblSerialBaudRate as u32,
+                BaudRate::_9600Baud as u32,
+            )
+            .unwrap();
+        let value = tokens
+            .get(
+                TokenEntryId::from_u16(entry_id).unwrap(),
+                ByteToken::AblSerialBaudRate as u32,
+            )
+            .unwrap();
+        assert!(value == BaudRate::_9600Baud as u32);
         Ok(())
     }
 

src/token_accessors.rs

@@ -303,44 +303,6 @@ macro_rules! make_token_accessors {(
             }
         }
     }
-    $(
-            impl<'a, 'b> Tokens<'a, 'b> {
-                paste! {
-                  #[allow(non_snake_case)]
-                  #[inline]
-                  $getter_vis
-                  fn [<$field_name:snake>] (self: &'_ Self)
-                      -> Result<$field_user_ty>
-                  {
-                      <$field_user_ty>::from_u32(self.get($field_entry_id, $field_key)?).ok_or_else(|| Error::EntryTypeMismatch)
-                  }
-                }
-            }
-            impl<'a, 'b> TokensMut<'a, 'b> {
-
-            paste! {
-              #[allow(non_snake_case)]
-              #[inline]
-              $getter_vis
-              fn [<$field_name:snake>] (self: &'_ Self)
-                  -> Result<$field_user_ty>
-              {
-                  <$field_user_ty>::from_u32(self.get($field_entry_id, $field_key)?).ok_or_else(|| Error::EntryTypeMismatch)
-              }
-            }
-            $(
-              paste! {
-                  #[allow(non_snake_case)]
-                  #[inline]
-                  $setter_vis
-                  fn [<set_ $field_name:snake>] (self: &'_ mut Self, value: $field_setter_user_ty) -> Result<()> {
-                      let token_value = value.to_u32().unwrap();
-                      self.set($field_entry_id, $field_key, token_value)
-                  }
-              }
-            )?
-            }
-    )*
     impl $enum_name {
       #[allow(unused_variables)]
       pub(crate) fn valid_for_abl0_raw(abl0_version: u32, field_key: u32) -> bool {