Raw const's now private. Added Id::is_standard() -> bool

Author: fpagliughi

embedded-can/src/id.rs

@@ -13,7 +13,7 @@ impl StandardId {
     pub const MAX: Self = Self(Self::MAX_RAW);
 
     /// Raw CAN ID `0x7FF`, the lowest priority.
-    pub const MAX_RAW: u16 = 0x7FF;
+    const MAX_RAW: u16 = 0x7FF;
 
     /// Tries to create a `StandardId` from a raw 16-bit integer.
     ///
@@ -59,7 +59,7 @@ impl ExtendedId {
     pub const MAX: Self = Self(Self::MAX_RAW);
 
     /// Raw CAN ID `0x1FFFFFFF`, the lowest priority.
-    pub const MAX_RAW: u32 = 0x1FFF_FFFF;
+    const MAX_RAW: u32 = 0x1FFF_FFFF;
 
     /// Tries to create a `ExtendedId` from a raw 32-bit integer.
     ///
@@ -112,16 +112,20 @@ pub enum Id {
 
 impl Id {
     /// Creates a CAN identifier as a standard ID.
-    pub fn new_standard_id(raw: u16) -> Option<Self> {
+    pub fn new_standard(raw: u16) -> Option<Self> {
         Some(Id::from(StandardId::new(raw)?))
     }
 
     /// Creates a CAN identifier as an extended ID.
-    pub fn new_extended_id(raw: u32) -> Option<Self> {
+    pub fn new_extended(raw: u32) -> Option<Self> {
         Some(Id::from(ExtendedId::new(raw)?))
     }
 
-    /// Determines if the value is an extended identifier.
+    /// Determines if the value is a standard, 11-bit, identifier.
+    pub fn is_standard(&self) -> bool {
+        matches!(self, Id::Standard(_))
+    }
+    /// Determines if the value is an extended, 29-bit, identifier.
     pub fn is_extended(&self) -> bool {
         matches!(self, Id::Extended(_))
     }
@@ -185,10 +189,7 @@ mod tests {
 
     #[test]
     fn standard_id_new() {
-        assert_eq!(
-            StandardId::new(StandardId::MAX_RAW),
-            Some(StandardId::MAX)
-        );
+        assert_eq!(StandardId::new(StandardId::MAX_RAW), Some(StandardId::MAX));
     }
 
     #[test]
@@ -242,15 +243,19 @@ mod tests {
 
     #[test]
     fn id_new() {
-        let id = Id::new_standard_id(StandardId::MAX_RAW);
+        let id = Id::new_standard(StandardId::MAX_RAW).unwrap();
+        assert!(id.is_standard());
+        assert!(!id.is_extended());
         match id {
-            Some(Id::Standard(id)) => assert_eq!(StandardId::MAX, id),
+            Id::Standard(id) => assert_eq!(StandardId::MAX, id),
             _ => assert!(false),
         }
 
-        let id = Id::new_extended_id(ExtendedId::MAX_RAW);
+        let id = Id::new_extended(ExtendedId::MAX_RAW).unwrap();
+        assert!(!id.is_standard());
+        assert!(id.is_extended());
         match id {
-            Some(Id::Extended(id)) => assert_eq!(ExtendedId::MAX, id),
+            Id::Extended(id) => assert_eq!(ExtendedId::MAX, id),
             _ => assert!(false),
         }
     }