simplify SimValue Debug format, making complex structures much easier to read

crates/fayalite/src/sim/value.rs

@@ -358,11 +358,7 @@ impl<T: Type> DerefMut for SimValue<T> {
 
 impl<T: Type> fmt::Debug for SimValue<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let inner = self.inner.share();
+        T::SimValue::fmt(&**self, f)
-        f.debug_struct("SimValue")
-            .field("ty", &inner.ty)
-            .field("value", &inner.value)
-            .finish()
     }
 }
 

crates/fayalite/tests/sim/expected/extern_module2.txt

@@ -354,14 +354,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x1_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -404,13 +401,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x1_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 59,

crates/fayalite/tests/sim/expected/ripple_counter.txt

@@ -1505,14 +1505,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -1555,14 +1552,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -1605,14 +1599,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -1655,13 +1646,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 170,
@@ -1704,13 +1692,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 167,
@@ -1753,13 +1738,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 152,

crates/fayalite/tests/sim/expected/sim_fork_join.txt

@@ -456,14 +456,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -506,13 +503,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 198,

crates/fayalite/tests/sim/expected/sim_fork_join_scope.txt

@@ -456,14 +456,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -506,13 +503,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 198,

crates/fayalite/tests/sim/expected/sim_only_connects.txt

@@ -1583,14 +1583,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 6, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x1_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -1633,14 +1630,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 13, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x1_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -1683,13 +1677,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x1_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 30,
@@ -1732,13 +1723,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x1_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 31,

crates/fayalite/tests/sim/expected/sim_read_past.txt

@@ -9655,14 +9655,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -9705,13 +9702,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 198,

crates/fayalite/tests/sim/expected/sim_resettable_counter_async.txt

@@ -384,14 +384,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: AsyncReset,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -434,14 +431,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -484,13 +478,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: AsyncReset,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 16,
@@ -533,13 +524,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 23,

crates/fayalite/tests/sim/expected/sim_resettable_counter_async_immediate_reset.txt

@@ -384,14 +384,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: AsyncReset,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -434,14 +431,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -484,13 +478,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: AsyncReset,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 13,
@@ -533,13 +524,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 20,

crates/fayalite/tests/sim/expected/sim_resettable_counter_sync.txt

@@ -384,14 +384,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -434,14 +431,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -484,13 +478,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 42,

crates/fayalite/tests/sim/expected/sim_resettable_counter_sync_immediate_reset.txt

@@ -384,14 +384,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -434,14 +431,11 @@ Simulation {
                         sim_only_slots: StatePartIndexRange<SimOnlySlots> { start: 0, len: 0 },
                     },
                     write: None,
-                }: SimValue {
+                }: OpaqueSimValue {
-                    ty: Clock,
-                    value: OpaqueSimValue {
                     bits: 0x0_u1,
                     sim_only_values: [],
                 },
             },
-            },
             changed: Cell {
                 value: false,
             },
@@ -484,13 +478,10 @@ Simulation {
             },
             write: None,
         }: (
-            SimValue {
+            OpaqueSimValue {
-                ty: Clock,
-                value: OpaqueSimValue {
                 bits: 0x0_u1,
                 sim_only_values: [],
             },
-            },
             {
                 SensitivitySet {
                     id: 43,