Merge pull request #65 from technocreatives/fix/duplicate-name

fix duplicate enum names on multiplex messages
technocreatives · Feb 6, 2024 · 62d325a · 62d325a
2 parents 8fcb8ca + 606159f
commit 62d325a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1145,7 +1145,7 @@ fn multiplex_enum_name(msg: &Message, multiplexor: &Signal) -> Result<String> {
         multiplexor
     );
     Ok(format!(
-        "{}{}",
+        "{}{}Index",
         msg.message_name().to_pascal_case(),
         multiplexor.name().to_pascal_case()
     ))

diff --git a/testing/can-messages/src/messages.rs b/testing/can-messages/src/messages.rs
@@ -1182,14 +1182,14 @@ impl MultiplexTest {
         u8::from(signal).saturating_mul(factor).saturating_add(0)
     }
 
-    pub fn multiplexor(&mut self) -> Result<MultiplexTestMultiplexor, CanError> {
+    pub fn multiplexor(&mut self) -> Result<MultiplexTestMultiplexorIndex, CanError> {
         match self.multiplexor_raw() {
-            0 => Ok(MultiplexTestMultiplexor::M0(MultiplexTestMultiplexorM0 {
-                raw: self.raw,
-            })),
-            1 => Ok(MultiplexTestMultiplexor::M1(MultiplexTestMultiplexorM1 {
-                raw: self.raw,
-            })),
+            0 => Ok(MultiplexTestMultiplexorIndex::M0(
+                MultiplexTestMultiplexorM0 { raw: self.raw },
+            )),
+            1 => Ok(MultiplexTestMultiplexorIndex::M1(
+                MultiplexTestMultiplexorM1 { raw: self.raw },
+            )),
             multiplexor => Err(CanError::InvalidMultiplexor {
                 message_id: 200,
                 multiplexor: multiplexor.into(),
@@ -1313,7 +1313,7 @@ impl<'a> Arbitrary<'a> for MultiplexTest {
 }
 /// Defined values for multiplexed signal MultiplexTest
 #[derive(Debug)]
-pub enum MultiplexTestMultiplexor {
+pub enum MultiplexTestMultiplexorIndex {
     M0(MultiplexTestMultiplexorM0),
     M1(MultiplexTestMultiplexorM1),
 }

diff --git a/testing/can-messages/tests/all.rs b/testing/can-messages/tests/all.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::float_cmp)]
 
 use can_messages::{
-    Amet, Bar, BarThree, CanError, Foo, MultiplexTest, MultiplexTestMultiplexor,
+    Amet, Bar, BarThree, CanError, Foo, MultiplexTest, MultiplexTestMultiplexorIndex,
     MultiplexTestMultiplexorM0,
 };
 
@@ -69,7 +69,7 @@ fn pack_unpack_message_containing_multiplexed_signals() {
     assert_eq!(result.unmultiplexed_signal(), 2);
     assert_eq!(result.multiplexor_raw(), 0);
     let multiplexor = result.multiplexor().unwrap();
-    if let MultiplexTestMultiplexor::M0(m0) = multiplexor {
+    if let MultiplexTestMultiplexorIndex::M0(m0) = multiplexor {
         assert_eq!(m0.multiplexed_signal_zero_a(), 1.2);
         assert_eq!(m0.multiplexed_signal_zero_b(), 2.0);
     } else {